feat

trezor · May 17, 2024 · f424f51 · f424f51
1 parent 1d981d4
commit f424f51
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/packages/suite/src/actions/suite/__fixtures__/suiteActions.ts b/packages/suite/src/actions/suite/__fixtures__/suiteActions.ts
@@ -3,7 +3,7 @@ import { discoveryActions, deviceActions, authorizeDevice } from '@suite-common/
 import { DEVICE, TRANSPORT } from '@trezor/connect';
 import { notificationsActions } from '@suite-common/toast-notifications';
 
-import { SUITE, MODAL } from 'src/actions/suite/constants';
+import { SUITE } from 'src/actions/suite/constants';
 import { TorStatus } from 'src/types/suite';
 
 import * as suiteActions from '../suiteActions';

diff --git a/...es/suite/src/components/suite/notifications/NotificationRenderer/NotificationRenderer.tsx b/...es/suite/src/components/suite/notifications/NotificationRenderer/NotificationRenderer.tsx
@@ -1,6 +1,6 @@
 import type { ComponentType } from 'react';
 
-import type { NotificationEntry } from '@suite-common/toast-notifications';
+import { AUTH_DEVICE, type NotificationEntry } from '@suite-common/toast-notifications';
 import { DEVICE } from '@trezor/connect';
 
 import { NotificationViewProps } from 'src/components/suite';
@@ -217,7 +217,7 @@ export const NotificationRenderer = ({
         case 'coinjoin-interrupted':
             return error(render, notification, 'TR_COINJOIN_INTERRUPTED_ERROR');
         // Events:
-        case '@suite/device/authDevice':
+        case AUTH_DEVICE:
             return info(render, notification, 'EVENT_WALLET_CREATED');
         case DEVICE.CONNECT:
             return (

diff --git a/packages/suite/src/middlewares/suite/eventsMiddleware.ts b/packages/suite/src/middlewares/suite/eventsMiddleware.ts
@@ -9,7 +9,11 @@ import {
 } from '@suite-common/wallet-core';
 import * as deviceUtils from '@suite-common/suite-utils';
 import { DEVICE } from '@trezor/connect';
-import { notificationsActions, removeAccountEventsThunk } from '@suite-common/toast-notifications';
+import {
+    AUTH_DEVICE,
+    notificationsActions,
+    removeAccountEventsThunk,
+} from '@suite-common/toast-notifications';
 
 import { SUITE } from 'src/actions/suite/constants';
 import { AppState, Action, Dispatch } from 'src/types/suite';
@@ -106,9 +110,7 @@ const eventsMiddleware =
         }
 
         if (isAnyOf(authorizeDevice.fulfilled)(action)) {
-            api.dispatch(
-                notificationsActions.addEvent({ type: '@suite/device/authDevice', seen: true }),
-            );
+            api.dispatch(notificationsActions.addEvent({ type: AUTH_DEVICE, seen: true }));
         }
 
         return action;

diff --git a/suite-common/toast-notifications/src/types.ts b/suite-common/toast-notifications/src/types.ts
@@ -137,13 +137,14 @@ export type ToastPayload = (
 ) &
     NotificationOptions;
 
+export const AUTH_DEVICE = 'auth-device';
 export type NotificationEventPayload = (
     | {
           // only temporary, must be same as AUTH_DEVICE value in packages/suite/src/actions/suite/constants/suiteConstants.ts
           // once that will be migrated to @suite-common, this should be replaced directly by suiteActions.authDevice.type
           // this should not break type safety, if someone will change value of AUTH_DEVICE, it will throw error in place
           // where action is used and you will need to change it also here
-          type: '@suite/device/authDevice';
+          type: typeof AUTH_DEVICE;
       }
     | ReceivedTransactionNotification
     | {

diff --git a/suite-common/wallet-core/src/device/deviceReducer.ts b/suite-common/wallet-core/src/device/deviceReducer.ts
@@ -526,12 +526,7 @@ export const prepareDeviceReducer = createReducerWithExtraDeps(initialState, (bu
             if (action.payload && action.payload.error) {
                 const { error } = action.payload;
                 if (error === 'auth-failed') {
-                    if (!action.payload.device) return;
                     authFailed(state, action.payload.device);
-                } else if (error === 'passphrase-duplicate') {
-                    // TODO probably create passphrase slice in suite native and on error
-                    // set error in state to show alert
-                    console.warn('passphrase duplicate');
                 }
             }
         })

diff --git a/suite-common/wallet-core/src/device/deviceThunks.ts b/suite-common/wallet-core/src/device/deviceThunks.ts
@@ -276,7 +276,7 @@ export const acquireDevice = createThunk(
 type AuthorizeDeviceParams = { shouldIgnoreDeviceState: boolean } | undefined;
 export type AuthorizeDeviceError = {
     error: string;
-    device?: TrezorDevice;
+    device: TrezorDevice;
     duplicate?: TrezorDevice;
 };
 type AuthorizeDeviceSuccess = { device: TrezorDevice; state: string };
@@ -369,7 +369,10 @@ export const authorizeDevice = createThunk<
             }),
         );
 
-        return rejectWithValue({ error: 'auth-failed', device } as AuthorizeDeviceError);
+        return rejectWithValue({
+            error: 'auth-failed',
+            device: device as TrezorDevice,
+        } as AuthorizeDeviceError);
     },
 );