feat(swap): Soroban tokens in the swap picker (C3)

@shared/api/__tests__/internal.test.ts

@@ -805,4 +805,26 @@ describe("internalApi", () => {
       });
     });
   });
+
+  describe("getTokenDetails", () => {
+    afterEach(() => jest.restoreAllMocks());
+
+    it("treats a plain-text 400 as not a token, even when asked to throw", async () => {
+      jest.spyOn(global, "fetch").mockResolvedValue({
+        ok: false,
+        status: 400,
+        json: () => Promise.reject(new SyntaxError("Unexpected token S")),
+      } as unknown as Response);
+
+      await expect(
+        internalApi.getTokenDetails({
+          contractId:
+            "CBI7UCH5KGSVQRO5H4SUCZUTZABCITZLRHQQZTWL2TK4RZ72TAR6IHRV",
+          publicKey: "G123",
+          networkDetails: MAINNET_NETWORK_DETAILS,
+          throwOnFailure: true,
+        }),
+      ).resolves.toBeNull();
+    });
+  });
 });

@shared/api/helpers/__tests__/getIconFromTokenList.test.ts

@@ -0,0 +1,41 @@
+import { findTokenListIcon } from "../getIconFromTokenList";
+
+const ISSUER = "GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN";
+const CONTRACT = "CBI7UCH5KGSVQRO5H4SUCZUTZABCITZLRHQQZTWL2TK4RZ72TAR6IHRV";
+
+const list = (name: string, assets: Record<string, string>[]) =>
+  ({ name, assets }) as any;
+
+describe("findTokenListIcon", () => {
+  it("takes the first list that carries the asset", () => {
+    expect(
+      findTokenListIcon({
+        issuerId: ISSUER,
+        code: "USDC",
+        assetsListsData: [
+          list("first", [{ code: "USDC", issuer: ISSUER, icon: "first.png" }]),
+          list("second", [
+            { code: "USDC", issuer: ISSUER, icon: "second.png" },
+          ]),
+        ],
+      }),
+    ).toEqual({ icon: "first.png", canonicalAsset: `USDC:${ISSUER}` });
+  });
+
+  it("matches a contract token by its contract ID", () => {
+    expect(
+      findTokenListIcon({
+        contractId: CONTRACT,
+        code: "TKN",
+        assetsListsData: [list("l", [{ contract: CONTRACT, icon: "tkn.png" }])],
+      }),
+    ).toEqual({ icon: "tkn.png", canonicalAsset: `TKN:${CONTRACT}` });
+  });
+
+  it("finds nothing for an unlisted asset", () => {
+    expect(
+      findTokenListIcon({ issuerId: ISSUER, code: "USDC", assetsListsData: [] })
+        .icon,
+    ).toBeUndefined();
+  });
+});

@shared/api/helpers/getIconFromTokenList.ts

@@ -1,13 +1,14 @@
-import {
-  AssetListReponseItem,
-  AssetListResponse,
-} from "@shared/constants/soroban/asset-list";
+import { AssetListResponse } from "@shared/constants/soroban/asset-list";
 import { getCanonicalFromAsset } from "@shared/helpers/stellar";
 
 import { sendMessageToBackground } from "./extensionMessaging";
 import { SERVICE_TYPES } from "../../constants/services";
 
