fix: make typings for storageLoad a bit more 'nice'

trezor · Feb 14, 2025 · 44f7c48 · 44f7c48
1 parent 5dbe6c7
commit 44f7c48
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/suite-common/bluetooth/package.json b/suite-common/bluetooth/package.json
@@ -11,6 +11,7 @@
     },
     "dependencies": {
         "@reduxjs/toolkit": "1.9.5",
+        "@suite-common/redux-utils": "workspace:*",
         "@suite-common/wallet-core": "workspace:*"
     }
 }
diff --git a/suite-common/bluetooth/src/bluetoothReducerCreator.ts b/suite-common/bluetooth/src/bluetoothReducerCreator.ts
@@ -1,5 +1,6 @@
-import { Draft, createReducer } from '@reduxjs/toolkit';
+import { AnyAction, Draft } from '@reduxjs/toolkit';
 
+import { createReducerWithExtraDeps } from '@suite-common/redux-utils';
 import { deviceActions } from '@suite-common/wallet-core';
 
 import {
@@ -51,13 +52,8 @@ export const bluetoothReducerCreator = <T extends BluetoothDevice>() => {
         devices: [] as T[],
     };
 
-    return createReducer<BluetoothState<T>>(initialState, builder =>
+    return createReducerWithExtraDeps<BluetoothState<T>>(initialState, (builder, extra) =>
         builder
-            .addCase('@storage/load', (state, rest) => {
-                // Todo: figure out hot to type it
-                // @ts-expect-error typed action
-                state.knownDevices = rest.payload.knownDevices?.bluetooth || [];
-            })
             .addCase(bluetoothAdapterEventAction, (state, { payload: { isPowered } }) => {
                 state.isAdapterEnabled = isPowered;
                 if (!isPowered) {
@@ -125,6 +121,12 @@ export const bluetoothReducerCreator = <T extends BluetoothDevice>() => {
                         }
                     }
                 },
+            )
+            .addMatcher(
+                action => action.type === extra.actionTypes.storageLoad,
+                (state, action: AnyAction) => {
+                    state.knownDevices = action.payload.knownDevices?.bluetooth;
+                },
             ),
     );
 };
diff --git a/yarn.lock b/yarn.lock
@@ -10270,6 +10270,7 @@ __metadata:
   resolution: "@suite-common/bluetooth@workspace:suite-common/bluetooth"
   dependencies:
     "@reduxjs/toolkit": "npm:1.9.5"
+    "@suite-common/redux-utils": "workspace:*"
     "@suite-common/wallet-core": "workspace:*"
   languageName: unknown
   linkType: soft