ix(perps): align standalone tradeable balance with spot-backed paths

Author: geositta

app/components/UI/Perps/Views/PerpsOrderView/useInitPerpsPaymentToken.ts

@@ -83,6 +83,9 @@ export function useInitPerpsPaymentToken(initialAsset: string) {
 
     const pendingAddr = pendingConfigSelectedPaymentToken.address;
     const pendingChainId = pendingConfigSelectedPaymentToken.chainId;
+    // Compatibility shim for pending configs persisted before
+    // selectedPaymentTokenSource existed. Safe to remove after the 5-minute
+    // pending-config TTL has cycled past release.
     const isLegacyAutoFallbackToken =
       pendingConfigSelectedPaymentTokenSource == null &&
       arePaymentTokensEqual(

app/controllers/perps/PerpsController.ts

@@ -106,6 +106,7 @@ import type {
   PerpsActiveProviderMode,
   PerpsProviderType,
   PerpsSelectedPaymentToken,
+  SelectedPaymentTokenSource,
   PerpsRemoteFeatureFlagState,
   PerpsTransactionParams,
   PerpsAddTransactionOptions,
@@ -4621,7 +4622,7 @@ export class PerpsController extends BaseController<
       orderType?: OrderType;
       /** When user used pay-with-token in PerpsPayRow: minimal token shape to restore selection */
       selectedPaymentToken?: PerpsSelectedPaymentToken | null;
-      selectedPaymentTokenSource?: 'explicit' | 'autoNoPerpsBalance';
+      selectedPaymentTokenSource?: SelectedPaymentTokenSource;
     },
   ): void {
     const network = this.state.isTestnet ? 'testnet' : 'mainnet';
@@ -4665,7 +4666,7 @@ export class PerpsController extends BaseController<
         limitPrice?: string;
         orderType?: OrderType;
         selectedPaymentToken?: PerpsSelectedPaymentToken | null;
-        selectedPaymentTokenSource?: 'explicit' | 'autoNoPerpsBalance';
+        selectedPaymentTokenSource?: SelectedPaymentTokenSource;
       }
     | undefined {
     const network = this.state.isTestnet ? 'testnet' : 'mainnet';

app/controllers/perps/providers/HyperLiquidProvider.test.ts

@@ -9031,6 +9031,9 @@ describe('HyperLiquidProvider', () => {
     describe('getAccountState with standalone mode', () => {
       it('returns account state via standalone client when standalone mode enabled', async () => {
         // Arrange
+        mockStandaloneInfoClient.spotClearinghouseState.mockResolvedValue({
+          balances: [{ coin: 'USDC', hold: '1000', total: '10000' }],
+        });
         mockStandaloneInfoClient.clearinghouseState.mockResolvedValue({
           assetPositions: [],
           marginSummary: {
@@ -9058,6 +9061,9 @@ describe('HyperLiquidProvider', () => {
           mockStandaloneInfoClient.clearinghouseState,
         ).toHaveBeenCalledWith({ user: mockUserAddress });
         expect(accountState.totalBalance).toBeDefined();
+        expect(parseFloat(accountState.availableToTradeBalance ?? '0')).toBe(
+          55000,
+        );
       });
 
       it('uses testnet endpoint when provider is in testnet mode', async () => {

app/controllers/perps/providers/HyperLiquidProvider.ts

@@ -5585,14 +5585,21 @@ export class HyperLiquidProvider implements PerpsProvider {
         const dexAccountStates = standalonePerpsResults.map((perpsState) =>
           adaptAccountStateFromSDK(perpsState),
         );
-        const aggregatedAccountState = addSpotBalanceToAccountState(
-          aggregateAccountStates(dexAccountStates),
+        const aggregatedAccountState = addSpotUsdcToAvailableToTradeBalance(
+          addSpotBalanceToAccountState(
+            aggregateAccountStates(dexAccountStates),
+            standaloneSpotStateResult,
+          ),
           standaloneSpotStateResult,
         );
 
         this.#deps.debugLogger.log(
           'HyperLiquidProvider: standalone account state fetched',
-          { totalBalance: aggregatedAccountState.totalBalance },
+          {
+            totalBalance: aggregatedAccountState.totalBalance,
+            availableToTradeBalance:
+              aggregatedAccountState.availableToTradeBalance,
+          },
         );
 
         return aggregatedAccountState;

app/controllers/perps/selectors.ts

@@ -2,7 +2,10 @@ import { createSelector } from 'reselect';
 
 import { MARKET_SORTING_CONFIG, SortOptionId } from './constants/perpsConfig';
 import type { PerpsControllerState } from './PerpsController';
-import type { PerpsSelectedPaymentToken } from './types';
+import type {
+  PerpsSelectedPaymentToken,
+  SelectedPaymentTokenSource,
+} from './types';
 import type { SortDirection } from './utils/sortMarkets';
 
 /**
@@ -132,7 +135,7 @@ export const selectPendingTradeConfiguration = createSelector(
         limitPrice?: string;
         orderType?: 'market' | 'limit';
         selectedPaymentToken?: PerpsSelectedPaymentToken | null;
-        selectedPaymentTokenSource?: 'explicit' | 'autoNoPerpsBalance';
+        selectedPaymentTokenSource?: SelectedPaymentTokenSource;
       }
     | undefined => {
     const network = isTestnet ? 'testnet' : 'mainnet';

app/controllers/perps/utils/accountUtils.ts

@@ -168,6 +168,8 @@ export function addSpotUsdcToAvailableToTradeBalance(
     return accountState;
   }
 
+  // Adapters are expected to populate availableToTradeBalance. Fall back to
+  // availableBalance only for legacy or partially migrated AccountState payloads.
   const currentAvailableToTrade = parseFloat(
     accountState.availableToTradeBalance ?? accountState.availableBalance,
   );