feat: Solana + Tron withdrawals + chain-expansion polish

src/app/(mobile-ui)/card-recovery/page.tsx

@@ -1,19 +1,15 @@
 'use client'
 
 import { useCallback, useEffect, useState } from 'react'
-import type { Address, Hex } from 'viem'
+import type { Hex } from 'viem'
 import { Button } from '@/components/0_Bruddle/Button'
 import { Card } from '@/components/0_Bruddle/Card'
 import ErrorAlert from '@/components/Global/ErrorAlert'
 import NavHeader from '@/components/Global/NavHeader'
 import PeanutLoading from '@/components/Global/PeanutLoading'
 import { useKernelClient } from '@/context/kernelClient.context'
 import { useSafeBack } from '@/hooks/useSafeBack'
-import {
-    RAIN_WITHDRAW_EIP712_DOMAIN_NAME,
-    RAIN_WITHDRAW_EIP712_DOMAIN_VERSION,
-    rainWithdrawEip712Types,
-} from '@/constants/rain.consts'
+import { buildRainWithdrawTypedData } from '@/utils/rainWithdraw.utils'
 import { PEANUT_WALLET_CHAIN } from '@/constants/zerodev.consts'
 import { rainApi, type RecoverFundsPreviewResponse } from '@/services/rain'
 import { getExplorerUrl } from '@/utils/general.utils'
@@ -82,24 +78,9 @@ export default function CardRecoveryPage() {
             const chainIdNum = Number(prep.chainId)
             const kernelClient = getClientForChain(chainIdStr)
 
-            const adminSignature = (await kernelClient.account!.signTypedData({
-                domain: {
-                    name: RAIN_WITHDRAW_EIP712_DOMAIN_NAME,
-                    version: RAIN_WITHDRAW_EIP712_DOMAIN_VERSION,
-                    chainId: chainIdNum,
-                    verifyingContract: prep.collateralProxy as Address,
-                    salt: prep.adminSalt as Hex,
-                },
-                types: rainWithdrawEip712Types,
-                primaryType: 'Withdraw',
-                message: {
-                    user: prep.adminAddress as Address,
-                    asset: prep.tokenAddress as Address,
-                    amount: BigInt(prep.amount),
-                    recipient: prep.recipientAddress as Address,
-                    nonce: BigInt(prep.adminNonce),
-                },
-            })) as Hex
+            const adminSignature = (await kernelClient.account!.signTypedData(
+                buildRainWithdrawTypedData(prep, chainIdNum)
+            )) as Hex
 
             setStep('submitting')
             const { txHash: hash } = await rainApi.submitWithdrawal({

src/app/(mobile-ui)/qr-pay/__tests__/qr-pay-states.test.tsx

@@ -49,7 +49,7 @@
     default: (props: any) => {
         // next/image uses 'fill' boolean; strip non-DOM props
         const { priority, layout, objectFit, fill, ...rest } = props
         return <img {...rest} />
     },
 }))
 
@@ -506,7 +506,7 @@
 
 // Loading state context provider
 const LoadingStateProvider = ({ children }: { children: React.ReactNode }) => {
-    const loadingStateContext = require('@/context').loadingStateContext
+    const loadingStateContext = require('@/context/loadingStates.context').loadingStateContext
     const [loadingState, setLoadingState] = React.useState('Idle')
     const isLoading = loadingState !== 'Idle'
     return (
@@ -516,9 +516,10 @@
     )
 }
 
-// We need to mock the context module itself since it's imported via { loadingStateContext }
+// We need to mock the context module itself (specific file, not the barrel — the page
+// imports from '@/context/loadingStates.context' per the no-barrel rule)
 const mockSetLoadingState = jest.fn()
