Linearize Send Flow

.github/workflows/android-e2e.yml

@@ -230,6 +230,7 @@ jobs:
       # - ImportFundedWallet: Import wallet with funded account
       # - SwitchToTestnet: Switch network to testnet
       # - SendClassicTokenMainnet: Send XLM on mainnet (small amount: 0.000001 XLM)
+      # - SendClassicTokenMainnetFromDetails: Send XLM on mainnet starting from Token Details screen (small amount: 0.000001 XLM)
       # - SwapClassicTokenMainnet: Swap tokens on mainnet (small amount: 0.000001 XLM)
       # - ForgotPasswordWarning: Lock screen forgot password confirmation modal
       # - SendFederatedAddress: Send XLM and USDC to a federated address on mainnet (small amount: 0.000001 each)
@@ -240,47 +241,51 @@ jobs:
       matrix:
         include:
           - shard-index: 0
-            shard-total: 9
+            shard-total: 10
             flow-name: LaunchAndInspect
             requires-mock-server: false
           - shard-index: 1
-            shard-total: 9
+            shard-total: 10
             flow-name: CreateWallet
             requires-mock-server: false
           - shard-index: 2
-            shard-total: 9
+            shard-total: 10
             flow-name: ImportWallet
             requires-mock-server: false
           - shard-index: 3
-            shard-total: 9
+            shard-total: 10
             flow-name: ImportFundedWallet
             requires-mock-server: false
           - shard-index: 4
-            shard-total: 9
+            shard-total: 10
             flow-name: SwitchToTestnet
             requires-mock-server: false
           - shard-index: 5
-            shard-total: 9
+            shard-total: 10
             flow-name: SendClassicTokenMainnet
             requires-mock-server: false
           - shard-index: 6
-            shard-total: 9
+            shard-total: 10
             flow-name: SwapClassicTokenMainnet
             requires-mock-server: false
           - shard-index: 7
-            shard-total: 9
+            shard-total: 10
             flow-name: ForgotPasswordWarning
             requires-mock-server: false
           - shard-index: 8
-            shard-total: 9
+            shard-total: 10
             flow-name: SendFederatedAddress
             requires-mock-server: false
+          - shard-index: 9
+            shard-total: 10
+            flow-name: SendClassicTokenMainnetFromDetails
+            requires-mock-server: false
           - shard-index: 0
-            shard-total: 9
+            shard-total: 10
             flow-name: SignMessageMockDapp
             requires-mock-server: true
           - shard-index: 0
-            shard-total: 9
+            shard-total: 10
             flow-name: SignAuthEntryMockDapp
             requires-mock-server: true
 

.github/workflows/ios-e2e.yml

@@ -227,6 +227,7 @@ jobs:
       # - ImportFundedWallet: Import wallet with funded account
       # - SwitchToTestnet: Switch network to testnet
       # - SendClassicTokenMainnet: Send XLM on mainnet (small amount: 0.000001 XLM)
+      # - SendClassicTokenMainnetFromDetails: Send XLM on mainnet starting from Token Details screen (small amount: 0.000001 XLM)
       # - SwapClassicTokenMainnet: Swap tokens on mainnet (small amount: 0.000001 XLM)
       # - ForgotPasswordWarning: Lock screen forgot password confirmation modal
       # - SendFederatedAddress: Send XLM and USDC to a federated address on mainnet (small amount: 0.000001 each)
@@ -237,47 +238,51 @@ jobs:
       matrix:
         include:
           - shard-index: 0
-            shard-total: 9
+            shard-total: 10
             flow-name: LaunchAndInspect
             requires-mock-server: false
           - shard-index: 1
-            shard-total: 9
+            shard-total: 10
             flow-name: CreateWallet
             requires-mock-server: false
           - shard-index: 2
-            shard-total: 9
+            shard-total: 10
             flow-name: ImportWallet
             requires-mock-server: false
           - shard-index: 3
-            shard-total: 9
+            shard-total: 10
             flow-name: ImportFundedWallet
             requires-mock-server: false
           - shard-index: 4
-            shard-total: 9
+            shard-total: 10
             flow-name: SwitchToTestnet
             requires-mock-server: false
           - shard-index: 5
-            shard-total: 9
+            shard-total: 10
             flow-name: SendClassicTokenMainnet
             requires-mock-server: false
           - shard-index: 6
-            shard-total: 9
+            shard-total: 10
             flow-name: SwapClassicTokenMainnet
             requires-mock-server: false
           - shard-index: 7
-            shard-total: 9
+            shard-total: 10
             flow-name: ForgotPasswordWarning
             requires-mock-server: false
           - shard-index: 8
-            shard-total: 9
+            shard-total: 10
             flow-name: SendFederatedAddress
             requires-mock-server: false
