fixup! feat(suite-native): add settings state & selectors for FW revi…

…sion check
trezor · Jan 29, 2025 · 99a67e1 · 99a67e1
1 parent 8f8aac2
commit 99a67e1
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 11 deletions.
diff --git a/packages/suite/src/constants/suite/firmware.ts b/packages/suite/src/constants/suite/firmware.ts
@@ -3,15 +3,14 @@ import { FilterPropertiesByType } from '@trezor/type-utils';
 import { isDevEnv } from '@suite-common/suite-utils';
 
 /*
- * Various scenarios how firmware authenticity check errors are handled in Suite
- * see suite-native/config/src/firmware.ts for Suite Lite
+ * Various scenarios how firmware authenticity check errors are handled
  */
 
 // will be ignored completely
 type SkippedBehavior = { type: 'skipped'; shouldReport: boolean };
-// display a warning banner
+// display `SuiteBanners` warning
 type SoftWarningBehavior = { type: 'softWarning'; shouldReport: true };
-// display "Device Compromised" modal, after closing it dispaly a warning banner, block receiving address
+// display `SuiteBanners`, show `DeviceCompromised` modal, block receiving address
 type HardModalBehavior = { type: 'hardModal'; shouldReport: true };
 
 type RevisionErrorBehavior = SoftWarningBehavior | HardModalBehavior;

diff --git a/suite-native/config/package.json b/suite-native/config/package.json
@@ -12,7 +12,6 @@
     "dependencies": {
         "@mobily/ts-belt": "^3.13.1",
         "@suite-common/wallet-config": "workspace:*",
-        "@suite-common/wallet-utils": "workspace:*",
-        "@trezor/connect": "workspace:*"
+        "@suite-common/wallet-utils": "workspace:*"
     }
 }
diff --git a/suite-native/config/src/index.ts b/suite-native/config/src/index.ts
@@ -1,3 +1,2 @@
 export * from './environment';
 export * from './supportedNetworks';
-export * from './firmware';
diff --git a/suite-native/config/tsconfig.json b/suite-native/config/tsconfig.json
@@ -7,7 +7,6 @@
         },
         {
             "path": "../../suite-common/wallet-utils"
-        },
-        { "path": "../../packages/connect" }
+        }
     ]
 }
diff --git a/suite-native/config/src/firmware.ts → suite-native/device/src/config/firmware.ts b/suite-native/config/src/firmware.ts → suite-native/device/src/config/firmware.ts
diff --git a/suite-native/device/src/index.ts b/suite-native/device/src/index.ts
@@ -11,3 +11,4 @@ export * from './components/DeviceImage';
 export * from './utils';
 export * from './selectors';
 export * from './deviceThunks';
+export * from './config/firmware';
diff --git a/suite-native/device/src/selectors.ts b/suite-native/device/src/selectors.ts
@@ -24,7 +24,6 @@ import {
 } from '@suite-common/wallet-core';
 import { isDeviceAcquired } from '@suite-common/suite-utils';
 import { getAccountFiatBalance } from '@suite-common/wallet-utils';
-import { revisionCheckErrorScenarios } from '@suite-native/config';
 import { selectFiatCurrencyCode, SettingsSliceRootState } from '@suite-native/settings';
 import { BigNumber } from '@trezor/utils';
 import { Account, RatesByKey } from '@suite-common/wallet-types';
@@ -37,6 +36,7 @@ import {
 } from '@suite-native/feature-flags';
 
 import { isFirmwareVersionSupported } from './utils';
+import { revisionCheckErrorScenarios } from './config/firmware';
 
 type NativeDeviceRootState = DeviceRootState &
     AccountsRootState &

diff --git a/yarn.lock b/yarn.lock
@@ -10200,7 +10200,6 @@ __metadata:
     "@mobily/ts-belt": "npm:^3.13.1"
     "@suite-common/wallet-config": "workspace:*"
     "@suite-common/wallet-utils": "workspace:*"
-    "@trezor/connect": "workspace:*"
   languageName: unknown
   linkType: soft
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ @@
             },
             {
                 "path": "../../suite-common/wallet-utils"
-            },
-            { "path": "../../packages/connect" }
+            }
         ]
     }