chore(runway): cherry-pick fix(ramps): filter activity tab's transfer details for selected account -> cp-7.71.0 (#27865)

- fix(ramps): filter activity tab's transfer details for selected
account -> cp-7.71.0 (#27830)

## **Description**

### Activity — on-ramp orders scoped to the selected account

The Activity **Orders** tab merges legacy fiat orders with V2
`RampsController` orders. Legacy rows were already limited to the
**selected account group** via `getOrders`. V2 orders were not filtered,
so purchase history from other wallets could appear.

This change adds `selectRampsOrdersForSelectedAccountGroup`, which keeps
only orders whose `walletAddress` matches any formatted address in the
selected account group (same semantics as legacy, using
`areAddressesEqual` for EVM vs non-EVM). Hook and modal consumers that
should reflect “current wallet context” now use this selector instead of
the raw controller list.

### Transak — preserve user-entered fiat amount on Build Quote (in-app)

After **additional verification**, opening the KYC/payment webview
called `navigateToKycWebview` with **`quote.fiatAmount`**, and the stack
reset rewrote **RampAmountInput** params with that value. The quote
total can differ from what the user typed (e.g. fees), so Build Quote
could show **27.37** after the user entered **25**, and that value
persisted after closing the sheet or going back.

**Change:** `routeAfterAuthentication(..., amount)` already carried the
typed fiat; `navigateToAdditionalVerificationCallback` now puts the same
`amount` on **both** `RampAmountInput` and `RampAdditionalVerification`
route params. **V2 Additional Verification** reads that param and passes
**only** it into `navigateToKycWebview` (no `quote.fiatAmount` for this
purpose).

**Out of scope:** Order detail screens and stored order payloads are
unchanged. The **Transak payment webview** URL is unchanged (no
`fiatAmount` override in widget params); only in-app Build Quote / stack
state matches the user’s input.

## **Changelog**

CHANGELOG entry: Fixed Activity on-ramp (Orders) list showing V2
purchases from wallets other than the selected account group; fixed
Transak unified buy flow so the fiat amount on Build Quote after
additional verification matches the user-entered amount on the amount
screen (in-app stack), without changing Transak’s payment widget totals.

### Tests

- `selectRampsOrdersForSelectedAccountGroup` and ramp hook consumers
(selector + hook unit tests).
- `useTransakRouting`: IDPROOF / additional verification navigation with
user `amount` set and omitted.
- V2 `AdditionalVerification`: continue passes route `amount` into
`navigateToKycWebview`.

## **Related issues**

Refs:
[TRAM-3361](https://consensyssoftware.atlassian.net/browse/TRAM-3361)

## **Manual testing steps**

```gherkin
Feature: Activity on-ramp orders and Transak amount (TRAM-3361)

  Scenario: Orders tab shows only selected account group’s V2 on-ramp orders
    Given the user has two wallets (or account groups) with separate on-ramp purchase history
    And unified ramps V2 orders exist for more than one wallet address

    When the user selects account group A and opens Activity → Orders
    Then only on-ramp orders whose destination wallet belongs to account group A are listed

    When the user switches to account group B
    Then the Orders tab lists only orders for account group B

  Scenario: Custom fiat amount survives Transak additional verification on Build Quote
    Given the user is in unified Buy with Transak (native) as provider
    And the user enters a custom fiat amount (e.g. 25) on the amount screen

    When the user continues through flows that require additional verification
    And the user taps Continue on the additional verification screen
    Then Build Quote under the KYC/payment sheet still shows the entered amount (e.g. 25), not only the quote total

    When the user closes the webview or goes back from the flow
    Then the amount screen still shows the same entered amount (e.g. 25)
```

## **Screenshots/Recordings**

### **Before**

<!-- Add video: Activity Orders showing other wallet’s purchases / wrong
fiat amount after verification or in widget -->




https://github.com/user-attachments/assets/b26bb3cb-8219-48a3-8128-7c79026fdd18



### **After**

<!-- Add video: Activity Orders scoped to selected account / correct
custom amount through verification and widget -->




https://github.com/user-attachments/assets/3e1929e3-7e1a-42c9-98bd-ea8f7bc9b1eb




https://github.com/user-attachments/assets/ef6d14ed-6533-4e04-a5a4-8cbd44477170


## **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
- [ ] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] 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.

## **Pre-merge reviewer checklist**

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] 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.

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> **Medium Risk**
> Moderate UX/data-scoping change: filters which on-ramp orders appear
based on multichain account selection and adjusts Transak navigation
params, which could hide expected history or affect flow state if
account/address resolution is off.
> 
> **Overview**
> Fixes unified ramp UI to **scope V2 `RampsController` orders to the
selected account group**, preventing purchases from other wallets from
showing up in Activity-derived surfaces. This introduces
`selectRampsOrdersForSelectedAccountGroup` (address-matched via
`areAddressesEqual`) and switches key consumers (`useRampsOrders`,
`useRampsProviders`, `useRampsButtonClickData`,
`ProviderSelectionModal`) from the unfiltered selector.
> 
> Updates the Transak additional-verification flow to **preserve the
user-entered fiat amount** through stack resets: `useTransakRouting` now
carries `amount` into `RampAdditionalVerification` params, and
`AdditionalVerification` uses that param (not `quote.fiatAmount`) when
opening the KYC webview. Selector and routing behavior are covered with
expanded unit tests.
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
39d5861. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
[4661cdb](4661cdb)