+          - shard-index: 9
+            shard-total: 10
+            flow-name: SendClassicTokenMainnetFromDetails
+            requires-mock-server: false
           - shard-index: 0
-            shard-total: 9
+            shard-total: 10
             flow-name: SignMessageMockDapp
             requires-mock-server: true
           - shard-index: 0
-            shard-total: 9
+            shard-total: 10
             flow-name: SignAuthEntryMockDapp
             requires-mock-server: true
 

.github/workflows/prPreviewIos.yml

@@ -65,8 +65,8 @@ jobs:
     runs-on: macos-26-xlarge
     timeout-minutes: 45
     permissions:
-      contents: write       # draft release create/delete + tag operations
-      pull-requests: write  # sticky preview-link comment
+      contents: write # draft release create/delete + tag operations
+      pull-requests: write # sticky preview-link comment
     env:
       NODE_VERSION: "20"
       RUBY_VERSION: 3.1.4
@@ -97,13 +97,15 @@ jobs:
       WALLET_KIT_MT_DESCRIPTION_PROD: ${{ vars.WALLET_KIT_MT_DESCRIPTION_DEV }}
       WALLET_KIT_MT_URL_PROD: ${{ vars.WALLET_KIT_MT_URL_DEV }}
       WALLET_KIT_MT_ICON_PROD: ${{ vars.WALLET_KIT_MT_ICON_DEV }}
-      WALLET_KIT_MT_REDIRECT_NATIVE_PROD: ${{ vars.WALLET_KIT_MT_REDIRECT_NATIVE_DEV }}
+      WALLET_KIT_MT_REDIRECT_NATIVE_PROD:
+        ${{ vars.WALLET_KIT_MT_REDIRECT_NATIVE_DEV }}
       WALLET_KIT_PROJECT_ID_DEV: ${{ secrets.WALLET_KIT_PROJECT_ID_DEV }}
       WALLET_KIT_MT_NAME_DEV: ${{ vars.WALLET_KIT_MT_NAME_DEV }}
       WALLET_KIT_MT_DESCRIPTION_DEV: ${{ vars.WALLET_KIT_MT_DESCRIPTION_DEV }}
       WALLET_KIT_MT_URL_DEV: ${{ vars.WALLET_KIT_MT_URL_DEV }}
       WALLET_KIT_MT_ICON_DEV: ${{ vars.WALLET_KIT_MT_ICON_DEV }}
-      WALLET_KIT_MT_REDIRECT_NATIVE_DEV: ${{ vars.WALLET_KIT_MT_REDIRECT_NATIVE_DEV }}
+      WALLET_KIT_MT_REDIRECT_NATIVE_DEV:
+        ${{ vars.WALLET_KIT_MT_REDIRECT_NATIVE_DEV }}
       MP_COLLECTIONS_ADDRESSES: ${{ vars.MP_COLLECTIONS_ADDRESSES }}
       IS_E2E_TEST: "false"
       E2E_TEST_RECOVERY_PHRASE: ""
@@ -190,7 +192,9 @@ jobs:
             ios/Pods
             ~/Library/Caches/CocoaPods
             ~/.cocoapods
