fix(suite-native): simplify and fix deleting state related to non-remembered device when disconnected

Author: matejkriz

suite-common/wallet-core/src/accounts/accountsReducer.ts

@@ -14,7 +14,6 @@ import {
     selectDevice,
     selectIsNoPhysicalDeviceConnected,
     selectIsPortfolioTrackerDevice,
-    selectPersistedDeviceStates,
 } from '../device/deviceReducer';
 import { DiscoveryRootState, selectIsDeviceDiscoveryActive } from '../discovery/discoveryReducer';
 
@@ -366,15 +365,6 @@ export const selectIsDeviceDiscoveryEmpty = (
     return isDeviceAccountless && !isDeviceDiscoveryActive;
 };
 
-export const selectDevicelessAccounts = (state: AccountsRootState & DeviceRootState) => {
-    const persistedDevicesStates = selectPersistedDeviceStates(state);
-
-    return pipe(
-        selectAccounts(state),
-        A.filter(account => !persistedDevicesStates.includes(account.deviceState)),
-    ) as Account[];
-};
-
 export const selectAreAllDevicesDisconnectedOrAccountless = (
     state: AccountsRootState & DeviceRootState & DiscoveryRootState,
 ) => {

suite-common/wallet-core/src/device/deviceReducer.ts

@@ -16,7 +16,7 @@ import { isNative } from '@trezor/env-utils';
 
 import { deviceActions } from './deviceActions';
 import { authorizeDevice } from './deviceThunks';
-import { PORTFOLIO_TRACKER_DEVICE_ID, PORTFOLIO_TRACKER_DEVICE_STATE } from './deviceConstants';
+import { PORTFOLIO_TRACKER_DEVICE_ID } from './deviceConstants';
 
 export type State = {
     devices: TrezorDevice[];
@@ -784,13 +784,6 @@ export const selectDeviceFirmwareVersion = memoize((state: DeviceRootState) => {
 
     return getFirmwareVersionArray(device);
 });
-
-export const selectPersistedDeviceStates = (state: DeviceRootState) => {
-    const devices = selectDevices(state);
-
-    return [...devices.map(d => d.state), PORTFOLIO_TRACKER_DEVICE_STATE];
-};
-
 export const selectPhysicalDevices = memoize((state: DeviceRootState) => {
     const devices = selectDevices(state);
 

suite-common/wallet-core/src/discovery/discoveryReducer.ts

@@ -1,16 +1,10 @@
-import { A, pipe } from '@mobily/ts-belt';
-
 import { createDeferred } from '@trezor/utils';
 import { Discovery, PartialDiscovery } from '@suite-common/wallet-types';
 import { createReducerWithExtraDeps } from '@suite-common/redux-utils';
 import { DiscoveryStatus } from '@suite-common/wallet-constants';
 
 import { discoveryActions } from './discoveryActions';
-import {
-    DeviceRootState,
-    selectDevice,
-    selectPersistedDeviceStates,
-} from '../device/deviceReducer';
+import { DeviceRootState, selectDevice } from '../device/deviceReducer';
 
 export type DiscoveryState = Discovery[];
 
@@ -124,12 +118,3 @@ export const selectIsDiscoveryAuthConfirmationRequired = (
             discovery.status === DiscoveryStatus.COMPLETED)
     );
 };
-
-export const selectDevicelessDiscoveries = (state: DiscoveryRootState & DeviceRootState) => {
-    const persistedDeviceStates = selectPersistedDeviceStates(state);
-
-    return pipe(
-        selectDiscovery(state),
-        A.filter(discovery => !persistedDeviceStates.includes(discovery.deviceState)),
-    ) as Discovery[];
-};

suite-native/app/src/initActions.ts

@@ -9,7 +9,6 @@ import {
 import { initAnalyticsThunk } from '@suite-native/analytics';
 import { selectFiatCurrencyCode } from '@suite-native/settings';
 import { initMessageSystemThunk } from '@suite-common/message-system';
-import { wipeDisconnectedDevicesDataThunk } from '@suite-native/device';
 import { setIsAppReady, setIsConnectInitialized } from '@suite-native/state/src/appSlice';
 import { periodicCheckTokenDefinitionsThunk } from '@suite-common/token-definitions';
 
@@ -47,10 +46,6 @@ export const applicationInit = createThunk(
 
             // Create Portfolio Tracker device if it doesn't exist
             dispatch(createImportedDeviceThunk());
-
-            // In case that user closed the app while device was connected,
-            // remove its persistent data on app init if the device is not connected anymore.
-            dispatch(wipeDisconnectedDevicesDataThunk());
         } catch (error) {
             console.error(error);
         } finally {

suite-native/device/src/deviceThunks.ts

@@ -7,6 +7,5 @@ export * from './hooks/useHandleDeviceRequestsPassphrase';
 export * from './hooks/useReportDeviceConnectToAnalytics';
 export * from './screens/DeviceInfoModalScreen';
 export * from './components/ConnectDeviceAnimation';
-export * from './deviceThunks';
 export * from './utils';
 export * from './selectors';

suite-native/device/src/index.ts

@@ -3,15 +3,16 @@ import { AnyAction, isAnyOf } from '@reduxjs/toolkit';
 import { createMiddlewareWithExtraDeps } from '@suite-common/redux-utils';
 import { DEVICE } from '@trezor/connect';
 import {
+    accountsActions,
     deviceActions,
     forgetDisconnectedDevices,
     handleDeviceDisconnect,
     observeSelectedDevice,
     selectDeviceThunk,
+    selectAccountsByDeviceState,
 } from '@suite-common/wallet-core';
 import { FeatureFlag, selectIsFeatureFlagEnabled } from '@suite-native/feature-flags';
-
-import { wipeDisconnectedDevicesDataThunk } from '../deviceThunks';
+import { clearAndUnlockDeviceAccessQueue } from '@suite-native/device-mutex';
 
 const isActionDeviceRelated = (action: AnyAction): boolean => {
     if (
@@ -49,6 +50,12 @@ export const prepareDeviceMiddleware = createMiddlewareWithExtraDeps(
 
         if (deviceActions.forgetDevice.match(action)) {
             dispatch(handleDeviceDisconnect(action.payload));
+
+            const deviceState = action.payload.state;
+            if (deviceState) {
+                const accounts = selectAccountsByDeviceState(getState(), deviceState);
+                dispatch(accountsActions.removeAccount(accounts));
+            }
         }
 
         const isUsbDeviceConnectFeatureEnabled = selectIsFeatureFlagEnabled(
@@ -65,7 +72,7 @@ export const prepareDeviceMiddleware = createMiddlewareWithExtraDeps(
                 break;
             case DEVICE.DISCONNECT:
                 dispatch(handleDeviceDisconnect(action.payload));
-                dispatch(wipeDisconnectedDevicesDataThunk());
+                clearAndUnlockDeviceAccessQueue();
                 break;
             default:
                 break;

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

@@ -2,6 +2,7 @@ import { G } from '@mobily/ts-belt';
 import { createTransform } from 'redux-persist';
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
+import { deviceActions } from '@suite-common/wallet-core';
 import { AccountKey } from '@suite-common/wallet-types';
 import { selectDeviceStatesNotRemembered, filterObjectKeys } from '@suite-native/storage';
 
@@ -58,6 +59,17 @@ export const graphSlice = createSlice({
             };
         },
     },
+    extraReducers: builder => {
+        builder.addCase(deviceActions.forgetDevice, (state, action) => {
+            const deviceState = action.payload.state;
+            if (deviceState) {
+                state.accountToGraphTimeframeMap = filterObjectKeys(
+                    state.accountToGraphTimeframeMap,
+                    [deviceState],
+                );
+            }
+        });
+    },
 });
 
 export const selectPortfolioGraphTimeframe = (state: GraphSliceRootState) =>