---------

Co-authored-by: Yu-Gi-Oh! <54774811+imyugioh@users.noreply.github.com>

Author: runway-github[bot]

app/components/UI/Ramp/Views/Modals/ProviderSelectionModal/ProviderSelectionModal.tsx

@@ -17,7 +17,7 @@ import { useRampsController } from '../../../hooks/useRampsController';
 import { useRampsQuotes } from '../../../hooks/useRampsQuotes';
 import useRampAccountAddress from '../../../hooks/useRampAccountAddress';
 import { getOrdersProviders } from '../../../../../../reducers/fiatOrders';
-import { selectRampsOrders } from '../../../../../../selectors/rampsController';
+import { selectRampsOrdersForSelectedAccountGroup } from '../../../../../../selectors/rampsController';
 import { completedOrdersFromRampsOrders } from '../../../utils/determinePreferredProvider';
 import { useStyles } from '../../../../../hooks/useStyles';
 import styleSheet from './ProviderSelectionModal.styles';
@@ -59,7 +59,9 @@ function ProviderSelectionModal() {
   } = useRampsController();
 
   const legacyOrdersProviders = useSelector(getOrdersProviders);
-  const controllerOrders = useSelector(selectRampsOrders);
+  const controllerOrders = useSelector(
+    selectRampsOrdersForSelectedAccountGroup,
+  );
 
   const ordersProviders = useMemo(() => {
     const v2ProviderIds = completedOrdersFromRampsOrders(controllerOrders).map(

app/components/UI/Ramp/Views/NativeFlow/AdditionalVerification.test.tsx

@@ -36,9 +36,10 @@ jest.mock('../../../../../util/navigation/navUtils', () => ({
     (..._args: unknown[]) =>
     (params: unknown) => ['MockRoute', params],
   useParams: () => ({
-    quote: { quoteId: 'test-quote-id', fiatAmount: 100 },
+    quote: { quoteId: 'test-quote-id', fiatAmount: 127.37 },
     kycUrl: 'https://kyc.example.com',
     workFlowRunId: 'wf-123',
+    amount: 25,
   }),
 }));
 
@@ -71,7 +72,7 @@ describe('V2AdditionalVerification', () => {
 
     expect(mockNavigateToKycWebview).toHaveBeenCalledWith({
       kycUrl: 'https://kyc.example.com',
-      amount: 100,
+      amount: 25,
     });
   });
 

app/components/UI/Ramp/Views/NativeFlow/AdditionalVerification.tsx

@@ -23,11 +23,14 @@ interface V2AdditionalVerificationParams {
   quote: TransakBuyQuote;
   kycUrl: string;
   workFlowRunId: string;
+  /** From BuildQuote route; keeps stack amount in sync when opening KYC webview. */
+  amount?: number;
 }
 
 const V2AdditionalVerification = () => {
   const navigation = useNavigation();
-  const { kycUrl, quote } = useParams<V2AdditionalVerificationParams>();
+  const { kycUrl, amount: userEnteredAmount } =
+    useParams<V2AdditionalVerificationParams>();
 
   const { styles, theme } = useStyles(styleSheet, {});
 
@@ -46,8 +49,8 @@ const V2AdditionalVerification = () => {
   }, [navigation, theme]);
 
   const handleContinuePress = useCallback(() => {
-    navigateToKycWebview({ kycUrl, amount: quote?.fiatAmount });
-  }, [navigateToKycWebview, kycUrl, quote?.fiatAmount]);
+    navigateToKycWebview({ kycUrl, amount: userEnteredAmount });
+  }, [navigateToKycWebview, kycUrl, userEnteredAmount]);
 
   return (
     <ScreenLayout>

app/components/UI/Ramp/hooks/useRampsButtonClickData.ts

@@ -5,7 +5,7 @@ import {
   getRampRoutingDecision,
   UnifiedRampRoutingType,
 } from '../../../../reducers/fiatOrders';
-import { selectRampsOrders } from '../../../../selectors/rampsController';
+import { selectRampsOrdersForSelectedAccountGroup } from '../../../../selectors/rampsController';
 import { getProviderToken } from '../Deposit/utils/ProviderTokenVault';
 import {
   completedOrdersFromFiatOrders,
@@ -21,7 +21,9 @@ export interface RampsButtonClickData {
 
 export function useRampsButtonClickData(): RampsButtonClickData {
   const orders = useSelector(getOrders);
-  const controllerOrders = useSelector(selectRampsOrders);
+  const controllerOrders = useSelector(
+    selectRampsOrdersForSelectedAccountGroup,
+  );
   const rampRoutingDecision = useSelector(getRampRoutingDecision);
   const [isAuthenticated, setIsAuthenticated] = useState<boolean>(false);
 

app/components/UI/Ramp/hooks/useRampsOrders.test.ts

@@ -2,9 +2,23 @@ import { renderHook, act } from '@testing-library/react-native';
 import { Provider } from 'react-redux';
 import { configureStore } from '@reduxjs/toolkit';
 import React from 'react';
+import { AccountGroupType } from '@metamask/account-api';
 import { RampsOrderStatus, type RampsOrder } from '@metamask/ramps-controller';
+import { createMockInternalAccount } from '../../../../util/test/accountsControllerTestUtils';
 import { useRampsOrders } from './useRampsOrders';
 
+const RAMP_HOOKS_TEST_WALLET_ID = 'keyring:use-ramps-orders-test' as const;
+const RAMP_HOOKS_TEST_GROUP_ID =
+  `${RAMP_HOOKS_TEST_WALLET_ID}/ethereum` as const;
+const RAMP_HOOKS_TEST_ACCOUNT_ID = 'account-rh-1';
+/** Must be a valid EVM address (20 bytes) so `areAddressesEqual` treats it as EVM. */
+const RAMP_HOOKS_TEST_ADDRESS = '0x2990079bcdee240329a520d2444386fc119da21a';
+
+const rampHooksTestInternalAccount = {
+  ...createMockInternalAccount(RAMP_HOOKS_TEST_ADDRESS, 'Test'),
+  id: RAMP_HOOKS_TEST_ACCOUNT_ID,
+};
+
 const mockAddOrder = jest.fn();
 const mockAddPrecreatedOrder = jest.fn();
 const mockRemoveOrder = jest.fn();
@@ -35,7 +49,7 @@ const createMockOrder = (overrides: Partial<RampsOrder> = {}): RampsOrder => ({
   createdAt: Date.now(),
   totalFeesFiat: 5,
   txHash: '0xabc',
-  walletAddress: '0x123',
+  walletAddress: RAMP_HOOKS_TEST_ADDRESS,
   status: RampsOrderStatus.Completed,
   network: { name: 'Ethereum', chainId: 'eip155:1' },
   canBeUpdated: false,
@@ -54,6 +68,45 @@ const createMockStore = (orders: RampsOrder[] = []) =>
           RampsController: {
             orders,
           },
+          AccountTreeController: {
+            accountTree: {
+              wallets: {
+                [RAMP_HOOKS_TEST_WALLET_ID]: {
+                  id: RAMP_HOOKS_TEST_WALLET_ID,
+                  metadata: { name: 'Test wallet' },
+                  groups: {
+                    [RAMP_HOOKS_TEST_GROUP_ID]: {
+                      id: RAMP_HOOKS_TEST_GROUP_ID,
+                      type: AccountGroupType.SingleAccount,
+                      accounts: [RAMP_HOOKS_TEST_ACCOUNT_ID],
+                      metadata: { name: 'Test Group' },
+                    },
+                  },
+                },
+              },
+              selectedAccountGroup: RAMP_HOOKS_TEST_GROUP_ID,
+            },
+          },
+          RemoteFeatureFlagController: {
+            remoteFeatureFlags: {
+              enableMultichainAccounts: {
+                enabled: true,
+                featureVersion: '1',
+                minimumVersion: '1.0.0',
+              },
+            },
+          },
+          AccountsController: {
+            internalAccounts: {
+              accounts: {
+                [RAMP_HOOKS_TEST_ACCOUNT_ID]: rampHooksTestInternalAccount,
+              },
+              selectedAccount: RAMP_HOOKS_TEST_ACCOUNT_ID,
+            },
+          },
+          KeyringController: {
+            keyrings: [],
+          },
         },
       }),
     },
@@ -78,7 +131,7 @@ describe('useRampsOrders', () => {
     expect(result.current.orders).toEqual([]);
   });
 
-  it('returns orders from the store', () => {
+  it('returns orders from the store when walletAddress matches the selected account group', () => {
     const order = createMockOrder();
     const store = createMockStore([order]);
     const { result } = renderHook(() => useRampsOrders(), {
@@ -88,6 +141,19 @@ describe('useRampsOrders', () => {
     expect(result.current.orders).toEqual([order]);
   });
 
+  it('excludes orders whose walletAddress is not in the selected account group', () => {
+    const foreignOrder = createMockOrder({
+      providerOrderId: 'foreign-order',
+      walletAddress: '0x0000000000000000000000000000000000000001',
+    });
+    const store = createMockStore([foreignOrder]);
+    const { result } = renderHook(() => useRampsOrders(), {
+      wrapper: wrapper(store),
+    });
+
+    expect(result.current.orders).toEqual([]);
+  });
+
   it('finds an order by providerOrderId', () => {
     const order1 = createMockOrder({ providerOrderId: 'order-1' });
     const order2 = createMockOrder({ providerOrderId: 'order-2' });

app/components/UI/Ramp/hooks/useRampsOrders.ts

@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux';
 import type { RampsOrder } from '@metamask/ramps-controller';
 import { extractOrderCode } from '../utils/extractOrderCode';
 import Engine from '../../../../core/Engine';
-import { selectRampsOrders } from '../../../../selectors/rampsController';
+import { selectRampsOrdersForSelectedAccountGroup } from '../../../../selectors/rampsController';
 
 export interface AddPrecreatedOrderParams {
   orderId: string;
@@ -31,7 +31,7 @@ export interface UseRampsOrdersResult {
 }
 
 export function useRampsOrders(): UseRampsOrdersResult {
-  const orders = useSelector(selectRampsOrders);
+  const orders = useSelector(selectRampsOrdersForSelectedAccountGroup);
 
   const getOrderById = useCallback(
     (providerOrderId: string) => {

app/components/UI/Ramp/hooks/useRampsProviders.ts

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import {
   selectProviders,
-  selectRampsOrders,
+  selectRampsOrdersForSelectedAccountGroup,
 } from '../../../../selectors/rampsController';
 import { type Provider } from '@metamask/ramps-controller';
 import Engine from '../../../../core/Engine';
@@ -55,7 +55,9 @@ export function useRampsProviders(): UseRampsProvidersResult {
   } = useSelector(selectProviders);
 
   const legacyOrders = useSelector(getOrders);
-  const controllerOrders = useSelector(selectRampsOrders);
+  const controllerOrders = useSelector(
+    selectRampsOrdersForSelectedAccountGroup,
+  );
 
   const completedOrders = useMemo(
     () => [

app/components/UI/Ramp/hooks/useTransakRouting.test.ts

@@ -284,7 +284,7 @@ describe('useTransakRouting', () => {
         'test-ott',
         mockQuote,
         MOCK_WALLET_ADDRESS,
-        expect.any(Object),
+        { theme: 'light' },
       );
       expect(mockReset).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -482,10 +482,7 @@ describe('useTransakRouting', () => {
       const { result } = renderHook(() => useTransakRouting());
 
       await act(async () => {
-        await result.current.routeAfterAuthentication(
-          mockQuote as never,
-          mockQuote.fiatAmount,
-        );
+        await result.current.routeAfterAuthentication(mockQuote as never, 25);
       });
 
       expect(mockReset).toHaveBeenCalledWith(
@@ -494,14 +491,64 @@ describe('useTransakRouting', () => {
           routes: [
             expect.objectContaining({
               name: 'RampAmountInput',
-              params: { amount: mockQuote.fiatAmount },
+              params: { amount: 25 },
+            }),
+            expect.objectContaining({
+              name: 'RampAdditionalVerification',
+              params: expect.objectContaining({
+                quote: mockQuote,
+                kycUrl: 'https://kyc.example.com',
+                workFlowRunId: 'wf-123',
+                amount: 25,
+              }),
+            }),
+          ],
+        }),
+      );
+    });
+
+    it('handles ADDITIONAL_FORMS_REQUIRED with IDPROOF when user amount is omitted', async () => {
+      mockGetUserDetails.mockResolvedValue({
+        firstName: 'John',
+        address: {},
+      });
+      mockGetKycRequirement.mockResolvedValue({
+        status: 'ADDITIONAL_FORMS_REQUIRED',
+        kycType: 'STANDARD',
+      });
+      mockGetAdditionalRequirements.mockResolvedValue({
+        formsRequired: [
+          {
+            type: 'IDPROOF',
+            metadata: {
+              kycUrl: 'https://kyc.example.com',
+              workFlowRunId: 'wf-123',
+            },
+          },
+        ],
+      });
+
+      const { result } = renderHook(() => useTransakRouting());
+
+      await act(async () => {
+        await result.current.routeAfterAuthentication(mockQuote as never);
+      });
+
+      expect(mockReset).toHaveBeenCalledWith(
+        expect.objectContaining({
+          index: 1,
+          routes: [
+            expect.objectContaining({
+              name: 'RampAmountInput',
+              params: { amount: undefined },
             }),
             expect.objectContaining({
               name: 'RampAdditionalVerification',
               params: expect.objectContaining({
                 quote: mockQuote,
                 kycUrl: 'https://kyc.example.com',
                 workFlowRunId: 'wf-123',
+                amount: undefined,
               }),
             }),
           ],

app/components/UI/Ramp/hooks/useTransakRouting.ts

@@ -40,6 +40,8 @@ interface RampStackParamList {
     quote: TransakBuyQuote;
     kycUrl: string;
     workFlowRunId: string;
+    /** User-entered fiat from BuildQuote; used when resetting stack so amount screen keeps the typed value. */
+    amount?: number;
   };
   RampKycProcessing: { quote: TransakBuyQuote };
   RampEnterEmail: undefined;
@@ -258,7 +260,7 @@ export const useTransakRouting = (_config?: UseTransakRoutingConfig) => {
           },
           {
             name: Routes.RAMP.ADDITIONAL_VERIFICATION,
-            params: { quote, kycUrl, workFlowRunId },
+            params: { quote, kycUrl, workFlowRunId, amount },
           },
         ],
       });