Move desktopApi app selection logic into desktop-api services

Author: pimterry

src/components/intercept/config/electron-config.tsx

@@ -8,6 +8,7 @@ import { logError } from '../../../errors';
 
 import { Interceptor } from '../../../model/interception/interceptors';
 import { UiStore } from '../../../model/ui-store';
+import { DesktopApi } from '../../../services/desktop-api';
 
 import { uploadFile } from '../../../util/ui';
 import { Button, SecondaryButton, UnstyledButton } from '../../common/inputs';
@@ -120,12 +121,6 @@ function getReadablePath(path: string) {
     }
 }
 
-declare global {
-    interface Window {
-        desktopApi?: { selectApplication: () => Promise<string | undefined> };
-    }
-}
-
 @inject('uiStore')
 @observer
 class ElectronConfig extends React.Component<{
@@ -147,13 +142,9 @@ class ElectronConfig extends React.Component<{
     }
 
     selectApplication = async () => {
-        const useNativePicker = window.desktopApi?.selectApplication;
+        const appPicker = DesktopApi.selectApplication ?? (() => uploadFile('path'));
 
-        const pathToApplication = await(
-            useNativePicker
-                ? window.desktopApi?.selectApplication()
-                : uploadFile('path')
-        );
+        const pathToApplication = await(appPicker());
 
         if (!pathToApplication) {
             this.props.closeSelf();

src/services/desktop-api.ts

@@ -19,4 +19,16 @@ export async function getDesktopInjectedValue(key: DesktopInjectedKey): Promise<
         });
     }
     // Note that if we're running in a browser, not the desktop shell, this _never_ resolves.
-}
+}
+
+declare global {
+    interface Window {
+        desktopApi?: DesktopApi;
+    }
+}
+
+interface DesktopApi {
+    selectApplication?: () => Promise<string | undefined>
+}
+
+export const DesktopApi: DesktopApi = window.desktopApi ?? {};