fix: better check for tron native asset cp-8.3.0 (#33206)

bergarces · web-flow · commit 597b8037cb92 · 2026-07-13T16:05:12.000Z
## **Description**   Tron native asset is determined via assetId instead of just properties to correct a bug. ## **Changelog**   CHANGELOG entry: Fixed a bug in which several empty Tron entries appeared in the Earn list ## **Related issues**  Fixes: https://consensyssoftware.atlassian.net/browse/ASSETS-3428 Fixes: https://consensyssoftware.atlassian.net/browse/MUSD-1162 Fixes: #32110 ## **Manual testing steps**  ```gherkin Feature: my feature name Scenario: user [verb for user action] Given [describe expected initial app state] When user [verb for user action] Then [describe expected outcome] ``` ## **Screenshots/Recordings**   ### **Before**  https://github.com/user-attachments/assets/a5d0e4d6-4d21-4d71-864e-ace9d08570b9 ### **After**  https://github.com/user-attachments/assets/9aacbbc8-46ec-4b6b-b6f6-2810dda87dfd ## **Pre-merge author checklist**   - [X] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [X] I've completed the PR template to the best of my ability - [X] I've included tests if applicable - [X] I've documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [X] I've applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. #### Performance checks (if applicable) - [ ] I've tested on Android - Ideally on a mid-range device; emulator is acceptable - [ ] I've tested with a power user scenario - Use these [power-user SRPs](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93) to import wallets with many accounts and tokens - [ ] I've instrumented key operations with Sentry traces for production performance metrics - See [`trace()`](/app/util/trace.ts) for usage and [`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274) for an example For performance guidelines and tooling, see the [Performance Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers). ## **Pre-merge reviewer checklist**  - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.  --- > [!NOTE] > **Low Risk** > Scoped change to earn selector logic with new unit tests; no auth, payments, or vault handling. > > **Overview** > Fixes spurious Tron rows in the Earn list by tightening which token counts as native TRX for pooled staking. > > **`selectEarnTokens`** no longer treats every Tron-chain native token as stakeable TRX. **`isTronNative`** now requires the canonical asset id `tron:728126428/slip44:195` instead of `isNative` + Tron chain id, so related slip44 assets (e.g. lock-period variants) are not surfaced as empty earn entries. > > Tests mock unified account tokens and assert the canonical TRX entry is included with **pooled staking** when TRX staking is enabled, and that non-matching slip44 addresses are excluded. > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit b5d9c0d. Bugbot is set up for automated code reviews on this repo. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup>
diff --git a/app/selectors/earnController/earn/index.test.ts b/app/selectors/earnController/earn/index.test.ts
@@ -65,6 +65,20 @@ jest.mock('../../../selectors/multichainAccounts/accounts', () => ({
       .internalAccount2,
 }));
 
+const TRX_NATIVE_TOKEN_ADDRESS = 'tron:728126428/slip44:195';
+const TRON_MAINNET_CHAIN_ID = 'tron:728126428';
+
+const mockSelectAccountTokensAcrossChainsUnified = jest.fn();
+
+jest.mock('../../../selectors/multichain', () => {
+  const actual = jest.requireActual('../../../selectors/multichain');
+  return {
+    ...actual,
+    selectAccountTokensAcrossChainsUnified: (state: RootState) =>
+      mockSelectAccountTokensAcrossChainsUnified(state),
+  };
+});
+
 const MOCK_ROOT_STATE_WITH_EARN_CONTROLLER = mockEarnControllerRootState();
 const MOCK_RATE = {
   price: 0.99,
@@ -382,6 +396,13 @@ describe('Earn Controller Selectors', () => {
   beforeEach(() => {
     jest.resetAllMocks();
 
+    const { selectAccountTokensAcrossChainsUnified } = jest.requireActual<
+      typeof import('../../../selectors/multichain')
+    >('../../../selectors/multichain');
+    mockSelectAccountTokensAcrossChainsUnified.mockImplementation(
+      selectAccountTokensAcrossChainsUnified,
+    );
+
     (
       selectPooledStakingEnabledFlag as jest.MockedFunction<
         typeof selectPooledStakingEnabledFlag
@@ -546,6 +567,113 @@ describe('Earn Controller Selectors', () => {
         zeroBalances,
       );
     });
+
+    describe('trxNativeTokenAddress', () => {
+      let mockHasMinimumRequiredVersion: jest.SpyInstance;
+
+      const createTronToken = (overrides: Partial<TokenI> = {}): TokenI =>
+        ({
+          address: TRX_NATIVE_TOKEN_ADDRESS,
+          chainId: TRON_MAINNET_CHAIN_ID,
+          symbol: 'TRX',
+          name: 'TRON',
+          decimals: 6,
+          isNative: true,
+          isETH: false,
+          isStaked: false,
+          balance: '100',
+          balanceFiat: '12',
+          aggregators: [],
+          ticker: 'TRX',
+          ...overrides,
+        }) as TokenI;
+
+      const createStateWithTrxStakingEnabled = () =>
+        ({
+          ...mockState,
+          engine: {
+            ...mockState.engine,
+            backgroundState: {
+              ...mockState.engine.backgroundState,
+              RemoteFeatureFlagController: {
+                remoteFeatureFlags: {
+                  trxStakingEnabled: { enabled: true, minimumVersion: '1.0.0' },
+                },
+                cacheTimestamp: 0,
+              },
+              EarnController: {
+                ...mockState.engine.backgroundState.EarnController,
+                lending: {
+                  markets: [],
+                  positions: [],
+                },
+              },
+            },
+          },
+        }) as unknown as RootState;
+
+      beforeEach(() => {
+        mockHasMinimumRequiredVersion = jest.spyOn(
+          remoteFeatureFlagModule,
+          'hasMinimumRequiredVersion',
+        );
+        mockHasMinimumRequiredVersion.mockReturnValue(true);
+        (getVersion as jest.MockedFunction<typeof getVersion>).mockReturnValue(
+          '1.0.0',
+        );
+
+        (
+          selectPooledStakingEnabledFlag as jest.MockedFunction<
+            typeof selectPooledStakingEnabledFlag
+          >
+        ).mockReturnValue(false);
+        (
+          selectStablecoinLendingEnabledFlag as jest.MockedFunction<
+            typeof selectStablecoinLendingEnabledFlag
+          >
+        ).mockReturnValue(false);
+      });
+
+      afterEach(() => {
+        mockHasMinimumRequiredVersion?.mockRestore();
+      });
+
+      it('includes canonical TRX native token as a pooled staking earn token', () => {
+        const tronToken = createTronToken();
+
+        mockSelectAccountTokensAcrossChainsUnified.mockReturnValue({
+          [TRON_MAINNET_CHAIN_ID]: [tronToken],
+        });
+
+        const result = earnSelectors.selectEarnTokens(
+          createStateWithTrxStakingEnabled(),
+        );
+
+        expect(result.earnTokens).toHaveLength(1);
+        expect(result.earnTokens[0].address).toBe(TRX_NATIVE_TOKEN_ADDRESS);
+        expect(result.earnTokens[0].experience.type).toBe(
+          EARN_EXPERIENCES.POOLED_STAKING,
+        );
+      });
+
+      it('excludes Tron slip44 tokens that do not match trxNativeTokenAddress', () => {
+        const tronToken = createTronToken({
+          address: 'tron:728126428/slip44:195-in-lock-period',
+          symbol: 'TRX-IN-LOCK-PERIOD',
+          ticker: 'TRX-IN-LOCK-PERIOD',
+        });
+
+        mockSelectAccountTokensAcrossChainsUnified.mockReturnValue({
+          [TRON_MAINNET_CHAIN_ID]: [tronToken],
+        });
+
+        const result = earnSelectors.selectEarnTokens(
+          createStateWithTrxStakingEnabled(),
+        );
+
+        expect(result.earnTokens).toHaveLength(0);
+      });
+    });
   });
 
   describe('selectEarnToken', () => {
diff --git a/app/selectors/earnController/earn/index.ts b/app/selectors/earnController/earn/index.ts
@@ -42,6 +42,8 @@ import { isTronChainId, isNonEvmChainId } from '../../../core/Multichain/utils';
 
 import { selectTrxStakingEnabled } from '../../featureFlagController/trxStakingEnabled';
 
+const trxNativeTokenAddress = 'tron:728126428/slip44:195';
+
 /**
  * Get the APR for pooled staking based on token type.
  * This helper centralizes APR logic to avoid scattered conditionals.
@@ -211,8 +213,7 @@ const selectEarnTokens = createDeepEqualSelector(
 
       const isNonEvmNative =
         token.isNative && isNonEvmChainId(String(token.chainId));
-      const isTronNative =
-        token.isNative && isTronChainId(token.chainId as Hex);
+      const isTronNative = token.address === trxNativeTokenAddress;
       const isTronStakedToken =
         token.isStaked &&
         isTronChainId(token.chainId as Hex) &&
