fix: refactor type

MetaMask · Jun 24, 2024 · 9eb76f2 · 9eb76f2
1 parent 87009cd
commit 9eb76f2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/ui/hooks/useMultichainSelector.test.ts b/ui/hooks/useMultichainSelector.test.ts
@@ -60,7 +60,7 @@ describe('useMultichainSelector', () => {
   });
 
   it('uses selectedAccount if account is not provided', () => {
-    const { result } = renderUseMultichainHook(getMultichainIsEvm, mockAccount);
+    const { result } = renderUseMultichainHook(getMultichainIsEvm, null);
 
     expect(result.current).toBe(true);
   });

diff --git a/ui/selectors/multichain.ts b/ui/selectors/multichain.ts
@@ -28,25 +28,28 @@ import {
   getShouldShowFiat,
 } from '.';
 
-export type MultichainState = AccountsState & {
+export type RatesState = {
   metamask: {
-    balances: {
-      [accountId: string]: {
-        [assetId: string]: {
-          amount: string;
-          unit: string;
-        };
-      };
+    [ticker: string]: {
+      conversionDate: number;
+      conversionRate: string;
     };
-    rates: {
-      [ticker: string]: {
-        conversionDate: number;
-        conversionRate: string;
+  };
+};
+
+export type BalancesState = {
+  metamask: {
+    [accountId: string]: {
+      [assetId: string]: {
+        amount: string;
+        unit: string;
       };
     };
   };
 };
 
+export type MultichainState = AccountsState & RatesState & BalancesState;
+
 export type MultichainNetwork = {
   nickname: string;
   isEvmNetwork: boolean;
@@ -133,7 +136,7 @@ export function getMultichainIsEvm(
 
   // There are no selected account during onboarding. we default to the original EVM behavior.
   return (
-    !isOnboarded ?? !selectedAccount ?? isEvmAccountType(selectedAccount.type)
+    !isOnboarded || !selectedAccount || isEvmAccountType(selectedAccount.type)
   );
 }