-          key: ${{ runner.os }}-pods-pr-${{ github.event.pull_request.number }}-${{ hashFiles('ios/Podfile.lock') }}
+          key:
+            ${{ runner.os }}-pods-pr-${{ github.event.pull_request.number }}-${{
+            hashFiles('ios/Podfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-pods-pr-${{ github.event.pull_request.number }}-
 

__tests__/components/TokensCollectiblesInline.test.tsx

@@ -0,0 +1,179 @@
+import { fireEvent, render, screen } from "@testing-library/react-native";
+import { TokensCollectiblesInline } from "components/TokensCollectiblesInline";
+import { NETWORKS, TransactionContext } from "config/constants";
+import { useCollectiblesStore } from "ducks/collectibles";
+import { useFilteredCollectibles } from "hooks/useFilteredCollectibles";
+import React from "react";
+import {
+  TouchableOpacity as mockTouchableOpacity,
+  View as mockView,
+} from "react-native";
+
+const MockTouchableOpacity = mockTouchableOpacity;
+const MockView = mockView;
+
+jest.mock("components/BalancesList", () => ({
+  BalancesList: ({
+    onTokenPress,
+  }: {
+    onTokenPress?: (tokenId: string) => void;
+  }) => (
+    <MockTouchableOpacity
+      testID="balances-list-token-row"
+      onPress={() => onTokenPress?.("native")}
+    >
+      <MockView />
+    </MockTouchableOpacity>
+  ),
+}));
+
+jest.mock("components/CollectibleImage", () => ({
+  CollectibleImage: () => <MockView testID="collectible-image" />,
+}));
+
+jest.mock("components/Spinner", () => ({
+  __esModule: true,
+  default: ({ testID }: { testID?: string }) => <MockView testID={testID} />,
+}));
+
+jest.mock("hooks/useAppTranslation", () => ({
+  __esModule: true,
+  default: () => ({
+    t: (key: string) =>
+      ({
+        "balancesList.title": "Tokens",
+        "collectiblesGrid.title": "Collectibles",
+        "collectiblesGrid.error": "Error loading collectibles",
+        "collectiblesGrid.empty": "No collectibles",
+      })[key] || key,
+  }),
+}));
+
+jest.mock("hooks/useColors", () => ({
+  __esModule: true,
+  default: () => ({
+    themeColors: {
+      secondary: "#000",
+      text: {
+        secondary: "#111",
+      },
+    },
+  }),
+}));
+
+jest.mock("ducks/collectibles", () => ({
+  useCollectiblesStore: jest.fn(),
+}));
+
+jest.mock("hooks/useFilteredCollectibles", () => ({
+  useFilteredCollectibles: jest.fn(),
+}));
+
+const mockUseCollectiblesStore =
+  useCollectiblesStore as unknown as jest.MockedFunction<any>;
+const mockUseFilteredCollectibles =
+  useFilteredCollectibles as unknown as jest.MockedFunction<any>;
+
+const setupCollectibleState = ({
+  isLoading = false,
+  error = null,
+  visibleCollectibles = [],
+}: {
+  isLoading?: boolean;
+  error?: string | null;
+  visibleCollectibles?: any[];
+}) => {
+  mockUseCollectiblesStore.mockImplementation((selector: any) =>
+    selector({ isLoading, error }),
+  );
+  mockUseFilteredCollectibles.mockReturnValue({ visibleCollectibles });
+};
+
+describe("TokensCollectiblesInline", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("shows loading spinner while collectibles are loading", () => {
+    setupCollectibleState({ isLoading: true, visibleCollectibles: [] });
+
+    render(
+      <TokensCollectiblesInline
+        publicKey="G..."
+        network={NETWORKS.TESTNET}
+        feeContext={TransactionContext.Send}
+      />,
+    );
+
+    expect(screen.getByTestId("collectibles-inline-spinner")).toBeTruthy();
+  });
+
+  it("shows collectibles error state", () => {
+    setupCollectibleState({ error: "failed", visibleCollectibles: [] });
+
+    render(
+      <TokensCollectiblesInline
+        publicKey="G..."
+        network={NETWORKS.TESTNET}
+        feeContext={TransactionContext.Send}
+      />,
+    );
+
+    expect(screen.getByText("Error loading collectibles")).toBeTruthy();
+  });
+
+  it("shows collectibles empty state", () => {
+    setupCollectibleState({ visibleCollectibles: [] });
+
+    render(
+      <TokensCollectiblesInline
+        publicKey="G..."
+        network={NETWORKS.TESTNET}
+        feeContext={TransactionContext.Send}
+      />,
+    );
+
+    expect(screen.getByText("No collectibles")).toBeTruthy();
+  });
+
+  it("forwards token and collectible press handlers", () => {
+    const onTokenPress = jest.fn();
+    const onCollectiblePress = jest.fn();
+
+    setupCollectibleState({
+      visibleCollectibles: [
+        {
+          collectionAddress: "CABC",
+          collectionName: "Cool Collection",
+          items: [
+            {
+              collectionAddress: "CABC",
+              tokenId: "42",
+              image: "https://example.com/item.png",
+              name: "Collectible #42",
+            },
+          ],
+        },
+      ],
+    });
+
+    render(
+      <TokensCollectiblesInline
+        publicKey="G..."
+        network={NETWORKS.TESTNET}
+        onTokenPress={onTokenPress}
+        onCollectiblePress={onCollectiblePress}
+        feeContext={TransactionContext.Send}
+      />,
+    );
+
+    fireEvent.press(screen.getByTestId("balances-list-token-row"));
+    expect(onTokenPress).toHaveBeenCalledWith("native");
+
+    fireEvent.press(screen.getByText("Collectible #42"));
+    expect(onCollectiblePress).toHaveBeenCalledWith({
+      collectionAddress: "CABC",
+      tokenId: "42",
+    });
+  });
+});

__tests__/components/screens/CollectibleDetailsScreen/CollectibleDetailsScreen.test.tsx

@@ -242,6 +242,9 @@ describe("CollectibleDetailsScreen", () => {
       "SendPaymentStack",
       {
         screen: "SendSearchContactsScreen",
+        params: {
+          dismissToPreviousScreen: true,
+        },
       },
     );
   });