add accounts controller to context

MetaMask · Mar 7, 2024 · f5a7717 · f5a7717
1 parent c94db55
commit f5a7717
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/app/components/Nav/App/index.js b/app/components/Nav/App/index.js
@@ -254,10 +254,11 @@ const App = ({ userLoggedIn }) => {
     }
   };
 
+  // TODO remove this useEffect before merging
   useEffect(() => {
     console.log(
       'Accounts/ AccountController',
-      JSON.stringify(Engine.context.AccountsController, null, 2),
+      JSON.stringify(Engine.context.AccountsController.state, null, 2),
     );
     console.log(
       'Accounts/ PreferencesController',

diff --git a/app/core/Engine.ts b/app/core/Engine.ts
@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable @typescript-eslint/no-shadow */
 import Crypto from 'react-native-quick-crypto';
 import {
   AccountTrackerController,
@@ -607,15 +606,16 @@ class Engine {
       ],
     });
 
-    const defaultAccountControllerState: AccountsControllerState = {
+    const defaultAccountsControllerState: AccountsControllerState = {
       internalAccounts: {
         accounts: {},
         selectedAccount: '',
       },
     };
+
     const accountsController = new AccountsController({
       messenger: accountsControllerMessenger,
-      state: initialState.AccountsController ?? defaultAccountControllerState,
+      state: initialState.AccountsController ?? defaultAccountsControllerState,
     });
 
     const qrKeyringBuilder = () => new QRHardwareKeyring();
@@ -1673,6 +1673,7 @@ export default {
       PermissionController,
       ApprovalController,
       LoggingController,
+      AccountsController,
     } = instance.datamodel.state;
 
     // normalize `null` currencyRate to `0`
@@ -1712,6 +1713,7 @@ export default {
       PermissionController,
       ApprovalController,
       LoggingController,
+      AccountsController,
     };
   },
   get datamodel() {

diff --git a/app/store/migrations/033.test.ts b/app/store/migrations/033.test.ts
@@ -256,4 +256,4 @@ describe('Migration #032', () => {
       });
     });
   });
-});
+});
diff --git a/app/util/number/index.test.ts b/app/util/number/index.test.ts
@@ -97,7 +97,7 @@ describe('Number utils :: toWei', () => {
     expect(() => toWei(new BN(1.337e18))).toThrow(Error);
     expect(() => toWei(new BN(1337000000000000000))).toThrow(Error);
     // For some reason this returns 8338418000000000000000000 wei
-    expect(toWei(new BN('1.337e18'))).not.toEqual(
+    expect(() => toWei(new BN('1.337e18'))).not.toEqual(
       '1337000000000000000000000000000000000',
     );
   });

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -901,7 +901,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Base64: cecfb41a004124895a7bcee567a89bae5a89d49b
-  boost: 7dcd2de282d72e344012f7d6564d024930a6a440
+  boost: 57d2868c099736d80fcd648bf211b4431e51a558
   Branch: 4ac024cb3c29b0ef628048694db3c4cfa679beb0
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99