chore(suite): interrupt discovery on connect popup

trezor · Nov 18, 2024 · 9be558b · 9be558b
1 parent 26115a9
commit 9be558b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/packages/suite/src/middlewares/wallet/discoveryMiddleware.ts b/packages/suite/src/middlewares/wallet/discoveryMiddleware.ts
@@ -20,6 +20,7 @@ import { SUITE, ROUTER, MODAL } from 'src/actions/suite/constants';
 import * as walletSettingsActions from 'src/actions/settings/walletSettingsActions';
 import { getApp } from 'src/utils/suite/router';
 import { selectIsDeviceLocked } from 'src/reducers/suite/suiteReducer';
+import { connectPopupCallThunk } from '@suite-common/connect-init';
 
 export const prepareDiscoveryMiddleware = createMiddlewareWithExtraDeps(
     async (action, { dispatch, next, getState }) => {
@@ -46,12 +47,20 @@ export const prepareDiscoveryMiddleware = createMiddlewareWithExtraDeps(
         }
 
         // consider if discovery should be interrupted
-        let interruptionIntent = action.type === deviceActions.selectDevice.type;
-        if (action.type === ROUTER.LOCATION_CHANGE) {
-            interruptionIntent =
-                getApp(action.payload.url) !== 'wallet' &&
-                getApp(action.payload.url) !== 'dashboard' &&
-                getApp(action.payload.url) !== 'settings';
+        let interruptionIntent = false;
+        if (action.type === deviceActions.selectDevice.type) {
+            interruptionIntent = true;
+        }
+        if (
+            action.type === ROUTER.LOCATION_CHANGE &&
+            getApp(action.payload.url) !== 'wallet' &&
+            getApp(action.payload.url) !== 'dashboard' &&
+            getApp(action.payload.url) !== 'settings'
+        ) {
+            interruptionIntent = true;
+        }
+        if (action.type === MODAL.OPEN_USER_CONTEXT && action.payload.type === 'connect-popup') {
+            interruptionIntent = true;
         }
 
         // discovery interruption ends after DISCOVERY.STOP action
@@ -144,6 +153,7 @@ export const prepareDiscoveryMiddleware = createMiddlewareWithExtraDeps(
         if (
             becomesConnected ||
             action.type === SUITE.APP_CHANGED ||
+            connectPopupCallThunk.fulfilled.match(action) ||
             deviceActions.selectDevice.match(action) ||
             authorizeDeviceThunk.fulfilled.match(action) ||
             walletSettingsActions.changeNetworks.match(action) ||

diff --git a/suite-common/connect-init/src/connectInitThunks.ts b/suite-common/connect-init/src/connectInitThunks.ts
@@ -193,8 +193,6 @@ export const connectPopupCallThunk = createThunk(
 
             if (!device) {
                 console.error('Device not found');
-                // Need to select device first
-                dispatch(extra.thunks.openSwitchDeviceDialog());
 
                 // TODO: wait for device selection and continue
                 throw ERRORS.TypedError('Device_NotFound');