-export const getIconFromTokenLists = async ({
+/**
+ * The icon of the first list (in the user's priority order) that carries the
+ * asset, matched by contract ID or by code and issuer.
+ */
+export const findTokenListIcon = ({
   issuerId,
   contractId,
   code,
@@ -18,51 +19,61 @@ export const getIconFromTokenLists = async ({
   code: string;
   assetsListsData: AssetListResponse[];
 }) => {
-  let verifiedToken = {} as AssetListReponseItem;
-  let canonicalAsset = undefined as string | undefined;
-  // The lists arrive in the user's configured order, which is a priority order:
-  // the first list carrying the asset wins. Without the labeled break below the
-  // outer loop runs to completion and the LAST matching list silently overwrites
-  // earlier, higher-priority entries.
-  listLoop: for (const data of assetsListsData) {
-    const list = data.assets;
-    if (list) {
-      for (const record of list) {
-        if (contractId) {
-          const regex = new RegExp(contractId, "i");
-          if (record.contract && record.contract.match(regex) && record.icon) {
-            verifiedToken = record;
-            canonicalAsset = getCanonicalFromAsset(code, contractId);
-            break listLoop;
-          }
+  for (const data of assetsListsData) {
+    for (const record of data.assets ?? []) {
+      if (contractId) {
+        const regex = new RegExp(contractId, "i");
+        if (record.contract && record.contract.match(regex) && record.icon) {
+          return {
+            icon: record.icon,
+            canonicalAsset: getCanonicalFromAsset(code, contractId),
+          };
         }
+      }
 
-        if (
-          issuerId &&
-          record.issuer &&
-          record.issuer === issuerId &&
-          record.code === code &&
-          record.icon
-        ) {
-          verifiedToken = record;
-          canonicalAsset = getCanonicalFromAsset(code, issuerId);
-          break listLoop;
-        }
+      if (
+        issuerId &&
+        record.issuer &&
+        record.issuer === issuerId &&
+        record.code === code &&
+        record.icon
+      ) {
+        return {
+          icon: record.icon,
+          canonicalAsset: getCanonicalFromAsset(code, issuerId),
+        };
       }
     }
   }
+  return { icon: undefined, canonicalAsset: undefined };
+};
+
+export const getIconFromTokenLists = async ({
+  issuerId,
+  contractId,
+  code,
+  assetsListsData,
+}: {
+  issuerId?: string;
+  contractId?: string;
+  code: string;
+  assetsListsData: AssetListResponse[];
+}) => {
+  const found = findTokenListIcon({
+    issuerId,
+    contractId,
+    code,
+    assetsListsData,
+  });
 
-  if (verifiedToken?.icon) {
+  if (found.icon) {
     await sendMessageToBackground({
       activePublicKey: null,
       assetCanonical: `${code}:${contractId || issuerId}`,
-      iconUrl: verifiedToken?.icon,
+      iconUrl: found.icon,
       type: SERVICE_TYPES.CACHE_ASSET_ICON,
     });
   }
 
-  return {
-    icon: verifiedToken?.icon,
-    canonicalAsset,
-  };
+  return found;
 };

@shared/api/internal.ts

@@ -1474,12 +1474,15 @@ export const getTokenDetails = async ({
   networkDetails,
   shouldFetchBalance,
   signal,
+  throwOnFailure = false,
 }: {
   contractId: string;
   publicKey: string;
   networkDetails: NetworkDetails;
   shouldFetchBalance?: boolean;
   signal?: AbortSignal;
+  /** Rethrow a failed request, so it can be told apart from "not a token". */
+  throwOnFailure?: boolean;
 }): Promise<{
   name: string;
   decimals: number;
@@ -1537,6 +1540,11 @@ export const getTokenDetails = async ({
       }${shouldFetchBalance ? "&should_fetch_balance=true" : ""}`,
       { signal },
     );
+    // Not a token contract: an answer, not a failure. Checked before the
+    // body is parsed, since a 400 can be plain text.
+    if (response.status === 400) {
+      return null;
+    }
     const data = await response.json();
     if (!response.ok) {
       throw new Error(data);
@@ -1553,6 +1561,9 @@ export const getTokenDetails = async ({
         error,
       )} - ${contractId} - ${networkDetails.network}`,
     );
+    if (throwOnFailure) {
+      throw error;
+    }
     return null;
   }
 };

@shared/api/types/types.ts

@@ -42,6 +42,8 @@ export interface TrendingAsset {
   domain: string | null;
   icon?: string;
   volume7d: number;
+  /** Soroban contract tokens only. */
+  decimals?: number;
 }
 
 export interface AllowList {

extension/e2e-tests/swap.test.ts

@@ -29,7 +29,6 @@
  *  - trustline-info-sheet        TrustlineInfoSheet.tsx:16
  *  - XlmReserveSheet             XlmReserveSheet/index.tsx:27
  *  - swap-picker-fallback-notice SwapPickerSections/index.tsx:108
- *  - swap-picker-empty-soroban   SwapPickerSections/index.tsx:123
  *  - blockaid-malicious-label    WarningMessages/index.tsx:768,933
  *
  * testids NOT yet in source (design doc used wrong names; real counterparts above):
@@ -55,7 +54,7 @@ import {
   TESTNET_TRENDING_ASSETS_ROUTE,
   TRENDING_ASSETS_ROUTE,
 } from "./helpers/stubs";
-// Soroban contract address — searching for this should produce the Soroban empty state.
+// A Soroban-only token's contract address.
 const SOROBAN_CONTRACT_ADDRESS =
   "CAZXRTOKNUQ2JQQF3NCRU7GYMDJNZ2NMQN6IGN4FCT5DWPODMPVEXSND";
 
@@ -435,24 +434,23 @@ test("flagged destination surfaces blockaid malicious warning at review", async
 });
 
 // ---------------------------------------------------------------------------
-// 5. Search: Soroban contract address → Soroban empty state
-//    Entering a contract address in the "Swap to" search should surface the
-//    Soroban-unsupported empty state copy.
+// 5. Search: Soroban contract address → the contract token's row
 // ---------------------------------------------------------------------------
-test("search with Soroban contract address shows Soroban empty state", async ({
+test("search with a Soroban contract address lists the contract token", async ({
   page,
   extensionId,
   context,
 }) => {
   test.slow();
 
   const stubOverrides = async () => {
-    // Return empty results — the Soroban detection happens in the picker via
-    // hadSorobanMatches logic in SwapPickerSections based on the search term
-    // being a contract-shaped address; no search result records needed.
     await context.unroute(ASSET_SEARCH_ROUTE);
     await context.route(ASSET_SEARCH_ROUTE, (route) =>
-      route.fulfill(assetSearchResponse([])),
+      route.fulfill(
+        assetSearchResponse([
+          { asset: SOROBAN_CONTRACT_ADDRESS, code: "TKN", decimals: 18 },
+        ]),
+      ),
     );
     await context.route(TRENDING_ASSETS_ROUTE, (route) =>
       route.fulfill(assetSearchResponse([])),
@@ -466,18 +464,12 @@ test("search with Soroban contract address shows Soroban empty state", async ({
   await expect(page.getByTestId("swap-sell-card")).toBeVisible();
 
   await openSwapToPicker(page);
-  // Type a Soroban contract address — SwapPickerSections.hadSorobanMatches
-  // triggers when the search term looks like a contract ID (56-char Stellar G/C address)
   await page.getByTestId("swap-from-search").fill(SOROBAN_CONTRACT_ADDRESS);
 
-  // The Soroban empty state message (swap-picker-empty-soroban)
-  // Text: "Soroban contract tokens aren't supported for swaps yet."
-  await expect(page.getByTestId("swap-picker-empty-soroban")).toBeVisible({
+  await expect(page.getByTestId("SwapTokenRow-TKN")).toBeVisible({
     timeout: 15000,
   });
-  await expect(
-    page.getByText(/Soroban contract tokens aren't supported/),
-  ).toBeVisible();
+  await expect(page.getByTestId("SwapTokenRow-TKN")).toContainText("CAZX…XSND");
 });
 
 // ---------------------------------------------------------------------------

extension/src/popup/components/InternalTransaction/ReviewTransaction/index.tsx

@@ -94,7 +94,7 @@ interface ReviewTxProps {
   destinationTokenDetails?: {
     tokenCode: string;
     requiresTrustline: boolean;
-    decimals: number;
+    decimals?: number;
     issuer?: string;
     // Blockaid verdict captured when the destination token was picked; folded
     // into the review security gate alongside the transaction scan.

extension/src/popup/components/__tests__/AssetDetail.test.tsx

@@ -1062,7 +1062,7 @@ describe("AssetDetail", () => {
       expect(screen.getByTestId("asset-detail-swap-button")).toBeVisible();
     });
 
-    it("should not show swap button for Soroban asset", async () => {
+    it("shows the swap button for a Soroban asset", async () => {
       const contractId =
         "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABSC4";
       const props = {
@@ -1104,7 +1104,7 @@ describe("AssetDetail", () => {
       );
 
       await waitFor(() => screen.getByTestId("AssetDetail"));
-      expect(screen.queryByTestId("asset-detail-swap-button")).toBeNull();
+      expect(screen.getByTestId("asset-detail-swap-button")).toBeVisible();
       expect(screen.getByTestId("asset-detail-send-button")).toBeVisible();
     });
 

extension/src/popup/components/account/AssetDetail/index.tsx

@@ -415,7 +415,7 @@ export const AssetDetail = ({
       selectedBalance.contractId,
       networkDetails.networkPassphrase,
     );
-  const isShowingSwap = !isSorobanAsset && !isLpShare;
+  const isShowingSwap = !isLpShare;
   const isShowingSend = hasBalance;
 
   // See the `AssetDetail__price` div below for why this falls back to spot.

extension/src/popup/components/amount/AmountCard/index.tsx

@@ -9,6 +9,7 @@ import { isNativeAssetPair } from "@shared/helpers/assetIdentity";
 import { SecurityLevel } from "popup/constants/blockaid";
 import { InputType } from "helpers/transaction";
 import { formatAmountPreserveCursor } from "popup/helpers/formatters";
+import { CLASSIC_ASSET_DECIMALS } from "popup/helpers/soroban";
 import { useRunAfterUpdate } from "popup/helpers/useRunAfterUpdate";
 
 import "./styles.scss";
@@ -49,7 +50,8 @@ export interface AmountCardProps {
    * (e.g. the swap CTA disables itself while the sell input is focused). */
   onInputFocus?: () => void;
   onInputBlur?: () => void;
-  cryptoDecimals: number;
+  /** Input precision; a read-only card never uses it. */
+  cryptoDecimals?: number;
   onAmountChange: (next: { amount: string; newCursor: number }) => void;
   onAmountUsdChange: (next: { amount: string; newCursor: number }) => void;
   onToggleInputType: () => void;
@@ -80,7 +82,7 @@ export const AmountCard = ({
   amountInputRef,
   onInputFocus,
   onInputBlur,
-  cryptoDecimals,
+  cryptoDecimals = CLASSIC_ASSET_DECIMALS,
   onAmountChange,
   onAmountUsdChange,
   onToggleInputType,