chore(runway): cherry-pick chore: updates multichain-transactions-controller (#15690)

- chore: updates multichain-transactions-controller cp-7.47.0 (#15673)

Author: runway-github[bot]

app/core/Engine/controllers/multichain-transactions-controller/multichain-transactions-controller-init.test.ts

@@ -1,3 +1,4 @@
+import { SolScope } from '@metamask/keyring-api';
 import {
   MultichainTransactionsController,
   MultichainTransactionsControllerState,
@@ -48,9 +49,11 @@ describe('multichain transactions controller init', () => {
       {
         nonEvmTransactions: {
           [MOCK_SOLANA_ACCOUNT.id]: {
-            transactions: [],
-            next: null,
-            lastUpdated: 0,
+            [SolScope.Mainnet]: {
+              transactions: [],
+              next: null,
+              lastUpdated: 0,
+            },
           },
         },
       };

app/selectors/multichain/multichain.test.ts

@@ -721,7 +721,9 @@ describe('MultichainNonEvm Selectors', () => {
 
       state.engine.backgroundState.MultichainTransactionsController.nonEvmTransactions =
         {
-          [MOCK_SOLANA_ACCOUNT.id]: mockTransactionData,
+          [MOCK_SOLANA_ACCOUNT.id]: {
+            [SolScope.Mainnet]: mockTransactionData,
+          },
         };
 
       expect(selectSolanaAccountTransactions(state)).toEqual(
@@ -742,10 +744,18 @@ describe('MultichainNonEvm Selectors', () => {
       const state = getNonEvmState(MOCK_SOLANA_ACCOUNT);
 
       state.engine.backgroundState.MultichainTransactionsController.nonEvmTransactions =
-        {};
+        {
+          [MOCK_SOLANA_ACCOUNT.id]: {
+            [SolScope.Mainnet]: {
+              transactions: [],
+              next: null,
+              lastUpdated: Date.now(),
+            },
+          },
+        };
 
       expect(selectSolanaAccountTransactions(state)).toEqual({
-        lastUpdated: 0,
+        lastUpdated: undefined,
         next: null,
         transactions: [],
       });

app/selectors/multichain/multichain.ts

@@ -435,13 +435,20 @@ const DEFAULT_TRANSACTION_STATE_ENTRY = {
 export const selectSolanaAccountTransactions = createDeepEqualSelector(
   selectMultichainTransactions,
   selectSelectedInternalAccount,
-  (nonEvmTransactions, selectedAccount) => {
+  selectSelectedNonEvmNetworkChainId,
+  (nonEvmTransactions, selectedAccount, selectedNonEvmNetworkChainId) => {
     if (!selectedAccount) {
       return DEFAULT_TRANSACTION_STATE_ENTRY;
     }
 
+    const accountTransactions = nonEvmTransactions[selectedAccount.id];
+    if (!accountTransactions) {
+      return DEFAULT_TRANSACTION_STATE_ENTRY;
+    }
+
     return (
-      nonEvmTransactions[selectedAccount.id] ?? DEFAULT_TRANSACTION_STATE_ENTRY
+      accountTransactions[selectedNonEvmNetworkChainId] ??
+      DEFAULT_TRANSACTION_STATE_ENTRY
     );
   },
 );

package.json

@@ -198,7 +198,7 @@
     "@metamask/message-signing-snap": "^1.1.1",
     "@metamask/metamask-eth-abis": "3.1.1",
     "@metamask/multichain-network-controller": "^0.4.0",
-    "@metamask/multichain-transactions-controller": "^0.10.0",
+    "@metamask/multichain-transactions-controller": "^1.0.0",
     "@metamask/network-controller": "23.2.1-backport",
     "@metamask/notification-services-controller": "^7.0.0",
     "@metamask/permission-controller": "^11.0.6",

yarn.lock

@@ -5357,10 +5357,10 @@
     "@metamask/utils" "^11.2.0"
     "@solana/addresses" "^2.0.0"
 
-"@metamask/multichain-transactions-controller@^0.10.0":
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/@metamask/multichain-transactions-controller/-/multichain-transactions-controller-0.10.0.tgz#db047cd0d2ce2a491a7ae291c3a179a697fbb206"
-  integrity sha512-nPFrz8mXnmmLpHKX3sbn/Msxgj6Zv7DD0dM0Mk3FDBmVAflnrrV3vzFz54YuWT4Utbj1nwdxfK9mnCIeEzN/QQ==
+"@metamask/multichain-transactions-controller@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/multichain-transactions-controller/-/multichain-transactions-controller-1.0.0.tgz#698cc8a2ba5784c2a364461af23cc69873493f62"
+  integrity sha512-YODS4k9O88GuUqMyABD1OxRKZyuTxNEhDvP13uTUuDq/+TDIr4xWUbXYVvw8v74I5p3+93M9RlSqHM4wWg7KuA==
   dependencies:
     "@metamask/base-controller" "^8.0.1"
     "@metamask/keyring-api" "^17.4.0"