migrate all selectedAddress methods

MetaMask · Mar 1, 2024 · c2c4f60 · c2c4f60
1 parent 89e9f81
commit c2c4f60
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/app/core/Engine.ts b/app/core/Engine.ts
@@ -763,7 +763,7 @@ class Engine {
       onPreferencesStateChange: (listener) =>
         preferencesController.subscribe(listener),
       getIdentities: () => preferencesController.state.identities,
-      getSelectedAddress: () => preferencesController.state.selectedAddress,
+      getSelectedAddress: () => accountsController.getSelectedAccount().address,
       getMultiAccountBalancesEnabled: () =>
         preferencesController.state.isMultiAccountBalancesEnabled,
       getCurrentChainId: () =>
@@ -1065,7 +1065,8 @@ class Engine {
         {
           onTokensStateChange: (listener) =>
             tokensController.subscribe(listener),
-          getSelectedAddress: () => preferencesController.state.selectedAddress,
+          getSelectedAddress: () =>
+            accountsController.getSelectedAccount().address,
           getERC20BalanceOf: assetsContractController.getERC20BalanceOf.bind(
             assetsContractController,
           ),
@@ -1102,7 +1103,8 @@ class Engine {
           networkController.getProviderAndBlockTracker().blockTracker,
         getGasFeeEstimates: () => gasFeeController.fetchGasFeeEstimates(),
         getNetworkState: () => networkController.state,
-        getSelectedAddress: () => preferencesController.state.selectedAddress,
+        getSelectedAddress: () =>
+          accountsController.getSelectedAccount().address,
         incomingTransactions: {
           apiKey: process.env.MM_ETHERSCAN_KEY,
           isEnabled: () => {