fix(suite-sync): tweak middlewares

Author: juriczech

packages/suite/src/middlewares/suite/suiteMiddleware.ts

@@ -11,6 +11,7 @@ import {
     selectIsDeviceAutoEjectEnabled,
     startOrRestartDiscoveryThunk,
 } from '@suite-common/wallet-core';
+import { isTrezorDeviceWithState } from '@suite-common/wallet-utils';
 import { DEVICE } from '@trezor/connect';
 
 import { METADATA, ROUTER, SUITE } from 'src/actions/suite/constants';
@@ -44,7 +45,7 @@ const isActionDeviceRelated = (action: AnyAction): boolean => {
 };
 
 export const prepareSuiteMiddleware = createMiddlewareWithExtraDeps(
-    (action, { dispatch, next, getState }) => {
+    (action, { dispatch, next, getState, extra }) => {
         const prevApp = getState().router.app;
         if (action.type === ROUTER.LOCATION_CHANGE && action.payload.app !== prevApp) {
             dispatch(appChanged(action.payload.app));
@@ -87,6 +88,17 @@ export const prepareSuiteMiddleware = createMiddlewareWithExtraDeps(
         // pass action to reducers
         next(action);
 
+        if (deviceActions.forgetDevice.match(action)) {
+            const { device } = action.payload;
+
+            dispatch(handleDeviceDisconnect(device));
+            if (isTrezorDeviceWithState(device)) {
+                extra.services.suiteSync.turnOffSuiteSyncForWallet({
+                    owner: device.suiteSyncOwner,
+                });
+            }
+        }
+
         switch (action.type) {
             case SUITE.DESKTOP_HANDSHAKE:
                 if (action.payload.protocol) {

suite-common/suite-sync/src/refreshSuiteSyncKeys.ts

@@ -24,7 +24,6 @@ export const createRefreshSuiteSyncKeys =
             return err(RefreshSuiteKeysUnavailable());
         }
 
-        // On connect device (musi mit features)
         const delegatedKeyResult = await deps.ensureDelegatedIdentityKey({ device });
 
         if (!delegatedKeyResult.ok) {

suite-common/suite-sync/src/suiteSyncMiddleware.ts

@@ -1,13 +1,7 @@
 import { isAnyOf } from '@reduxjs/toolkit';
 
 import { createMiddlewareWithExtraDeps } from '@suite-common/redux-utils';
-import {
-    applyDeviceStatesThunk,
-    deviceActions,
-    handleDeviceDisconnect,
-    selectDeviceThunk,
-} from '@suite-common/wallet-core';
-import { isTrezorDeviceWithState } from '@suite-common/wallet-utils';
+import { applyDeviceStatesThunk, selectDeviceThunk } from '@suite-common/wallet-core';
 
 import { selectIsSuiteSyncEnabled } from './suiteSyncSelectors';
 
@@ -20,25 +14,14 @@ const suiteSyncTurnOnTriggers = [
 ] as const;
 
 export const prepareSuiteSyncMiddleware = createMiddlewareWithExtraDeps(
-    (action, { next, getState, extra, dispatch }) => {
+    (action, { next, getState, extra }) => {
         if (selectIsSuiteSyncEnabled(getState()) && isAnyOf(...suiteSyncTurnOnTriggers)(action)) {
             const { payload } = action as ReturnType<(typeof suiteSyncTurnOnTriggers)[number]>;
             extra.services.suiteSync.turnOnSuiteSyncForWallet({
                 staticSessionId: payload.device.state?.staticSessionId,
             });
         }
 
-        if (deviceActions.forgetDevice.match(action)) {
-            const { device } = action.payload;
-
-            dispatch(handleDeviceDisconnect(device));
-            if (isTrezorDeviceWithState(device)) {
-                extra.services.suiteSync.turnOffSuiteSyncForWallet({
-                    owner: device.suiteSyncOwner,
-                });
-            }
-        }
-
         return next(action);
     },
 );

suite-native/device/src/middlewares/deviceMiddleware.ts

@@ -37,7 +37,7 @@ const isActionDeviceRelated = (action: AnyAction): boolean => {
 };
 
 export const prepareDeviceMiddleware = createMiddlewareWithExtraDeps(
-    (action, { dispatch, next, getState }) => {
+    (action, { dispatch, next, getState, extra }) => {
         if (isDeviceEventAction(action, DEVICE.DISCONNECT)) {
             dispatch(forgetDisconnectedDevices({ device: action.payload }));
 
@@ -53,9 +53,15 @@ export const prepareDeviceMiddleware = createMiddlewareWithExtraDeps(
 
         if (deviceActions.forgetDevice.match(action)) {
             const { device } = action.payload;
+
+            dispatch(handleDeviceDisconnect(device));
+
             if (isTrezorDeviceWithState(device)) {
                 const accountsToRemove = selectAccountsByDeviceState(getState(), device.state);
                 dispatch(accountsActions.removeAccount(accountsToRemove));
+                extra.services.suiteSync.turnOffSuiteSyncForWallet({
+                    owner: device.suiteSyncOwner,
+                });
             }
         }
 

suite/e2e/support/enums/accountLabelId.ts

@@ -1,7 +1,7 @@
 export enum AccountLabelId {
     BitcoinDefault1 = "m/84'/0'/0'",
     BitcoinDefault2 = "m/84'/0'/1'",
-    BitcoinDefault3 = "m/84'/0'/2'",
+    BitcoinDefault3 = "m/84'/0'/3'",
     BitcoinSegwit1 = "m/49'/0'/0'",
     BitcoinSegwit2 = "m/49'/0'/1'",
 }

suite/e2e/support/fixtures.ts

@@ -91,8 +91,8 @@ const test = suiteBaseTest.extend<Fixtures>({
     assetsSection: async ({ page }, use) => {
         await use(new AssetsSection(page));
     },
-    metadataPage: async ({ page, settingsPage, dashboardPage, devicePrompt }, use) => {
-        await use(new MetadataPage(page, settingsPage, dashboardPage, devicePrompt));
+    metadataPage: async ({ page, settingsPage, devicePrompt }, use) => {
+        await use(new MetadataPage(page, settingsPage, devicePrompt));
     },
     trezorInput: async ({ page }, use) => {
         await use(new TrezorInput(page));

suite/e2e/tests/metadata/account-metadata.test.ts

@@ -43,13 +43,6 @@ test.describe('Account metadata', { tag: ['@group=metadata', '@webOnly'] }, () =
             await expect(
                 walletPage.accountLabel({ symbol: 'btc', type: 'normal', atIndex: 0 }),
             ).toHaveText('even cooler');
-
-            await expect(
-                metadataPage.account.successLabel(AccountLabelId.BitcoinDefault1),
-            ).toBeVisible();
-            await expect(
-                metadataPage.account.successLabel(AccountLabelId.BitcoinDefault1),
-            ).toBeHidden();
         });
 
         await test.step('Discard label changes via Escape', async () => {
@@ -86,27 +79,6 @@ test.describe('Account metadata', { tag: ['@group=metadata', '@webOnly'] }, () =
             ).toHaveText('Bitcoin #1');
         });
 
-        await test.step('Switch between segwit accounts and check success indicators', async () => {
-            await walletPage.segwitGroupButton.click();
-            await walletPage.openAccount({ symbol: 'btc', type: 'segwit', atIndex: 0 });
-
-            await metadataPage.account.addLabel(
-                AccountLabelId.BitcoinSegwit1,
-                'typing into one input',
-            );
-            await expect(
-                metadataPage.account.successLabel(AccountLabelId.BitcoinSegwit1),
-            ).toBeVisible();
-
-            await walletPage.openAccount({ symbol: 'btc', type: 'segwit', atIndex: 1 });
-            await expect(
-                metadataPage.account.successLabel(AccountLabelId.BitcoinSegwit2),
-            ).toBeHidden();
-            await expect(
-                metadataPage.account.successLabel(AccountLabelId.BitcoinSegwit1),
-            ).toBeHidden();
-        });
-
         await test.step('Navigate to dashboard', async () => {
             await dashboardPage.dashboardMenuButton.click();
             await expect(dashboardPage.graph).toBeVisible();
@@ -122,7 +94,7 @@ test.describe('Account metadata', { tag: ['@group=metadata', '@webOnly'] }, () =
                 'adding label to a newly added account. does it work?',
             );
             await expect(
-                walletPage.accountLabel({ symbol: 'btc', type: 'normal', atIndex: 2 }),
+                walletPage.accountLabel({ symbol: 'btc', type: 'normal', atIndex: 3 }),
             ).toHaveText('adding label to a newly added account. does it work?');
         });
     });