Merge branch 'main' into feat/multi-srp-import-srp

Author: montelaidev

app/_locales/de/messages.json

@@ -371,6 +371,7 @@ describe('AppStateController', () => {
           id: '123',
           chainId: '0x1',
           timestamp: new Date().getTime(),
+          origin: 'https://example.com',
         };
 
         controller.setLastInteractedConfirmationInfo(

app/_locales/el/messages.json

@@ -20,7 +20,7 @@ const getMessengerMock = ({
 } = {}) =>
   ({
     call: jest.fn((method: string) => {
-      if (method === 'AccountsController:getSelectedAccount') {
+      if (method === 'AccountsController:getSelectedMultichainAccount') {
         return { address: account };
       } else if (method === 'NetworkController:findNetworkClientIdByChainId') {
         return 'networkClientId';
@@ -216,7 +216,7 @@ describe('BridgeStatusController', () => {
       let getSelectedAccountCalledTimes = 0;
       const messengerMock = {
         call: jest.fn((method: string) => {
-          if (method === 'AccountsController:getSelectedAccount') {
+          if (method === 'AccountsController:getSelectedMultichainAccount') {
             let account;
             if (getSelectedAccountCalledTimes === 0) {
               account = '0xaccount1';
@@ -399,7 +399,7 @@ describe('BridgeStatusController', () => {
       jest.useFakeTimers();
       const messengerMock = {
         call: jest.fn((method: string) => {
-          if (method === 'AccountsController:getSelectedAccount') {
+          if (method === 'AccountsController:getSelectedMultichainAccount') {
             return { address: '0xaccount1' };
           } else if (
             method === 'NetworkController:findNetworkClientIdByChainId'

app/_locales/en/messages.json

@@ -157,7 +157,7 @@ export default class BridgeStatusController extends StaticIntervalPollingControl
       targetContractAddress,
     } = startPollingForBridgeTxStatusArgs;
     const { bridgeStatusState } = this.state;
-    const { address: account } = this.#getSelectedAccount();
+    const accountAddress = this.#getMultichainSelectedAccountAddress();
 
     // Write all non-status fields to state so we can reference the quote in Activity list without the Bridge API
     // We know it's in progress but not the exact status yet
@@ -176,7 +176,7 @@ export default class BridgeStatusController extends StaticIntervalPollingControl
       },
       initialDestAssetBalance,
       targetContractAddress,
-      account,
+      account: accountAddress,
       status: {
         // We always have a PENDING status when we start polling for a tx, don't need the Bridge API for that
         // Also we know the bare minimum fields for status at this point in time
@@ -210,8 +210,14 @@ export default class BridgeStatusController extends StaticIntervalPollingControl
     await this.#fetchBridgeTxStatus(pollingInput);
   };
 
-  #getSelectedAccount() {
-    return this.messagingSystem.call('AccountsController:getSelectedAccount');
+  // Returns an empty string if no account is selected, but this will never happen since
+  // the multichain selected account defaults to the EVM account
+  #getMultichainSelectedAccountAddress() {
+    return (
+      this.messagingSystem.call(
+        'AccountsController:getSelectedMultichainAccount',
+      )?.address ?? ''
+    );
   }
 
   #fetchBridgeTxStatus = async ({

app/_locales/en_GB/messages.json

@@ -8,7 +8,7 @@ import {
   NetworkControllerGetNetworkClientByIdAction,
   NetworkControllerGetStateAction,
 } from '@metamask/network-controller';
-import { AccountsControllerGetSelectedAccountAction } from '@metamask/accounts-controller';
+import { AccountsControllerGetSelectedMultichainAccountAction } from '@metamask/accounts-controller';
 import { TransactionControllerGetStateAction } from '@metamask/transaction-controller';
 import {
   BridgeHistoryItem,
@@ -63,7 +63,7 @@ type AllowedActions =
   | NetworkControllerFindNetworkClientIdByChainIdAction
   | NetworkControllerGetStateAction
   | NetworkControllerGetNetworkClientByIdAction
-  | AccountsControllerGetSelectedAccountAction
+  | AccountsControllerGetSelectedMultichainAccountAction
   | TransactionControllerGetStateAction;
 
 /**