Master pr for ap381

packages/accounts-controller/src/AccountsController.test.ts

@@ -2023,33 +2023,6 @@ describe('AccountsController', () => {
         `Account Id "${accountId}" not found`,
       );
     });
-
-    it('handle the edge case of undefined accountId during onboarding', async () => {
-      const { accountsController } = setupAccountsController({
-        initialState: {
-          internalAccounts: {
-            accounts: { [mockAccount.id]: mockAccount },
-            selectedAccount: mockAccount.id,
-          },
-        },
-      });
-
-      // @ts-expect-error forcing undefined accountId
-      expect(accountsController.getAccountExpect(undefined)).toStrictEqual({
-        id: '',
-        address: '',
-        options: {},
-        methods: [],
-        type: EthAccountType.Eoa,
-        metadata: {
-          name: '',
-          keyring: {
-            type: '',
-          },
-          importTime: 0,
-        },
-      });
-    });
   });
 
   describe('setSelectedAccount', () => {
@@ -2113,6 +2086,32 @@ describe('AccountsController', () => {
         mockNonEvmAccount,
       );
     });
+
+    it('handle the edge case of undefined accountId during onboarding', async () => {
+      const { accountsController } = setupAccountsController({
+        initialState: {
+          internalAccounts: {
+            accounts: {},
+            selectedAccount: '',
+          },
+        },
+      });
+
+      expect(accountsController.getSelectedAccount()).toStrictEqual({
+        id: '',
+        address: '',
+        options: {},
+        methods: [],
+        type: EthAccountType.Eoa,
+        metadata: {
+          name: '',
+          keyring: {
+            type: '',
+          },
+          importTime: 0,
+        },
+      });
+    });
   });
 
   describe('setAccountName', () => {

packages/accounts-controller/src/AccountsController.ts

@@ -265,9 +265,22 @@ export class AccountsController extends BaseController<
    * @throws An error if the account ID is not found.
    */
   getAccountExpect(accountId: string): InternalAccount {
+    const account = this.getAccount(accountId);
+    if (account === undefined) {
+      throw new Error(`Account Id "${accountId}" not found`);
+    }
+    return account;
+  }
+
+  /**
+   * Returns the last selected evm account.
+   *
+   * @returns The selected internal account.
+   */
+  getSelectedAccount(): InternalAccount {
     // Edge case where the extension is setup but the srp is not yet created
     // certain ui elements will query the selected address before any accounts are created.
-    if (!accountId) {
+    if (this.state.internalAccounts.selectedAccount === '') {
       return {
         id: '',
         address: '',
@@ -284,19 +297,6 @@ export class AccountsController extends BaseController<
       };
     }
 
-    const account = this.getAccount(accountId);
-    if (account === undefined) {
-      throw new Error(`Account Id "${accountId}" not found`);
-    }
-    return account;
-  }
-
-  /**
-   * Returns the last selected evm account.
-   *
-   * @returns The selected internal account.
-   */
-  getSelectedAccount(): InternalAccount {
     const selectedAccount = this.getAccountExpect(
       this.state.internalAccounts.selectedAccount,
     );

packages/assets-controllers/package.json

@@ -53,12 +53,15 @@
     "@metamask/contract-metadata": "^2.4.0",
     "@metamask/controller-utils": "^11.0.0",
     "@metamask/eth-query": "^4.0.0",
+    "@metamask/keyring-api": "^6.4.0",
     "@metamask/keyring-controller": "^17.0.0",
     "@metamask/metamask-eth-abis": "^3.1.1",
     "@metamask/network-controller": "^19.0.0",
     "@metamask/polling-controller": "^8.0.0",
     "@metamask/preferences-controller": "^13.0.0",
     "@metamask/rpc-errors": "^6.2.1",
+    "@metamask/snaps-sdk": "^4.2.0",
+    "@metamask/snaps-utils": "^7.4.0",
     "@metamask/utils": "^8.3.0",
     "@types/bn.js": "^5.1.5",
     "@types/uuid": "^8.3.0",
@@ -73,11 +76,11 @@
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/ethjs-provider-http": "^0.3.0",
-    "@metamask/keyring-api": "^6.4.0",
     "@types/jest": "^27.4.1",
     "@types/lodash": "^4.14.191",
     "@types/node": "^16.18.54",
     "deepmerge": "^4.2.2",
+    "immer": "^9.0.6",
     "jest": "^27.5.1",
     "jest-environment-jsdom": "^27.5.1",
     "nock": "^13.3.1",
@@ -92,7 +95,8 @@
     "@metamask/approval-controller": "^7.0.0",
     "@metamask/keyring-controller": "^17.0.0",
     "@metamask/network-controller": "^19.0.0",
-    "@metamask/preferences-controller": "^13.0.0"
+    "@metamask/preferences-controller": "^13.0.0",
+    "@metamask/snaps-controllers": "^8.1.1"
   },
   "engines": {
     "node": "^18.18 || >=20"