fix(suite-desktop-core): init connect popup only if really enabled

trezor · Nov 25, 2024 · b9e9652 · b9e9652
1 parent 990c350
commit b9e9652
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/packages/suite-desktop-api/src/api.ts b/packages/suite-desktop-api/src/api.ts
@@ -104,6 +104,7 @@ export interface InvokeChannels {
     'app/auto-start/is-enabled': () => InvokeResult<boolean>;
     'tray/change-settings': (payload: TraySettings) => InvokeResult;
     'tray/get-settings': () => InvokeResult<TraySettings>;
+    'connect-popup/enabled': () => boolean;
     'connect-popup/ready': () => void;
     'connect-popup/response': (response: ConnectPopupResponse) => void;
 }
@@ -169,6 +170,7 @@ export interface DesktopApi {
     changeTraySettings: DesktopApiInvoke<'tray/change-settings'>;
     getTraySettings: DesktopApiInvoke<'tray/get-settings'>;
     // Connect popup
+    connectPopupEnabled: DesktopApiInvoke<'connect-popup/enabled'>;
     connectPopupReady: DesktopApiInvoke<'connect-popup/ready'>;
     connectPopupResponse: DesktopApiInvoke<'connect-popup/response'>;
 }
diff --git a/packages/suite-desktop-api/src/factory.ts b/packages/suite-desktop-api/src/factory.ts
@@ -179,6 +179,7 @@ export const factory = <R extends StrictIpcRenderer<any, IpcRendererEvent>>(
         getTraySettings: () => ipcRenderer.invoke('tray/get-settings'),
 
         // Connect popup
+        connectPopupEnabled: () => ipcRenderer.invoke('connect-popup/enabled'),
         connectPopupReady: () => ipcRenderer.invoke('connect-popup/ready'),
         connectPopupResponse: response => ipcRenderer.invoke('connect-popup/response', response),
     };

diff --git a/packages/suite-desktop-core/src/app.ts b/packages/suite-desktop-core/src/app.ts
@@ -268,7 +268,8 @@ const init = async () => {
         const mainWindow = mainWindowProxy.getInstance();
         const windowExists =
             mainWindow && !mainWindow.isDestroyed() && mainWindow.isClosable() && !app.isHidden();
-        const autoStartCurrentlyEnabled = isAutoStartEnabled();
+        const autoStartCurrentlyEnabled =
+            isAutoStartEnabled() || app.commandLine.hasSwitch('bridge-test');
         logger.info('main', `Before quit, window exists: ${windowExists}`);
         if (
             !stoppingDaemon &&

diff --git a/packages/suite-desktop-core/src/modules/http-receiver.ts b/packages/suite-desktop-core/src/modules/http-receiver.ts
@@ -54,7 +54,13 @@ export const initBackground: ModuleInitBackground = ({ mainWindowProxy, mainThre
             return receiver.getRouteAddress(pathname);
         });
 
-        if (app.commandLine.hasSwitch('expose-connect-ws') || isDevEnv) {
+        const connectPopupEnabled = app.commandLine.hasSwitch('expose-connect-ws') || isDevEnv;
+        ipcMain.handle('connect-popup/enabled', ipcEvent => {
+            validateIpcMessage(ipcEvent);
+
+            return connectPopupEnabled;
+        });
+        if (connectPopupEnabled) {
             exposeConnectWs({ mainThreadEmitter, httpReceiver: receiver, mainWindowProxy });
         }
 

diff --git a/suite-common/connect-init/src/connectInitThunks.ts b/suite-common/connect-init/src/connectInitThunks.ts
@@ -251,13 +251,12 @@ export const connectPopupCallThunk = createThunk(
 
 export const connectPopupInitThunk = createThunk(
     `${CONNECT_INIT_MODULE}/initPopupThunk`,
-    (_, { dispatch }) => {
-        if (!desktopApi.available) {
-            return;
+    async (_, { dispatch }) => {
+        if (desktopApi.available && (await desktopApi.connectPopupEnabled())) {
+            desktopApi.on('connect-popup/call', params => {
+                dispatch(connectPopupCallThunk(params));
+            });
+            desktopApi.connectPopupReady();
         }
-        desktopApi.on('connect-popup/call', params => {
-            dispatch(connectPopupCallThunk(params));
-        });
-        desktopApi.connectPopupReady();
     },
 );