-jest.mock('@/context', () => ({
+jest.mock('@/context/loadingStates.context', () => ({
     loadingStateContext: React.createContext({
         loadingState: 'Idle' as string,
         setLoadingState: (s: string) => {},
@@ -529,7 +530,7 @@
 function renderQrPay(params: Record<string, string> = {}) {
     setSearchParams(params)
     const queryClient = createQueryClient()
-    const { loadingStateContext } = require('@/context')
+    const { loadingStateContext } = require('@/context/loadingStates.context')
 
     const LoadingProvider = ({ children }: { children: React.ReactNode }) => {
         const [loadingState, setLoadingState] = React.useState<string>('Idle')

src/app/(mobile-ui)/qr-pay/page.tsx

@@ -19,7 +19,7 @@
 import { useWallet } from '@/hooks/wallet/useWallet'
 import { useSignSpendBundle } from '@/hooks/wallet/useSignSpendBundle'
 import { useStaleSessionGuard } from '@/hooks/wallet/useStaleSessionGuard'
-import { InsufficientSpendableError, SessionKeyGrantRequiredError } from '@/hooks/wallet/useSpendBundle'
+import { InsufficientSpendableError, SessionKeyGrantRequiredError } from '@/hooks/wallet/spendPreflight'
 import { rainCollateralErrorMessage } from '@/utils/friendly-error.utils'
 import { useRainCardOverview } from '@/hooks/useRainCardOverview'
 import {
@@ -28,14 +28,9 @@
     BALANCE_SETTLING_MESSAGE,
     isAmountWithinBalance,
 } from '@/utils/balance.utils'
-import { isTxReverted, saveRedirectUrl, formatNumberForDisplay } from '@/utils/general.utils'
+import { formatNumberForDisplay } from '@/utils/general.utils'
 import { getShakeClass, type ShakeIntensity } from '@/utils/perk.utils'
-import {
-    calculateSavingsInCents,
-    hasCardMarkupComparison,
-    isArgentinaMantecaQrPayment,
-    getSavingsMessage,
-} from '@/utils/qr-payment.utils'
+import { calculateSavingsInCents, hasCardMarkupComparison, getSavingsMessage } from '@/utils/qr-payment.utils'
 import { useCardMarkupRate } from '@/hooks/useCardMarkupRate'
 import ErrorAlert from '@/components/Global/ErrorAlert'
 import { PEANUT_WALLET_CHAIN, PEANUT_WALLET_TOKEN_DECIMALS } from '@/constants/zerodev.consts'
@@ -44,11 +39,10 @@
 import { MIN_MANTECA_QR_PAYMENT_AMOUNT, MIN_PIX_AMOUNT_BRL } from '@/constants/payment.consts'
 import { isPixRecurringCode } from '@/utils/withdraw.utils'
 import { formatUnits, parseUnits } from 'viem'
-import type { TransactionReceipt, Hash } from 'viem'
 import { useTransactionDetailsDrawer } from '@/hooks/useTransactionDetailsDrawer'
 import { TransactionDetailsDrawer } from '@/components/TransactionDetails/TransactionDetailsDrawer'
 import { EHistoryUserRole } from '@/hooks/useTransactionHistory'
-import { loadingStateContext } from '@/context'
+import { loadingStateContext } from '@/context/loadingStates.context'
 import { getCurrencyPrice } from '@/app/actions/currency'
 import { PaymentInfoRow } from '@/components/Payment/PaymentInfoRow'
 import { captureException } from '@sentry/nextjs'
@@ -256,7 +250,7 @@
         if (sumsubFlow.showWrapper || sumsubFlow.isModalOpen) {
             sumsubFlow.completeFlow()
         }
     }, [kycGateState, sumsubFlow.showWrapper, sumsubFlow.isModalOpen, sumsubFlow.completeFlow])
 
     const queryClient = useQueryClient()
     const [isShaking, setIsShaking] = useState(false)
@@ -367,7 +361,7 @@
         if (isSuccess || !!errorMessage) {
             setLoadingState('Idle')
         }
     }, [isSuccess, errorMessage])
 
     // First fetch for qrcode info — only after KYC gating allows proceeding
     useEffect(() => {
@@ -386,7 +380,7 @@
         }
 
         setIsFirstLoad(false)
     }, [timestamp, paymentProcessor, qrCode])
 
     // Get amount from payment lock (Manteca)
     useEffect(() => {
@@ -401,7 +395,7 @@
             setAmount(paymentLock.paymentAgainstAmount)
             setCurrencyAmount(paymentLock.paymentAssetAmount)
         }
     }, [paymentLock?.code, paymentProcessor])
 
     // Get currency object from payment lock (Manteca)
     useEffect(() => {
@@ -423,7 +417,7 @@
             }
         }
         getCurrencyObject().then(setCurrency)
     }, [paymentLock?.code, paymentProcessor])
 
     const isBlockingError = useMemo(() => {
         // The settling failure says "try again in a few seconds" — keep the Pay
@@ -445,7 +439,7 @@
             // For dynamic QR codes, backend provides the USD amount
             return paymentLock.paymentAgainstAmount
         }
     }, [paymentLock?.code, paymentLock?.paymentAgainstAmount, amount])
 
     // Live card-vs-local-rail markup, driven by Manteca's rate + (for ARS)
     // BCRA's official rate. Used by both the confirm-screen "Save vs card"

src/app/(mobile-ui)/withdraw/manteca/page.tsx

@@ -3,7 +3,7 @@
 import { useWallet } from '@/hooks/wallet/useWallet'
 import { useSignSpendBundle } from '@/hooks/wallet/useSignSpendBundle'
 import { useStaleSessionGuard } from '@/hooks/wallet/useStaleSessionGuard'
-import { InsufficientSpendableError, SessionKeyGrantRequiredError } from '@/hooks/wallet/useSpendBundle'
+import { InsufficientSpendableError, SessionKeyGrantRequiredError } from '@/hooks/wallet/spendPreflight'
 import { rainCollateralErrorMessage } from '@/utils/friendly-error.utils'
 import {
     rainCentsToUsdcUnits,

src/app/actions/supported-chains.ts

@@ -7,6 +7,10 @@ import ARBITRUM_ICON from '@/assets/chains/arbitrum.svg'
 // falls back to initials ("AO"). Prefer a bundled local asset for those.
 const CHAIN_ICON_OVERRIDES: Record<string, string> = {
     '42161': ARBITRUM_ICON,
+    // Linea's chain-details icon is an SVG served via ipfs.io — next/image
+    // refuses SVG by default, so it rendered as "LI" initials. CoinGecko
+    // raster instead. (Avalanche/Mantle ipfs icons are PNG and render fine.)
+    '59144': 'https://coin-images.coingecko.com/asset_platforms/images/135/small/linea.jpeg?1706606705',
 }
 
 export async function getSupportedChainsAndTokens(): Promise<Record<string, ChainWithTokens>> {

src/components/AddMoney/components/ChooseNetworkDrawer.tsx

@@ -2,8 +2,9 @@
 
 import { Drawer, DrawerContent, DrawerHeader, DrawerTitle, DrawerDescription } from '@/components/Global/Drawer'
 import { ActionListCard } from '@/components/ActionListCard'
-import ChainChip from './ChainChip'
+import EvmChainChips from './EvmChainChips'
 import { CHAIN_LOGOS, SUPPORTED_EVM_CHAINS, getSupportedTokens } from '@/constants/rhino.consts'
+import { useChainRollout } from '@/hooks/useChainRollout'
 import type { RhinoChainType } from '@/services/services.types'
 import Image from 'next/image'
 
@@ -14,6 +15,10 @@ interface ChooseNetworkDrawerProps {
 }
 
 const ChooseNetworkDrawer = ({ open, onClose, onSelect }: ChooseNetworkDrawerProps) => {
+    // Count only rolled-out chains — the chips below are gated the same way,
+    // and "12 Networks" above 10 visible chips would be a lie.
+    const isChainRolledOut = useChainRollout()
+    const evmChainCount = SUPPORTED_EVM_CHAINS.filter(isChainRolledOut).length
     return (
         <Drawer open={open} onOpenChange={(isOpen) => !isOpen && onClose()}>
             <DrawerContent className="pt-4">
@@ -27,7 +32,7 @@ const ChooseNetworkDrawer = ({ open, onClose, onSelect }: ChooseNetworkDrawerPro
                     <div className="overflow-hidden rounded-t-sm border border-black bg-white ">
                         <ActionListCard
                             title="EVM"
-                            description={`${SUPPORTED_EVM_CHAINS.length} Networks - 1 Address`}
+                            description={`${evmChainCount} Networks - 1 Address`}
                             position="single"
                             className="border-0"
                             leftIcon={
@@ -44,9 +49,7 @@ const ChooseNetworkDrawer = ({ open, onClose, onSelect }: ChooseNetworkDrawerPro
                         {/* expanded chain list */}
                         <div onClick={() => onSelect('EVM')} className="mx-4 border-t border-dashed border-black py-3">
                             <div className="flex flex-wrap gap-2">
-                                {SUPPORTED_EVM_CHAINS.map((chain) => (
-                                    <ChainChip key={chain} chainName={chain} chainSymbol={CHAIN_LOGOS[chain]} />
-                                ))}
+                                <EvmChainChips />
                             </div>
                         </div>
                     </div>

src/components/AddMoney/components/EvmChainChips.tsx

@@ -0,0 +1,24 @@
+import ChainChip from './ChainChip'
+import { SUPPORTED_EVM_CHAINS, CHAIN_LOGOS, EVM_DEPOSIT_TOKEN_EXCEPTIONS } from '@/constants/rhino.consts'
+import { useChainRollout } from '@/hooks/useChainRollout'
+
+/**
+ * The rollout-gated EVM deposit chain chips, annotated with per-chain token
+ * exceptions (USDT-only chains) — a USDC deposit on a chain where Rhino only
+ * accepts USDT has no webhook, so the annotation is a funds-safety surface,
+ * not decoration. Shared by ChooseNetworkDrawer and SupportedNetworksModal.
+ */
+const EvmChainChips = () => {
+    const isChainRolledOut = useChainRollout()
+    return (
+        <>
+            {SUPPORTED_EVM_CHAINS.filter(isChainRolledOut).map((chain) => {
+                const tokenException = EVM_DEPOSIT_TOKEN_EXCEPTIONS[chain]
+                const label = tokenException ? `${chain} · ${tokenException.join('/')} only` : chain
+                return <ChainChip key={chain} chainName={label} chainSymbol={CHAIN_LOGOS[chain]} />
+            })}
+        </>
+    )
+}
+
+export default EvmChainChips

src/components/AddMoney/components/SupportedNetworksModal.tsx

@@ -2,8 +2,7 @@
 
 import Modal from '@/components/Global/Modal'
 import InfoCard from '@/components/Global/InfoCard'
-import ChainChip from './ChainChip'
-import { SUPPORTED_EVM_CHAINS, CHAIN_LOGOS } from '@/constants/rhino.consts'
+import EvmChainChips from './EvmChainChips'
 
 interface SupportedNetworksModalProps {
     visible: boolean
@@ -25,9 +24,7 @@ const SupportedNetworksModal = ({ visible, onClose }: SupportedNetworksModalProp
                 </p>
 
                 <div className="flex flex-wrap gap-2">
-                    {SUPPORTED_EVM_CHAINS.map((chain) => (
-                        <ChainChip key={chain} chainName={chain} chainSymbol={CHAIN_LOGOS[chain]} />
-                    ))}
+                    <EvmChainChips />
                 </div>
 
                 <InfoCard

src/components/AddMoney/views/CryptoDeposit.view.tsx

@@ -313,6 +313,12 @@ const CryptoDepositView = ({
                                     {depositAddressData.maxDepositLimitUsd.toLocaleString()} USD
                                 </p>
                             </div>
+                            {!isOfframp && (
+                                <p className="pt-1 text-sm text-grey-1">
+                                    A small bridging fee (~0.1%) applies — you&apos;ll receive slightly less than you
+                                    send.
+                                </p>
+                            )}
                             {isOfframp && (
                                 <p className="pt-1 text-sm text-grey-1">
                                     Moving more than the max? Send it in multiple transfers.

src/components/Card/CancelCardModal.tsx

@@ -10,7 +10,7 @@ import SlideToAction from '@/components/Card/SlideToAction'
 import { rainApi } from '@/services/rain'
 import { RAIN_CARD_OVERVIEW_QUERY_KEY, useRainCardOverview } from '@/hooks/useRainCardOverview'
 import { useSignSpendBundle } from '@/hooks/wallet/useSignSpendBundle'
-import { InsufficientSpendableError, SessionKeyGrantRequiredError } from '@/hooks/wallet/useSpendBundle'
+import { InsufficientSpendableError, SessionKeyGrantRequiredError } from '@/hooks/wallet/spendPreflight'
 import { useWallet } from '@/hooks/wallet/useWallet'
 import { rainCentsToUsdcUnits } from '@/utils/balance.utils'
 

src/components/Card/LockCardModal.tsx

@@ -10,7 +10,7 @@ import SlideToAction from '@/components/Card/SlideToAction'
 import { rainApi } from '@/services/rain'
 import { RAIN_CARD_OVERVIEW_QUERY_KEY, useRainCardOverview } from '@/hooks/useRainCardOverview'
 import { useSignSpendBundle } from '@/hooks/wallet/useSignSpendBundle'
-import { InsufficientSpendableError, SessionKeyGrantRequiredError } from '@/hooks/wallet/useSpendBundle'
+import { InsufficientSpendableError, SessionKeyGrantRequiredError } from '@/hooks/wallet/spendPreflight'
 import { useWallet } from '@/hooks/wallet/useWallet'
 import { rainCentsToUsdcUnits } from '@/utils/balance.utils'
 

src/components/Global/GeneralRecipientInput/index.tsx

@@ -7,6 +7,7 @@ import * as Senty from '@sentry/nextjs'
 import { useCallback, useRef } from 'react'
 import { isIBAN } from 'validator'
 import { validateAndResolveRecipient } from '@/lib/validation/recipient'
+import { isValidAddressForFamily, type WithdrawAddressFamily } from '@/lib/validation/addressFamily'
 import { BASE_URL } from '@/constants/general.consts'
 
 type GeneralRecipientInputProps = {
@@ -17,6 +18,10 @@ type GeneralRecipientInputProps = {
     infoText?: string
     showInfoText?: boolean
     isWithdrawal?: boolean
+    /** Address family of the selected withdraw destination ('evm' default).
+     *  Solana/Tron short-circuit the IBAN/US-routing/ENS branches — a base58
+     *  address is the only valid input for them. */
+    addressFamily?: WithdrawAddressFamily
 }
 
 export type GeneralRecipientUpdate = {
@@ -35,6 +40,7 @@ const GeneralRecipientInput = ({
     infoText,
     showInfoText = true,
     isWithdrawal = false,
+    addressFamily = 'evm',
 }: GeneralRecipientInputProps) => {
     const recipientType = useRef<RecipientType>('address')
     const errorMessage = useRef('')
@@ -50,6 +56,19 @@ const GeneralRecipientInput = ({
                 const trimmedInput = recipient.trim().replace(`${BASE_URL}/`, '')
                 const sanitizedInput = sanitizeBankAccount(trimmedInput)
 
+                // Non-EVM destination: base58 address or nothing — never IBAN,
+                // US-routing, ENS, or username.
+                if (addressFamily !== 'evm') {
+                    const familyValid = isValidAddressForFamily(trimmedInput, addressFamily)
+                    if (familyValid) {
+                        resolvedAddress.current = trimmedInput
+                    } else {
+                        errorMessage.current = `Invalid ${addressFamily === 'solana' ? 'Solana' : 'Tron'} address`
+                    }
+                    recipientType.current = 'address'
+                    return familyValid
+                }
+
                 if (isIBAN(sanitizedInput)) {
                     type = 'iban'
                     isValid = await validateBankAccount(sanitizedInput)
@@ -82,7 +101,7 @@ const GeneralRecipientInput = ({
                 return false
             }
         },
-        [isWithdrawal]
+        [isWithdrawal, addressFamily]
     )
 
     const onInputUpdate = useCallback(

src/components/Global/TokenSelector/TokenSelector.consts.ts

@@ -1,7 +1,8 @@
 import { SOLANA_ICON, TRON_ICON } from '@/assets'
 import { networks } from '@/config'
+import { CHAIN_REGISTRY } from '@/constants/chainRegistry.consts'
 import type { IPeanutChainDetails, IToken } from '@/interfaces/interfaces'
-import { celo, linea, worldchain } from 'viem/chains'
+import { celo, linea, scroll, worldchain } from 'viem/chains'
 
 interface CombinedType extends IPeanutChainDetails {
     tokens: IToken[]
@@ -69,7 +70,9 @@ export const TOKEN_SELECTOR_POPULAR_NETWORK_IDS = [
     },
 ]
 
-const networksToExclude: readonly number[] = [celo.id, linea.id, worldchain.id] as const
+// scroll excluded 2026-07-10: Rhino disabled it entirely, and Scroll isn't an
+// SDA deposit chain either, so every cross-chain route from it dead-ends.
+const networksToExclude: readonly number[] = [celo.id, linea.id, scroll.id, worldchain.id] as const
 
 // supported network ids for the network list, getting this from reown appkit config
 export const TOKEN_SELECTOR_SUPPORTED_NETWORK_IDS = networks
@@ -92,12 +95,12 @@ export const TOKEN_SELECTOR_SUPPORTED_NETWORK_IDS = networks
  *   BNB Chain is supported.
  * - EVM only (the withdraw flow uses 0x addresses); matches the current
  *   selectable chain set rather than every Rhino chain.
+ * - 2026-07-10 expansion: each new chain verified against Rhino prod with a real
+ *   ARBITRUM→X quote AND an outflow SDA create (see PR #2396). Stablecoins only
+ *   for the new chains — that's what was tested. Plasma/Stable are USDT-only on
+ *   Rhino. KAIA/opBNB deliberately absent: quotes pass but SDA create rejects
+ *   (DepositAddressTokenOutNotSupported).
  */
-export const RHINO_WITHDRAW_SUPPORTED_TOKENS_BY_CHAIN: Record<string, readonly string[]> = {
-    '42161': ['ETH', 'USDC', 'USDT'], // Arbitrum
-    '1': ['ETH', 'USDC', 'USDT'], // Ethereum
-    '10': ['ETH', 'USDC', 'USDT'], // Optimism
-    '137': ['USDC', 'USDT'], // Polygon (native POL not bridged by Rhino)
-    '100': ['USDC', 'USDT'], // Gnosis (native xDAI not bridged by Rhino)
-    '56': ['BNB', 'USDC', 'USDT'], // BNB Chain
-}
+export const RHINO_WITHDRAW_SUPPORTED_TOKENS_BY_CHAIN: Record<string, readonly string[]> = Object.fromEntries(
+    CHAIN_REGISTRY.filter((c) => c.withdraw).map((c) => [c.id, c.withdraw!.tokens])
+)