@b3dotfun/sdk 0.1.70-alpha.19 → 0.1.70-alpha.20

package/src/anyspend/react/components/AnySpend.tsx

@@ -6,6 +6,7 @@ import {
   getDefaultToken,
   getExplorerTxUrl,
   getHyperliquidUSDCToken,
+  isSameChainAndToken,
   HYPERLIQUID_CHAIN_ID,
   HYPERLIQUID_USDC_ADDRESS,
   USDC_BASE,
@@ -902,8 +903,7 @@ function AnySpendInner({
   const isSameChainSameToken = useMemo(() => {
     return (
       activeTab === "crypto" &&
-      selectedSrcChainId === selectedDstChainId &&
-      selectedSrcToken.address.toLowerCase() === selectedDstToken.address.toLowerCase()
+      isSameChainAndToken(selectedSrcChainId, selectedSrcToken.address, selectedDstChainId, selectedDstToken.address)
     );
   }, [activeTab, selectedSrcChainId, selectedDstChainId, selectedSrcToken.address, selectedDstToken.address]);
 

package/src/anyspend/react/components/AnySpendCustomExactIn.tsx

@@ -2,7 +2,7 @@ import { getChainName, getExplorerTxUrl } from "@b3dotfun/sdk/anyspend";
 import { useGasPrice } from "@b3dotfun/sdk/anyspend/react";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
 import { GetQuoteResponse } from "@b3dotfun/sdk/anyspend/types/api_req_res";
-import { normalizeAddress } from "@b3dotfun/sdk/anyspend/utils";
+import { isSameChainAndToken, normalizeAddress } from "@b3dotfun/sdk/anyspend/utils";
 import {
   Button,
   ShinyButton,
@@ -218,16 +218,11 @@ function AnySpendCustomExactInInner({
   const isSameChainSameToken = useMemo(() => {
     return (
       effectivePaymentType === "crypto" &&
-      selectedSrcChainId === selectedDstChainId &&
-      selectedSrcToken?.address?.toLowerCase() === selectedDstToken?.address?.toLowerCase()
+      selectedSrcToken != null &&
+      selectedDstToken != null &&
+      isSameChainAndToken(selectedSrcChainId, selectedSrcToken.address, selectedDstChainId, selectedDstToken.address)
     );
-  }, [
-    effectivePaymentType,
-    selectedSrcChainId,
-    selectedDstChainId,
-    selectedSrcToken?.address,
-    selectedDstToken?.address,
-  ]);
+  }, [effectivePaymentType, selectedSrcChainId, selectedDstChainId, selectedSrcToken, selectedDstToken]);
 
   // Check if this is a direct transfer
   const isDirectTransfer = isSameChainSameToken && allowDirectTransfer;

package/src/anyspend/react/components/__tests__/QRDeposit.test.tsx

@@ -1,4 +1,4 @@
-import { USDC_BASE } from "@b3dotfun/sdk/anyspend";
+import { RELAY_SOLANA_MAINNET_CHAIN_ID, USDC_BASE } from "@b3dotfun/sdk/anyspend";
 import { fireEvent, render, screen } from "@testing-library/react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
@@ -74,6 +74,10 @@ vi.mock("@relayprotocol/relay-kit-ui", () => ({
   },
 }));
 
+vi.mock("@stripe/stripe-js", () => ({
+  loadStripe: vi.fn(() => Promise.resolve(null)),
+}));
+
 // Spread the real global-account/react (Button, Badge, etc. are needed by transitively
 // imported sub-components and render fine under happy-dom). Override only `toast` so the
 // error path doesn't depend on a toast provider.
@@ -240,6 +244,40 @@ describe("QRDeposit pureTransferOnly (Fund Wallet)", () => {
     expect(container.textContent).toContain("Target ≈ 9.365547 USDC");
   });
 
+  it("Test C3 — case-mutated Solana mints require a swap order", async () => {
+    const QRDeposit = await loadQRDeposit();
+    const wrappedSol = "So11111111111111111111111111111111111111112";
+    const sourceToken = {
+      chainId: RELAY_SOLANA_MAINNET_CHAIN_ID,
+      address: wrappedSol,
+      symbol: "wSOL",
+      name: "Wrapped SOL",
+      decimals: 9,
+      metadata: {},
+    };
+    const destinationToken = {
+      ...sourceToken,
+      address: `s${wrappedSol.slice(1)}`,
+      symbol: "OTHER",
+      name: "Distinct Solana Mint",
+    };
+
+    render(
+      <QRDeposit
+        recipientAddress={RECIPIENT}
+        sourceToken={sourceToken}
+        sourceChainId={RELAY_SOLANA_MAINNET_CHAIN_ID}
+        destinationToken={destinationToken}
+        destinationChainId={RELAY_SOLANA_MAINNET_CHAIN_ID}
+        destinationAmountDisplay="1"
+      />,
+    );
+
+    expect(createOrderSpy).toHaveBeenCalledTimes(1);
+    expect(createOrderSpy.mock.calls[0][0].dstToken.address).toBe(destinationToken.address);
+    expect(watchTransferArgs.enabled).toBe(false);
+  });
+
   it("Test C2 — swap mode without a fixed amount shows the Receive row but no target hint", async () => {
     const QRDeposit = await loadQRDeposit();
 

package/src/anyspend/react/components/checkout/CryptoPayPanel.tsx

@@ -6,7 +6,12 @@ import { useAnyspendCreateOrder } from "@b3dotfun/sdk/anyspend/react/hooks/useAn
 import { useAnyspendOrderAndTransactions } from "@b3dotfun/sdk/anyspend/react/hooks/useAnyspendOrderAndTransactions";
 import { useCreateDepositFirstOrder } from "@b3dotfun/sdk/anyspend/react/hooks/useCreateDepositFirstOrder";
 import { useOnOrderSuccess } from "@b3dotfun/sdk/anyspend/react/hooks/useOnOrderSuccess";
-import { ALL_CHAINS, RELAY_SOLANA_MAINNET_CHAIN_ID, getAvailableChainIds } from "@b3dotfun/sdk/anyspend";
+import {
+  ALL_CHAINS,
+  RELAY_SOLANA_MAINNET_CHAIN_ID,
+  getAvailableChainIds,
+  isSameChainAndToken,
+} from "@b3dotfun/sdk/anyspend";
 import { getPaymentUrl, toRegistryChainId } from "@b3dotfun/sdk/anyspend/utils/chain";
 import { isNativeToken } from "@b3dotfun/sdk/anyspend/utils/token";
 import {
@@ -97,9 +102,13 @@ export function CryptoPayPanel({
   }, [selectedSrcToken, dstTokenData, destinationTokenAddress, destinationTokenChainId]);
 
   const isSameToken =
-    selectedSrcToken &&
-    selectedSrcToken.address.toLowerCase() === destinationTokenAddress.toLowerCase() &&
-    selectedSrcToken.chainId === destinationTokenChainId;
+    selectedSrcToken !== null &&
+    isSameChainAndToken(
+      selectedSrcToken.chainId,
+      selectedSrcToken.address,
+      destinationTokenChainId,
+      destinationTokenAddress,
+    );
 
   const { anyspendQuote, isLoadingAnyspendQuote } = useAnyspendQuote({
     type: "swap",

package/src/anyspend/services/gas.test.ts

@@ -1,31 +1,108 @@
-import { describe, it, expect } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { GasOracleResponse } from "../types/gas";
 import { gasService, isGasOracleSupported } from "./gas";
 
+const RESPONSES: Readonly<Record<number, GasOracleResponse>> = {
+  1: {
+    chainId: 1,
+    chainName: "Ethereum",
+    timestamp: "2026-01-01T00:00:00.000Z",
+    source: "blocknative",
+    gasPrice: { low: "7", standard: "8", fast: "9" },
+    eip1559: {
+      baseFee: "6",
+      maxPriorityFee: { low: "1", standard: "2", fast: "3" },
+      maxFee: { low: "8", standard: "10", fast: "12" },
+    },
+    analysis: {
+      level: "elevated",
+      percentile: 80,
+      vs1h: 1.5,
+      vs4h: 1.4,
+      vs24h: 1.3,
+      recommendation: "Wait if possible.",
+    },
+    cached: false,
+  },
+  8453: {
+    chainId: 8453,
+    chainName: "Base",
+    timestamp: "2026-01-01T00:00:00.000Z",
+    source: "rpc",
+    gasPrice: { low: "0.004", standard: "0.005", fast: "0.006" },
+    eip1559: {
+      baseFee: "0.003",
+      maxPriorityFee: { low: "0.001", standard: "0.002", fast: "0.003" },
+      maxFee: { low: "0.005", standard: "0.007", fast: "0.009" },
+    },
+    analysis: {
+      level: "low",
+      percentile: 20,
+      vs1h: 0.8,
+      vs4h: 0.9,
+      vs24h: 0.7,
+      recommendation: "Good time to transact.",
+    },
+    cached: true,
+    cacheAge: 10,
+  },
+};
+
 describe("gasService", () => {
-  it("should check supported chains", () => {
-    expect(isGasOracleSupported(8453)).toBe(true); // Base
-    expect(isGasOracleSupported(1)).toBe(true); // Ethereum
-    expect(isGasOracleSupported(999999)).toBe(false); // Unknown
+  beforeEach(() => {
+    vi.stubGlobal(
+      "fetch",
+      vi.fn(async (input: string | URL | Request) => {
+        const url = new URL(input instanceof Request ? input.url : String(input));
+        const chainId = Number(url.pathname.split("/").at(-1));
+        const response = RESPONSES[chainId];
+
+        return response ? Response.json(response) : new Response(null, { status: 404 });
+      }),
+    );
   });
 
-  it("should fetch gas price for Base", async () => {
-    const gas = await gasService.fetch(8453);
+  afterEach(() => {
+    vi.unstubAllGlobals();
+  });
 
-    console.log("Gas data:", gas);
+  it("checks supported chains", () => {
+    expect(isGasOracleSupported(8453)).toBe(true);
+    expect(isGasOracleSupported(1)).toBe(true);
+    expect(isGasOracleSupported(999999)).toBe(false);
+  });
+
+  it("fetches and transforms Base gas data", async () => {
+    const gas = await gasService.fetch(8453);
 
-    expect(gas.chainId).toBe(8453);
-    expect(gas.chainName).toBe("Base");
-    expect(gas.level).toMatch(/low|normal|elevated|high|spike/);
-    expect(typeof gas.gasPriceGwei).toBe("string");
-    expect(typeof gas.isSpike).toBe("boolean");
+    expect(gas).toEqual({
+      chainId: 8453,
+      chainName: "Base",
+      gasPriceGwei: "0.005",
+      baseFeeGwei: "0.003",
+      level: "low",
+      isSpike: false,
+      recommendation: "Good time to transact.",
+      vsMedian: 0.8,
+      source: "rpc",
+      timestamp: "2026-01-01T00:00:00.000Z",
+    });
   });
 
-  it("should fetch gas price for Ethereum", async () => {
+  it("fetches and transforms Ethereum gas data", async () => {
     const gas = await gasService.fetch(1);
 
-    console.log("ETH Gas:", gas);
-
-    expect(gas.chainId).toBe(1);
-    expect(gas.source).toBe("blocknative"); // ETH uses Blocknative
+    expect(gas).toEqual({
+      chainId: 1,
+      chainName: "Ethereum",
+      gasPriceGwei: "8",
+      baseFeeGwei: "6",
+      level: "elevated",
+      isSpike: true,
+      recommendation: "Wait if possible.",
+      vsMedian: 1.5,
+      source: "blocknative",
+      timestamp: "2026-01-01T00:00:00.000Z",
+    });
   });
 });

package/src/anyspend/utils/__tests__/address.test.ts

@@ -0,0 +1,39 @@
+import { describe, expect, it } from "vitest";
+import { RELAY_SOLANA_MAINNET_CHAIN_ID } from "../../constants";
+import { HYPERLIQUID_CHAIN_ID } from "../token";
+import { isSameChainAndToken } from "../address";
+
+const SOLANA_CHAIN_ID = 7565164;
+const WRAPPED_SOL = "So11111111111111111111111111111111111111112";
+
+describe("isSameChainAndToken", () => {
+  it("compares Solana mint addresses byte-for-byte", () => {
+    const caseMutatedMint = `s${WRAPPED_SOL.slice(1)}`;
+
+    expect(isSameChainAndToken(SOLANA_CHAIN_ID, WRAPPED_SOL, SOLANA_CHAIN_ID, caseMutatedMint)).toBe(false);
+    const invalidBase58Mutation = `SO${WRAPPED_SOL.slice(2)}`;
+    expect(
+      isSameChainAndToken(
+        RELAY_SOLANA_MAINNET_CHAIN_ID,
+        invalidBase58Mutation,
+        RELAY_SOLANA_MAINNET_CHAIN_ID,
+        invalidBase58Mutation.toLowerCase(),
+      ),
+    ).toBe(false);
+  });
+
+  it("compares EVM contract addresses case-insensitively on the same chain", () => {
+    const checksumAddress = "0xdAC17F958D2ee523a2206206994597C13D831ec7";
+
+    expect(isSameChainAndToken(1, checksumAddress, 1, checksumAddress.toLowerCase())).toBe(true);
+    expect(isSameChainAndToken(1, checksumAddress, 8453, checksumAddress)).toBe(false);
+  });
+
+  it("preserves case-insensitive token matching on Hyperliquid", () => {
+    const mixedCaseAddress = "0xAbCdEf0123456789AbCdEf0123456789";
+
+    expect(
+      isSameChainAndToken(HYPERLIQUID_CHAIN_ID, mixedCaseAddress, HYPERLIQUID_CHAIN_ID, mixedCaseAddress.toLowerCase()),
+    ).toBe(true);
+  });
+});

package/src/anyspend/utils/address.ts

@@ -1,11 +1,9 @@
+import { chainTypeForIdentifier, isSolanaAddress } from "@b3/chain-registry/runtime";
 import { isAddress } from "viem";
+import { RELAY_SOLANA_MAINNET_CHAIN_ID } from "../constants";
 import { HYPERLIQUID_CHAIN_ID } from "./token";
 
-export function isSolanaAddress(address: string): boolean {
-  // Solana addresses are 32-byte base58 strings (usually 32-44 characters)
-  const solanaAddressRegex = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/;
-  return solanaAddressRegex.test(address);
-}
+export { isSolanaAddress };
 
 export function isEvmOrSolanaAddress(address: string): boolean {
   return isAddress(address) || isSolanaAddress(address);
@@ -49,5 +47,9 @@ export function isSameChainAndToken(
   destinationChainId: number,
   destinationTokenAddress: string,
 ): boolean {
-  return sourceChainId === destinationChainId && eqci(sourceTokenAddress, destinationTokenAddress);
+  if (sourceChainId !== destinationChainId) return false;
+  if (chainTypeForIdentifier(String(sourceChainId)) === "solana" || sourceChainId === RELAY_SOLANA_MAINNET_CHAIN_ID) {
+    return sourceTokenAddress === destinationTokenAddress;
+  }
+  return sourceTokenAddress.toLowerCase() === destinationTokenAddress.toLowerCase();
 }

package/src/shared/constants/chains/supported.ts

@@ -1,4 +1,4 @@
-import { ANYSPEND_EVM_CHAINS } from "@b3/chain-registry";
+import { ANYSPEND_EVM_CHAINS } from "@b3/chain-registry/runtime";
 import { toThirdwebChain, toViemChain } from "@b3dotfun/sdk/shared/utils/chain-transformers";
 import invariant from "invariant";
 import type { Chain as ThirdwebChain } from "thirdweb";

package/src/shared/react/hooks/__tests__/useCurrencyConversion.test.ts

@@ -1,25 +1,27 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
 import { renderHook } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import { useCurrencyConversion } from "../useCurrencyConversion";
 
 // Mock the external dependencies
 // Store mock rates for different quote currencies
 const mockRates: Record<string, number | undefined> = {};
 
-// Mock store state
 const mockStoreState: any = {
   selectedCurrency: "B3",
   baseCurrency: "B3",
+  customCurrencies: {},
+  getExchangeRate: vi.fn(() => undefined),
   setSelectedCurrency: vi.fn(),
   setBaseCurrency: vi.fn(),
 };
 
-vi.mock("@b3dotfun/sdk/global-account/react", () => ({
-  useExchangeRate: vi.fn((params: any) => {
-    const rate = mockRates[params?.quoteCurrency];
-    return { rate };
-  }),
-}));
+vi.mock("@tanstack/react-query", async importOriginal => {
+  const actual = await importOriginal<typeof import("@tanstack/react-query")>();
+  return {
+    ...actual,
+    useQuery: vi.fn(() => ({ data: mockRates })),
+  };
+});
 
 vi.mock("@b3dotfun/sdk/shared/utils/number", () => ({
   formatDisplayNumber: vi.fn((value: any) => {
@@ -29,14 +31,8 @@ vi.mock("@b3dotfun/sdk/shared/utils/number", () => ({
   }),
 }));
 
-vi.mock("../../stores/currencyStore", () => ({
-  useCurrencyStore: vi.fn((selector: any) => {
-    if (selector) {
-      return selector(mockStoreState);
-    }
-    return mockStoreState;
-  }),
-  CURRENCY_SYMBOLS: {
+vi.mock("../../stores/currencyStore", () => {
+  const symbols: Record<string, string> = {
     B3: "B3",
     USD: "$",
     EUR: "€",
@@ -47,8 +43,23 @@ vi.mock("../../stores/currencyStore", () => ({
     ETH: "ETH",
     SOL: "SOL",
     KRW: "₩",
-  },
-}));
+  };
+
+  return {
+    useCurrencyStore: vi.fn((selector: any) => {
+      if (selector) {
+        return selector(mockStoreState);
+      }
+      return mockStoreState;
+    }),
+    getCurrencySymbol: vi.fn((currency: string) => symbols[currency] ?? currency),
+    getCurrencyMetadata: vi.fn(() => undefined),
+  };
+});
+
+function renderCurrencyConversion() {
+  return renderHook(() => useCurrencyConversion());
+}
 
 describe("useCurrencyConversion", () => {
   beforeEach(() => {
@@ -66,7 +77,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "B3";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const formatted = result.current.formatCurrencyValue(100, "B3");
 
       expect(formatted).toContain("B3");
@@ -78,7 +89,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "USD";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const formatted = result.current.formatCurrencyValue(100, "B3");
 
       expect(formatted).toContain("B3");
@@ -90,7 +101,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "USD";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const formatted = result.current.formatCurrencyValue(100, "B3");
 
       expect(formatted).toMatch(/^\$/);
@@ -103,7 +114,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "EUR";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const formatted = result.current.formatCurrencyValue(100, "B3");
 
       expect(formatted).toMatch(/^€/);
@@ -115,7 +126,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "JPY";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const formatted = result.current.formatCurrencyValue(100, "B3");
 
       expect(formatted).toContain("¥");
@@ -128,7 +139,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "KRW";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const formatted = result.current.formatCurrencyValue(100, "B3");
 
       expect(formatted).toContain("₩");
@@ -141,7 +152,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "ETH";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const formatted = result.current.formatCurrencyValue(100, "B3");
 
       expect(formatted).toContain("ETH");
@@ -154,7 +165,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "SOL";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const formatted = result.current.formatCurrencyValue(100, "B3");
 
       expect(formatted).toContain("SOL");
@@ -166,7 +177,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "USD";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const formatted = result.current.formatCurrencyValue(10, "B3");
 
       // 10 * 1.5 = 15
@@ -180,7 +191,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "USD";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const inputValue = 100;
       const formatted = result.current.formatCurrencyValue(inputValue, "B3");
 
@@ -193,7 +204,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "USD";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
 
       expect(result.current.selectedCurrency).toBe("USD");
     });
@@ -202,7 +213,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "USD";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
 
       expect(result.current.baseCurrency).toBe("B3");
     });
@@ -213,7 +224,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "USD";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
 
       expect(result.current.exchangeRate).toBe(testRate);
     });
@@ -222,7 +233,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "EUR";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
 
       expect(result.current.selectedCurrencySymbol).toBe("€");
       expect(result.current.baseCurrencySymbol).toBe("B3");
@@ -235,24 +246,24 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "B3";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const tooltip = result.current.formatTooltipValue(100, "B3");
 
       expect(tooltip).toContain("USD");
       expect(tooltip).toContain("150");
     });
 
-    it("should show base currency when displaying other currency", () => {
+    it("shows the USD equivalent regardless of selected display currency", () => {
       mockRates.EUR = 0.9;
       mockRates.USD = 1.2;
       mockStoreState.selectedCurrency = "EUR";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const tooltip = result.current.formatTooltipValue(100, "B3");
 
-      expect(tooltip).toContain("B3");
-      expect(tooltip).toContain("100");
+      expect(tooltip).toContain("USD");
+      expect(tooltip).toContain("120");
     });
 
     it("should handle custom currency for base currency", () => {
@@ -261,7 +272,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "EUR";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const tooltip = result.current.formatTooltipValue(100, "B3");
 
       expect(tooltip).toContain("USD");
@@ -273,7 +284,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "USD";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const tooltip = result.current.formatTooltipValue(50, "ETH");
 
       expect(tooltip).toContain("ETH");
@@ -285,7 +296,7 @@ describe("useCurrencyConversion", () => {
       mockStoreState.selectedCurrency = "B3";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const tooltip = result.current.formatTooltipValue(-100, "B3");
 
       expect(tooltip).toContain("USD");
@@ -293,15 +304,15 @@ describe("useCurrencyConversion", () => {
       expect(tooltip).not.toContain("-");
     });
 
-    it("should handle exchange rate unavailable", () => {
+    it("falls back to the source currency when its USD rate is unavailable", () => {
       mockRates.USD = undefined;
       mockStoreState.selectedCurrency = "B3";
       mockStoreState.baseCurrency = "B3";
 
-      const { result } = renderHook(() => useCurrencyConversion());
+      const { result } = renderCurrencyConversion();
       const tooltip = result.current.formatTooltipValue(100, "B3");
 
-      expect(tooltip).toContain("USD");
+      expect(tooltip).toContain("B3");
       expect(tooltip).toContain("100");
     });
   });

package/src/shared/utils/__tests__/zerionPositions.test.ts

@@ -1,8 +1,13 @@
-import { describe, expect, it } from "vitest";
+import { isSolanaAddress as registryIsSolanaAddress, SOLANA_NATIVE_ASSET } from "@b3/chain-registry/runtime";
+import { describe, expect, expectTypeOf, it } from "vitest";
+import { isSolanaAddress as sdkIsSolanaAddress } from "../../../anyspend/utils/address";
 import {
   adaptZerionPositions,
   chainIdToZerionSlug,
   EVM_NATIVE_TOKEN_ADDRESS,
+  SOLANA_CHAIN_ID,
+  SOLANA_NATIVE_TOKEN_ADDRESS,
+  SOLANA_ZERION_SLUG,
   zerionSlugToChainId,
   type ZerionPositionLike,
 } from "../zerionPositions";
@@ -224,3 +229,20 @@ describe("zerionSlugToChainId", () => {
     expect(chainIdToZerionSlug(8453)).toBe("base");
   });
 });
+
+describe("canonical Solana registry compatibility", () => {
+  it("preserves published SDK values and literal types", () => {
+    expect(SOLANA_NATIVE_TOKEN_ADDRESS).toBe(SOLANA_NATIVE_ASSET.wrapped.address);
+    expect(SOLANA_ZERION_SLUG).toBe(SOLANA_NATIVE_ASSET.chain);
+    expect(SOLANA_CHAIN_ID).toBe(SOLANA_NATIVE_ASSET.chainId);
+    expectTypeOf(SOLANA_NATIVE_TOKEN_ADDRESS).toEqualTypeOf<"So11111111111111111111111111111111111111112">();
+    expectTypeOf(SOLANA_ZERION_SLUG).toEqualTypeOf<"solana">();
+    expectTypeOf(SOLANA_CHAIN_ID).toEqualTypeOf<7565164>();
+  });
+
+  it("re-exports the registry Solana address guard unchanged", () => {
+    expect(sdkIsSolanaAddress).toBe(registryIsSolanaAddress);
+    expect(sdkIsSolanaAddress(SOLANA_NATIVE_TOKEN_ADDRESS)).toBe(true);
+    expect(sdkIsSolanaAddress("So1111111111111111111111111111111111111111O")).toBe(false);
+  });
+});