refactor: introduce a common flag for Bluetooth OS unpairing

yanascz · yanascz · commit dc2254c9294f · 2025-10-07T14:22:20.000+02:00
diff --git a/packages/suite/src/actions/bluetooth/__tests__/desktopBluetoothReducer.test.ts b/packages/suite/src/actions/bluetooth/__tests__/desktopBluetoothReducer.test.ts
@@ -23,7 +23,6 @@ const bluetoothReducer = bluetoothSlice.prepareReducer(extraDependenciesMock);
 
 const initialState: DesktopBluetoothState = {
     ...prepareInitialState(),
-    unpairedDeviceNeedsManualOsRemoval: false,
     connectingDeviceIds: [],
     isUnpairingDevice: false,
 };
diff --git a/packages/suite/src/actions/bluetooth/bluetoothConnectDeviceThunk.ts b/packages/suite/src/actions/bluetooth/bluetoothConnectDeviceThunk.ts
@@ -6,7 +6,6 @@ import { desktopApi } from '@trezor/suite-desktop-api';
 import { bluetoothIpc } from '@trezor/transport-bluetooth';
 
 import {
-    setBluetoothDeviceNeedsManualOsRemoval,
     startConnectingBluetoothDevice,
     stopConnectingBluetoothDevice,
 } from './desktopBluetoothReducer';
