fix(perps): prefer selected evm account

app/controllers/perps/PerpsController.ts

@@ -120,7 +120,7 @@ import {
   LastTransactionResult,
   TransactionStatus,
 } from './types/transactionTypes';
-import { getSelectedEvmAccount } from './utils/accountUtils';
+import { getSelectedEvmAccountFromMessenger } from './utils/accountUtils';
 import { ensureError } from './utils/errorUtils';
 import {
   hydrateFromDiskSync,
@@ -1155,11 +1155,7 @@ export class PerpsController extends BaseController<
     // Get current user address for validation
     let currentAddress: string | null = null;
     try {
-      const evmAccount = getSelectedEvmAccount(
-        this.messenger.call(
-          'AccountTreeController:getAccountsFromSelectedAccountGroup',
-        ),
-      );
+      const evmAccount = getSelectedEvmAccountFromMessenger(this.messenger);
       currentAddress = evmAccount?.address ?? null;
     } catch {
       // Can't determine current account — trust the cache
@@ -2215,11 +2211,7 @@ export class PerpsController extends BaseController<
       currentDepositId = depositId;
 
       // Get current account address via messenger (outside of update() for proper typing)
-      const evmAccount = getSelectedEvmAccount(
-        this.messenger.call(
-          'AccountTreeController:getAccountsFromSelectedAccountGroup',
-        ),
-      );
+      const evmAccount = getSelectedEvmAccountFromMessenger(this.messenger);
       const accountAddress = evmAccount?.address ?? 'unknown';
 
       this.update((state) => {
@@ -3090,11 +3082,7 @@ export class PerpsController extends BaseController<
 
     // Watch for account changes via AccountTreeController
     const accountChangeHandler = (): void => {
-      const evmAccount = getSelectedEvmAccount(
-        this.messenger.call(
-          'AccountTreeController:getAccountsFromSelectedAccountGroup',
-        ),
-      );
+      const evmAccount = getSelectedEvmAccountFromMessenger(this.messenger);
       const currentAddress = evmAccount?.address ?? null;
 
       // If any cached entry belongs to a different account, clear all entries.
@@ -3332,11 +3320,7 @@ export class PerpsController extends BaseController<
     }
 
     // Get current user address
-    const evmAccount = getSelectedEvmAccount(
-      this.messenger.call(
-        'AccountTreeController:getAccountsFromSelectedAccountGroup',
-      ),
-    );
+    const evmAccount = getSelectedEvmAccountFromMessenger(this.messenger);
     if (!evmAccount?.address) {
       return;
     }

app/controllers/perps/types/messenger.ts

@@ -2,6 +2,7 @@ import type {
   AccountTreeControllerGetAccountsFromSelectedAccountGroupAction,
   AccountTreeControllerSelectedAccountGroupChangeEvent,
 } from '@metamask/account-tree-controller';
+import type { AccountsControllerGetSelectedAccountAction } from '@metamask/accounts-controller';
 import type { GeolocationControllerGetGeolocationAction } from '@metamask/geolocation-controller';
 import type {
   KeyringControllerGetStateAction,
@@ -32,6 +33,7 @@ export type PerpsControllerAllowedActions =
   | KeyringControllerSignTypedMessageAction
   | TransactionControllerAddTransactionAction
   | RemoteFeatureFlagControllerGetStateAction
+  | AccountsControllerGetSelectedAccountAction
   | AccountTreeControllerGetAccountsFromSelectedAccountGroupAction
   | AuthenticationController.AuthenticationControllerGetBearerTokenAction;
 

app/controllers/perps/utils/accountUtils.test.ts

@@ -1,13 +1,111 @@
+import type { InternalAccount } from '@metamask/keyring-internal-api';
+
 import { PERPS_CONSTANTS } from '../constants/perpsConfig';
+import type { PerpsControllerMessenger } from '../PerpsController';
 import type { AccountState } from '../types';
 
 import {
   addSpotBalanceToAccountState,
   aggregateAccountStates,
   calculateWeightedReturnOnEquity,
+  getSelectedEvmAccountFromMessenger,
   getSpotBalance,
 } from './accountUtils';
 
+const SELECTED_ADDRESS = '0x1111111111111111111111111111111111111111';
+const GROUP_ADDRESS = '0x2222222222222222222222222222222222222222';
+const NON_EVM_ADDRESS = 'bc1qselectedaccount';
+
+function buildAccount(
+  address: string,
+  id: string,
+  type: InternalAccount['type'] = 'eip155:eoa',
+): InternalAccount {
+  return {
+    address,
+    id,
+    type,
+    options: {},
+    methods: [],
+    metadata: {
+      name: id,
+      importTime: Date.now(),
+      keyring: {
+        type: 'HD Key Tree',
+      },
+    },
+    scopes: ['eip155:0'],
+  } as InternalAccount;
+}
+
+function buildMessenger(
+  call: (actionType: string) => InternalAccount | InternalAccount[],
+): Pick<PerpsControllerMessenger, 'call'> {
+  return { call } as unknown as Pick<PerpsControllerMessenger, 'call'>;
+}
+
+describe('getSelectedEvmAccountFromMessenger', () => {
+  it('prefers the selected account over the first evm account in the selected group', () => {
+    const selectedAccount = buildAccount(SELECTED_ADDRESS, 'selected');
+    const groupedAccount = buildAccount(GROUP_ADDRESS, 'grouped');
+    const messenger = buildMessenger((actionType: string) => {
+      switch (actionType) {
+        case 'AccountsController:getSelectedAccount':
+          return selectedAccount;
+        case 'AccountTreeController:getAccountsFromSelectedAccountGroup':
+          return [groupedAccount];
+        default:
+          throw new Error(`Unexpected action: ${actionType}`);
+      }
+    });
+
+    expect(getSelectedEvmAccountFromMessenger(messenger)).toStrictEqual({
+      address: SELECTED_ADDRESS,
+    });
+  });
+
+  it('falls back to the selected account group when selected account lookup is unavailable', () => {
+    const groupedAccount = buildAccount(GROUP_ADDRESS, 'grouped');
+    const messenger = buildMessenger((actionType: string) => {
+      switch (actionType) {
+        case 'AccountsController:getSelectedAccount':
+          throw new Error('Selected account unavailable');
+        case 'AccountTreeController:getAccountsFromSelectedAccountGroup':
+          return [groupedAccount];
+        default:
+          throw new Error(`Unexpected action: ${actionType}`);
+      }
+    });
+
+    expect(getSelectedEvmAccountFromMessenger(messenger)).toStrictEqual({
+      address: GROUP_ADDRESS,
+    });
+  });
+
+  it('falls back to the selected account group when the selected account is not evm', () => {
+    const selectedAccount = buildAccount(
+      NON_EVM_ADDRESS,
+      'selected',
+      'bip122:p2wpkh',
+    );
+    const groupedAccount = buildAccount(GROUP_ADDRESS, 'grouped');
+    const messenger = buildMessenger((actionType: string) => {
+      switch (actionType) {
+        case 'AccountsController:getSelectedAccount':
+          return selectedAccount;
+        case 'AccountTreeController:getAccountsFromSelectedAccountGroup':
+          return [groupedAccount];
+        default:
+          throw new Error(`Unexpected action: ${actionType}`);
+      }
+    });
+
+    expect(getSelectedEvmAccountFromMessenger(messenger)).toStrictEqual({
+      address: GROUP_ADDRESS,
+    });
+  });
+});
+
 describe('aggregateAccountStates', () => {
   const fallback: AccountState = {
     spendableBalance: PERPS_CONSTANTS.FallbackDataDisplay,

app/controllers/perps/utils/accountUtils.ts

@@ -5,6 +5,7 @@
 import type { InternalAccount } from '@metamask/keyring-internal-api';
 
 import { PERPS_CONSTANTS } from '../constants/perpsConfig';
+import type { PerpsControllerMessenger } from '../PerpsController';
 import type { AccountState, PerpsInternalAccount } from '../types';
 import type { SpotClearinghouseStateResponse } from '../types/hyperliquid-types';
 
@@ -37,6 +38,32 @@ export function getSelectedEvmAccount(
   return getEvmAccountFromAccountGroup(accounts);
 }
 
+export function getSelectedEvmAccountFromMessenger(
+  messenger: Pick<PerpsControllerMessenger, 'call'>,
+): { address: string } | undefined {
+  try {
+    const selectedAccount = messenger.call(
+      'AccountsController:getSelectedAccount',
+    );
+    const evmAccount = findEvmAccount([selectedAccount]);
+    if (evmAccount) {
+      return { address: evmAccount.address };
+    }
+  } catch {
+    // Fall back to the selected account group if the direct lookup is unavailable.
+  }
+
+  try {
+    return getSelectedEvmAccount(
+      messenger.call(
+        'AccountTreeController:getAccountsFromSelectedAccountGroup',
+      ),
+    );
+  } catch {
+    return undefined;
+  }
+}
+
 export type ReturnOnEquityInput = {
   unrealizedPnl: string | number;
   returnOnEquity: string | number;