@@ -40,7 +39,7 @@ export const bluetoothConnectDeviceThunk = createThunk<
                 result.error.includes('Operation already in progress') ||
                 result.error.includes('Peer removed pairing information');
             if (isUnpaired) {
-                dispatch(setBluetoothDeviceNeedsManualOsRemoval({ needsManualRemoval: true }));
+                dispatch(bluetoothActions.setIsDeviceOsUnpairingRequired(true));
                 dispatch(bluetoothActions.removeKnownDeviceAction({ id: deviceId }));
             } else {
                 dispatch(
diff --git a/packages/suite/src/actions/bluetooth/bluetoothEraseBondsThunk.ts b/packages/suite/src/actions/bluetooth/bluetoothEraseBondsThunk.ts
@@ -1,4 +1,8 @@
-import { BLUETOOTH_PREFIX, bluetoothActions } from '@suite-common/bluetooth';
+import {
+    BLUETOOTH_PREFIX,
+    ForgetBluetoothDeviceThunkParams,
+    bluetoothActions,
+} from '@suite-common/bluetooth';
 import { createThunk } from '@suite-common/redux-utils';
 import { notificationsActions } from '@suite-common/toast-notifications';
 import {
@@ -10,16 +14,7 @@ import TrezorConnect, { BluetoothDeviceId } from '@trezor/connect';
 import { bluetoothIpc } from '@trezor/transport-bluetooth';
 
 import { bluetoothDisconnectDeviceThunk } from './bluetoothDisconnectDeviceThunk';
-import {
-    setBluetoothDeviceNeedsManualOsRemoval,
-    setIsUnpairingDevice,
-} from './desktopBluetoothReducer';
-
-type ForgetBluetoothDeviceThunkParams = {
-    // This thunk must rely on `bluetoothId` directly. When this thunk is called,
-    // the device may already be disconnected, and therefore, it cannot be selected from the state.
-    bluetoothId: BluetoothDeviceId;
-};
+import { setIsUnpairingDevice } from './desktopBluetoothReducer';
 
 export const forgetBluetoothDeviceThunk = createThunk<void, ForgetBluetoothDeviceThunkParams, void>(
     `${BLUETOOTH_PREFIX}/forgetBluetoothDevice`,
@@ -29,7 +24,7 @@ export const forgetBluetoothDeviceThunk = createThunk<void, ForgetBluetoothDevic
         const resultForget = await bluetoothIpc.forgetDevice(bluetoothId);
         dispatch(setIsUnpairingDevice({ isUnpairing: false }));
         if (!resultForget.success) {
-            dispatch(setBluetoothDeviceNeedsManualOsRemoval({ needsManualRemoval: true }));
+            dispatch(bluetoothActions.setIsDeviceOsUnpairingRequired(true));
         }
         dispatch(bluetoothActions.removeKnownDeviceAction({ id: bluetoothId }));
     },
diff --git a/packages/suite/src/actions/bluetooth/desktopBluetoothReducer.ts b/packages/suite/src/actions/bluetooth/desktopBluetoothReducer.ts
@@ -9,10 +9,6 @@ import { deviceActions } from '@suite-common/wallet-core';
 import { DesktopBluetoothDevice } from './DesktopBluetoothDevice';
 
 export type DesktopBluetoothState = BluetoothState<DesktopBluetoothDevice> & {
-    // Flag to display some extra info (Modal) to instruct the user to remove
-    // the device from the OS settings manually
-    unpairedDeviceNeedsManualOsRemoval: boolean;
-
     // When we get an update that KnownDevice appeared, we start auto-connecting to it.
     // But there may be other updates before the connection is done, and we want to skip them
     // during the connection process.
@@ -36,14 +32,10 @@ export const bluetoothSlice = createSliceWithExtraDeps({
     name: 'bluetooth',
     initialState: {
         ...prepareInitialState<DesktopBluetoothDevice>(),
-        unpairedDeviceNeedsManualOsRemoval: false,
         connectingDeviceIds: [] as string[],
         isUnpairingDevice: false,
     } satisfies DesktopBluetoothState,
     reducers: {
-        setBluetoothDeviceNeedsManualOsRemoval: (state, { payload: { needsManualRemoval } }) => {
-            state.unpairedDeviceNeedsManualOsRemoval = needsManualRemoval;
-        },
         startConnectingBluetoothDevice: (state, { payload: { deviceId } }) => {
             state.connectingDeviceIds.push(deviceId);
         },
@@ -79,7 +71,6 @@ export const bluetoothSlice = createSliceWithExtraDeps({
 });
 
 export const {
-    setBluetoothDeviceNeedsManualOsRemoval,
     startConnectingBluetoothDevice,
     stopConnectingBluetoothDevice,
     setIsUnpairingDevice,
diff --git a/packages/suite/src/actions/bluetooth/desktopBluetoothSelectors.ts b/packages/suite/src/actions/bluetooth/desktopBluetoothSelectors.ts
@@ -3,8 +3,5 @@ import { WithBluetoothRootState } from './desktopBluetoothReducer';
 export const selectConnectingDevices = (state: WithBluetoothRootState) =>
     state.bluetooth.connectingDeviceIds;
 
-export const selectUnpairedDeviceNeedsManualOsRemoval = (state: WithBluetoothRootState) =>
-    state.bluetooth.unpairedDeviceNeedsManualOsRemoval;
-
 export const selectIsUnpairingDevice = (state: WithBluetoothRootState) =>
     state.bluetooth.isUnpairingDevice;
diff --git a/packages/suite/src/components/connection/ConnectDeviceGlobalModal.tsx b/packages/suite/src/components/connection/ConnectDeviceGlobalModal.tsx
@@ -1,13 +1,10 @@
 import { useTheme } from 'styled-components';
 
-import { selectAdapterStatus } from '@suite-common/bluetooth';
+import { selectAdapterStatus, selectIsDeviceOsUnpairingRequired } from '@suite-common/bluetooth';
 import { Box, Button, Column, Modal, Row, Spinner, Text } from '@trezor/components';
 import { borders } from '@trezor/theme';
 
-import {
-    selectIsUnpairingDevice,
-    selectUnpairedDeviceNeedsManualOsRemoval,
-} from 'src/actions/bluetooth/desktopBluetoothSelectors';
+import { selectIsUnpairingDevice } from 'src/actions/bluetooth/desktopBluetoothSelectors';
 import { Translation } from 'src/components/suite/Translation';
 import { useSelector } from 'src/hooks/suite';
 import { selectSuiteFlags } from 'src/selectors/suite/suiteSelectors';
@@ -79,7 +76,7 @@ export const ConnectDeviceGlobalModal = ({ onCancel }: { onCancel: () => void })
         selectedDevice,
     } = useConnectionGlobalModalContext();
 
-    const wasBluetoothDeviceWiped = useSelector(selectUnpairedDeviceNeedsManualOsRemoval);
+    const wasBluetoothDeviceWiped = useSelector(selectIsDeviceOsUnpairingRequired);
     const isUnpairingDevice = useSelector(selectIsUnpairingDevice);
 
     const { isBluetoothEnabled } = useSelector(selectSuiteFlags);
diff --git a/packages/suite/src/components/suite/bluetooth/UnpairBluetoothDeviceFromOsModal.tsx b/packages/suite/src/components/suite/bluetooth/UnpairBluetoothDeviceFromOsModal.tsx
@@ -1,13 +1,13 @@
 import { useState } from 'react';
 
+import { bluetoothActions } from '@suite-common/bluetooth';
 import { Banner, Column, H3, Modal, Paragraph, Spinner } from '@trezor/components';
 import { spacings } from '@trezor/theme';
 
 import { openSystemSettingsThunk } from 'src/actions/bluetooth/openSystemSettingsThunk';
 import { toggleConnectionModal } from 'src/actions/device/deviceSlice';
 import { Translation } from 'src/components/suite/Translation';
 
-import { setBluetoothDeviceNeedsManualOsRemoval } from '../../../actions/bluetooth/desktopBluetoothReducer';
 import { selectIsUnpairingDevice } from '../../../actions/bluetooth/desktopBluetoothSelectors';
 import { useDispatch, useSelector } from '../../../hooks/suite';
 
@@ -32,7 +32,7 @@ export const UnpairBluetoothDeviceFromOsModal = ({
     };
 
     const onCancel = () => {
-        dispatch(setBluetoothDeviceNeedsManualOsRemoval({ needsManualRemoval: false }));
+        dispatch(bluetoothActions.setIsDeviceOsUnpairingRequired(false));
         dispatch(toggleConnectionModal());
         onFinish?.();
     };
diff --git a/packages/suite/src/components/suite/bluetooth/WipedBleDeviceNeedsManualOsRemovalModalManager.tsx b/packages/suite/src/components/suite/bluetooth/WipedBleDeviceNeedsManualOsRemovalModalManager.tsx
@@ -1,9 +1,10 @@
+import { selectIsDeviceOsUnpairingRequired } from '@suite-common/bluetooth';
+
 import { UnpairBluetoothDeviceFromOsModal } from './UnpairBluetoothDeviceFromOsModal';
-import { selectUnpairedDeviceNeedsManualOsRemoval } from '../../../actions/bluetooth/desktopBluetoothSelectors';
 import { useSelector } from '../../../hooks/suite';
 
 export const WipedBleDeviceNeedsManualOsRemovalModalManager = () => {
-    const wasBluetoothDeviceWiped = useSelector(selectUnpairedDeviceNeedsManualOsRemoval);
+    const wasBluetoothDeviceWiped = useSelector(selectIsDeviceOsUnpairingRequired);
 
     if (!wasBluetoothDeviceWiped) {
         return null;
diff --git a/packages/suite/src/support/tests/__fixtures__/defaultAppState.ts b/packages/suite/src/support/tests/__fixtures__/defaultAppState.ts
@@ -18,7 +18,6 @@ export const initialAppState: AppState = {
     suite: suiteInitialState,
     device: initialState,
     bluetooth: {
-        unpairedDeviceNeedsManualOsRemoval: false,
         connectingDeviceIds: [],
         isUnpairingDevice: false,
         adapterStatus: 'unknown',
@@ -27,6 +26,7 @@ export const initialAppState: AppState = {
         knownDevices: [],
         ignoredDeviceIds: [],
         autoConnectPolicy: {},
+        isDeviceOsUnpairingRequired: false,
     },
     thp: {
         step: null,
diff --git a/suite-common/bluetooth/src/bluetoothActions.ts b/suite-common/bluetooth/src/bluetoothActions.ts
@@ -78,6 +78,11 @@ const setAutoConnectPolicyAction = createAction(
     }),
 );
 
+const setIsDeviceOsUnpairingRequired = createAction(
+    `${BLUETOOTH_PREFIX}/set-is-device-os-unpairing-required`,
+    (isDeviceOsUnpairingRequired: boolean) => ({ payload: isDeviceOsUnpairingRequired }),
+);
+
 export const bluetoothActions = {
     adapterEventAction,
     nearbyDevicesUpdateAction,
@@ -87,4 +92,5 @@ export const bluetoothActions = {
     removeKnownDeviceAction,
     updateDeviceConnectionStatus,
     setAutoConnectPolicyAction,
+    setIsDeviceOsUnpairingRequired,
 };
diff --git a/suite-common/bluetooth/src/bluetoothReducer.ts b/suite-common/bluetooth/src/bluetoothReducer.ts
@@ -24,6 +24,7 @@ export type BluetoothState<T extends BluetoothDeviceCommon> = {
     knownDevices: T[];
     ignoredDeviceIds: string[];
     autoConnectPolicy: Record<string, BluetoothAutoConnectPolicy | undefined>;
+    isDeviceOsUnpairingRequired: boolean;
 };
 
 export const prepareInitialState = <T extends BluetoothDeviceCommon>(): BluetoothState<T> => ({
@@ -33,6 +34,7 @@ export const prepareInitialState = <T extends BluetoothDeviceCommon>(): Bluetoot
     knownDevices: [] as T[],
     ignoredDeviceIds: [],
     autoConnectPolicy: {},
+    isDeviceOsUnpairingRequired: false,
 });
 
 export const prepareBluetoothReducerCreator = <T extends BluetoothDeviceCommon>() =>
@@ -118,6 +120,9 @@ export const prepareBluetoothReducerCreator = <T extends BluetoothDeviceCommon>(
             .addCase(bluetoothActions.setAutoConnectPolicyAction, (state, { payload }) => {
                 state.autoConnectPolicy[payload.id] = payload.policy;
             })
+            .addCase(bluetoothActions.setIsDeviceOsUnpairingRequired, (state, { payload }) => {
+                state.isDeviceOsUnpairingRequired = payload;
+            })
 
             .addMatcher(
                 action =>
diff --git a/suite-common/bluetooth/src/bluetoothSelectors.ts b/suite-common/bluetooth/src/bluetoothSelectors.ts
@@ -51,6 +51,10 @@ export const selectAutoConnectPolicy = <T extends BluetoothDeviceCommon>(
     state: WithBluetoothState<T>,
 ) => state.bluetooth.autoConnectPolicy;
 
+export const selectIsDeviceOsUnpairingRequired = <T extends BluetoothDeviceCommon>(
+    state: WithBluetoothState<T>,
+) => state.bluetooth.isDeviceOsUnpairingRequired;
+
 export const selectKnownDeviceByDeviceId = <T extends BluetoothDeviceCommon>(
     state: WithBluetoothState<T>,
     deviceId?: string,
diff --git a/suite-common/bluetooth/src/index.ts b/suite-common/bluetooth/src/index.ts
@@ -4,6 +4,7 @@ export type {
     BluetoothFilterPolicy,
     BluetoothAutoConnectPolicy,
     DeviceBluetoothConnectionStatusType,
+    ForgetBluetoothDeviceThunkParams,
 } from './types';
 export type { BluetoothState } from './bluetoothReducer';
 export type { WithBluetoothState } from './bluetoothSelectors';
@@ -17,6 +18,7 @@ export {
     selectScanStatus,
     selectNearbyDevices,
     selectAutoConnectPolicy,
+    selectIsDeviceOsUnpairingRequired,
 } from './bluetoothSelectors';
 
 export { filterOutOldDuplicates } from './filterOutOldDuplicates';
diff --git a/suite-common/bluetooth/src/types.ts b/suite-common/bluetooth/src/types.ts
@@ -57,3 +57,9 @@ export type BluetoothDeviceCommon = {
 };
 
 export type DeviceBluetoothConnectionStatusType = DeviceBluetoothConnectionStatus['type'];
+
+export type ForgetBluetoothDeviceThunkParams = {
+    // This thunk must rely on `bluetoothId` directly. When this thunk is called,
+    // the device may already be disconnected, and therefore, it cannot be selected from the state.
+    bluetoothId: BluetoothDeviceId;
+};
diff --git a/suite-native/bluetooth/src/__tests__/selectors.test.ts b/suite-native/bluetooth/src/__tests__/selectors.test.ts
@@ -17,7 +17,6 @@ const initialState: NativeBluetoothState = {
         '1ec77690-be29-43c6-8859-dfeca15c7c0f': { type: 'autoconnect-disabled' },
     },
     permissionStatus: 'granted',
-    shouldShowSystemUnpairingAlert: false,
 };
 
 const unknownDevice: BluetoothDevice = {
diff --git a/suite-native/bluetooth/src/bluetoothSlice.ts b/suite-native/bluetooth/src/bluetoothSlice.ts
@@ -13,7 +13,6 @@ import { BluetoothDevice, BluetoothPermissionStatus } from './types';
 
 export type NativeBluetoothState = BluetoothState<BluetoothDevice> & {
     permissionStatus: BluetoothPermissionStatus;
-    shouldShowSystemUnpairingAlert: boolean;
 };
 
 export type NativeBluetoothRootState = {
@@ -35,9 +34,6 @@ export const bluetoothSlice = createSliceWithExtraDeps({
                 state.permissionStatus = payload;
             }
         },
-        setShouldShowSystemUnpairingAlert: (state, { payload }: PayloadAction<boolean>) => {
-            state.shouldShowSystemUnpairingAlert = payload;
-        },
     },
     extraReducers: (builder, extra) => {
         const commonReducer = prepareBluetoothReducerCreator<BluetoothDevice>()(extra);
@@ -54,4 +50,4 @@ export const bluetoothSlice = createSliceWithExtraDeps({
     },
 });
 
-export const { updatePermissionStatus, setShouldShowSystemUnpairingAlert } = bluetoothSlice.actions;
+export const { updatePermissionStatus } = bluetoothSlice.actions;
diff --git a/suite-native/bluetooth/src/bluetoothThunks.ts b/suite-native/bluetooth/src/bluetoothThunks.ts
@@ -0,0 +1,14 @@
+import {
+    BLUETOOTH_PREFIX,
+    ForgetBluetoothDeviceThunkParams,
+    bluetoothActions,
+} from '@suite-common/bluetooth';
+import { createThunk } from '@suite-common/redux-utils';
+
+export const forgetBluetoothDeviceThunk = createThunk<void, ForgetBluetoothDeviceThunkParams, void>(
+    `${BLUETOOTH_PREFIX}/forgetBluetoothDevice`,
+    ({ bluetoothId }, { dispatch }) => {
+        dispatch(bluetoothActions.removeKnownDeviceAction({ id: bluetoothId }));
+        dispatch(bluetoothActions.setIsDeviceOsUnpairingRequired(true));
+    },
+);
diff --git a/suite-native/bluetooth/src/hooks/useBluetoothDevice.ts b/suite-native/bluetooth/src/hooks/useBluetoothDevice.ts
@@ -7,7 +7,7 @@ import { requestPrioritizedDeviceAccess } from '@suite-native/device-mutex';
 import TrezorConnect from '@trezor/connect';
 import { bluetoothManager } from '@trezor/transport-native-bluetooth';
 
-import { setShouldShowSystemUnpairingAlert } from '../bluetoothSlice';
+import { forgetBluetoothDeviceThunk } from '../bluetoothThunks';
 import { BluetoothDevice } from '../types';
 
 type UnpairDeviceProps = {
@@ -49,8 +49,7 @@ export const useBluetoothDevice = () => {
 
             const { success, payload } = result.payload;
             if (success || payload.code === 'Device_Disconnected') {
-                dispatch(bluetoothActions.removeKnownDeviceAction({ id: deviceBluetoothId }));
-                dispatch(setShouldShowSystemUnpairingAlert(true));
+                dispatch(forgetBluetoothDeviceThunk({ bluetoothId: deviceBluetoothId }));
                 onSuccess();
             } else if (
                 payload.code === 'Failure_ActionCancelled' ||
diff --git a/suite-native/bluetooth/src/hooks/useBluetoothPlatformSpecificAlerts.android.tsx b/suite-native/bluetooth/src/hooks/useBluetoothPlatformSpecificAlerts.android.tsx
@@ -5,10 +5,10 @@ import { useDispatch } from 'react-redux';
 
 import { useNavigation } from '@react-navigation/native';
 
+import { bluetoothActions } from '@suite-common/bluetooth';
 import { useAlert } from '@suite-native/alerts';
 import { useTranslate } from '@suite-native/intl';
 
-import { setShouldShowSystemUnpairingAlert } from '../bluetoothSlice';
 import { useBluetoothSettings } from './useBluetoothSettings';
 
 export const useBluetoothPlatformSpecificAlerts = () => {
@@ -47,12 +47,12 @@ export const useBluetoothPlatformSpecificAlerts = () => {
             description: translate('bluetooth.alerts.systemUnpairing.description.android'),
             primaryButtonTitle: translate('bluetooth.alerts.systemUnpairing.primaryButton'),
             onPressPrimaryButton: () => {
-                dispatch(setShouldShowSystemUnpairingAlert(false));
+                dispatch(bluetoothActions.setIsDeviceOsUnpairingRequired(false));
                 openBluetoothSettings();
             },
             secondaryButtonTitle: translate('bluetooth.alerts.systemUnpairing.secondaryButton'),
             onPressSecondaryButton: () => {
-                dispatch(setShouldShowSystemUnpairingAlert(false));
+                dispatch(bluetoothActions.setIsDeviceOsUnpairingRequired(false));
             },
         });
     }, [showAlert, dispatch, openBluetoothSettings, translate]);
diff --git a/suite-native/bluetooth/src/hooks/useBluetoothPlatformSpecificAlerts.ios.tsx b/suite-native/bluetooth/src/hooks/useBluetoothPlatformSpecificAlerts.ios.tsx
@@ -3,11 +3,11 @@
 import { useCallback } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
+import { bluetoothActions } from '@suite-common/bluetooth';
 import { selectDeviceName } from '@suite-common/wallet-core';
 import { useAlert } from '@suite-native/alerts';
 import { useTranslate } from '@suite-native/intl';
 
-import { setShouldShowSystemUnpairingAlert } from '../bluetoothSlice';
 import { SystemUnpairingAlertIosInstructions } from '../components/SystemUnpairingAlertIosInstructions';
 
 export const useBluetoothPlatformSpecificAlerts = () => {
@@ -47,7 +47,7 @@ export const useBluetoothPlatformSpecificAlerts = () => {
             ),
             primaryButtonTitle: translate('generic.buttons.gotIt'),
             onPressPrimaryButton: () => {
-                dispatch(setShouldShowSystemUnpairingAlert(false));
+                dispatch(bluetoothActions.setIsDeviceOsUnpairingRequired(false));
             },
         });
     }, [showAlert, dispatch, translate, deviceName]);
diff --git a/suite-native/bluetooth/src/index.ts b/suite-native/bluetooth/src/index.ts
@@ -1,5 +1,6 @@
 export * from './types';
 export * from './bluetoothSlice';
+export * from './bluetoothThunks';
 export * from './selectors';
 export * from './hooks/useBluetoothAdapter';
 export * from './hooks/useBluetoothAlerts';
diff --git a/suite-native/bluetooth/src/redux.d.ts b/suite-native/bluetooth/src/redux.d.ts
@@ -0,0 +1,7 @@
+import { AsyncThunkAction } from '@reduxjs/toolkit';
+
+declare module 'redux' {
+    export interface Dispatch {
+        <TThunk extends AsyncThunkAction<any, any, any>>(thunk: TThunk): ReturnType<TThunk>;
+    }
+}
diff --git a/suite-native/bluetooth/src/selectors.ts b/suite-native/bluetooth/src/selectors.ts
diff --git a/suite-native/device/src/hooks/useDetectDeviceError.tsx b/suite-native/device/src/hooks/useDetectDeviceError.tsx
diff --git a/suite-native/device/src/hooks/useWipeDevice.tsx b/suite-native/device/src/hooks/useWipeDevice.tsx
diff --git a/suite-native/module-home/src/screens/HomeScreen/HomeScreen.tsx b/suite-native/module-home/src/screens/HomeScreen/HomeScreen.tsx
diff --git a/suite-native/module-home/src/screens/HomeScreen/useShowAutoEjectAlert.tsx b/suite-native/module-home/src/screens/HomeScreen/useShowAutoEjectAlert.tsx
diff --git a/suite-native/state/src/extraDependencies.ts b/suite-native/state/src/extraDependencies.ts
