@b3dotfun/sdk 0.0.87-alpha.1 → 0.0.87

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

@@ -90,7 +90,6 @@ const ANYSPEND_RECIPIENTS_KEY = "anyspend_recipients";
 export function AnySpend(props: {
   mode?: "page" | "modal";
   defaultActiveTab?: "crypto" | "fiat";
-  sourceChainId?: number;
   destinationTokenAddress?: string;
   destinationTokenChainId?: number;
   recipientAddress?: string;
@@ -103,10 +102,6 @@ export function AnySpend(props: {
   onTokenSelect?: (token: components["schemas"]["Token"], event: { preventDefault: () => void }) => void;
   onSuccess?: (txHash?: string) => void;
   customUsdInputValues?: string[];
-  hideHeader?: boolean;
-  hideBottomNavigation?: boolean;
-  /** When true, disables URL parameter management for swap configuration */
-  disableUrlParamManagement?: boolean;
 }) {
   const fingerprintConfig = getFingerprintConfig();
 
@@ -118,7 +113,6 @@ export function AnySpend(props: {
 }
 
 function AnySpendInner({
-  sourceChainId,
   destinationTokenAddress,
   destinationTokenChainId,
   mode = "modal",
@@ -129,11 +123,7 @@ function AnySpendInner({
   onTokenSelect,
   onSuccess,
   customUsdInputValues,
-  hideHeader,
-  hideBottomNavigation = false,
-  disableUrlParamManagement = false,
 }: {
-  sourceChainId?: number;
   destinationTokenAddress?: string;
   destinationTokenChainId?: number;
   mode?: "page" | "modal";
@@ -144,9 +134,6 @@ function AnySpendInner({
   onTokenSelect?: (token: components["schemas"]["Token"], event: { preventDefault: () => void }) => void;
   onSuccess?: (txHash?: string) => void;
   customUsdInputValues?: string[];
-  hideHeader?: boolean;
-  hideBottomNavigation?: boolean;
-  disableUrlParamManagement?: boolean;
 }) {
   const searchParams = useSearchParamsSSR();
   const router = useRouter();
@@ -224,7 +211,7 @@ function AnySpendInner({
   // const recipientInputRef = useRef<HTMLInputElement>(null);
 
   // Get initial chain IDs from URL or defaults
-  const initialSrcChainId = sourceChainId || parseInt(searchParams.get("fromChainId") || "0") || mainnet.id;
+  const initialSrcChainId = parseInt(searchParams.get("fromChainId") || "0") || mainnet.id;
   const initialDstChainId =
     parseInt(searchParams.get("toChainId") || "0") || (isBuyMode ? destinationTokenChainId : base.id);
 
@@ -336,8 +323,8 @@ function AnySpendInner({
 
   // Load swap configuration from URL on initial render
   useEffect(() => {
-    // Skip if we've already processed the URL, if we have an order to load, or if URL param management is disabled
-    if (initialUrlProcessed.current || loadOrder || disableUrlParamManagement) return;
+    // Skip if we've already processed the URL or if we have an order to load
+    if (initialUrlProcessed.current || loadOrder) return;
 
     try {
       const tabParam = searchParams.get("tab");
@@ -370,7 +357,7 @@ function AnySpendInner({
 
     // Mark that we've processed the initial URL
     initialUrlProcessed.current = true;
-  }, [searchParams, loadOrder, disableUrlParamManagement]);
+  }, [searchParams, loadOrder]);
 
   // Update URL when swap configuration changes - but not on initial load
   const updateSwapParamsInURL = useCallback(() => {
@@ -383,8 +370,7 @@ function AnySpendInner({
       activePanel !== PanelView.MAIN ||
       !initialUrlProcessed.current ||
       searchParams.has("orderId") ||
-      mode === "modal" ||
-      disableUrlParamManagement
+      mode === "modal"
     )
       return;
 
@@ -455,7 +441,6 @@ function AnySpendInner({
     dstAmount,
     router,
     srcAmountOnRamp,
-    disableUrlParamManagement,
   ]);
 
   // Update URL when relevant state changes - but only after initial render
@@ -665,20 +650,20 @@ function AnySpendInner({
       // setNewRecipientAddress("");
       navigateToPanel(PanelView.ORDER_DETAILS, "forward");
 
-      if (!disableUrlParamManagement) {
-        // Debug: Check payment method before setting URL
-        console.log("Creating order - selectedCryptoPaymentMethod:", selectedCryptoPaymentMethod);
+      // Debug: Check payment method before setting URL
+      console.log("Creating order - selectedCryptoPaymentMethod:", selectedCryptoPaymentMethod);
 
-        // Add orderId and payment method to URL for persistence
-        const params = new URLSearchParams(searchParams.toString()); // Preserve existing params
-        params.set("orderId", orderId);
-        if (effectiveCryptoPaymentMethod !== CryptoPaymentMethodType.NONE) {
-          params.set("cryptoPaymentMethod", effectiveCryptoPaymentMethod);
-        } else {
-          console.log("Payment method is NONE, not setting in URL");
-        }
-        router.push(`${window.location.pathname}?${params.toString()}`);
+      // Add orderId and payment method to URL for persistence
+      const params = new URLSearchParams(searchParams.toString()); // Preserve existing params
+      params.set("orderId", orderId);
+      if (effectiveCryptoPaymentMethod !== CryptoPaymentMethodType.NONE) {
+        console.log("Setting cryptoPaymentMethod in URL:", effectiveCryptoPaymentMethod);
+        params.set("cryptoPaymentMethod", effectiveCryptoPaymentMethod);
+      } else {
+        console.log("Payment method is NONE, not setting in URL");
       }
+      console.log("Final URL params:", params.toString());
+      router.push(`${window.location.pathname}?${params.toString()}`);
     },
     onError: error => {
       console.error(error);
@@ -693,13 +678,11 @@ function AnySpendInner({
       setOrderId(orderId);
       navigateToPanel(PanelView.ORDER_DETAILS, "forward");
 
-      if (!disableUrlParamManagement) {
-        // Add orderId and payment method to URL for persistence
-        const params = new URLSearchParams(searchParams.toString());
-        params.set("orderId", orderId);
-        params.set("paymentMethod", "fiat");
-        router.push(`${window.location.pathname}?${params.toString()}`);
-      }
+      // Add orderId and payment method to URL for persistence
+      const params = new URLSearchParams(searchParams.toString());
+      params.set("orderId", orderId);
+      params.set("paymentMethod", "fiat");
+      router.push(`${window.location.pathname}?${params.toString()}`);
     },
     onError: error => {
       console.error(error);
@@ -848,13 +831,11 @@ function AnySpendInner({
       type: "anySpendOrderHistory",
       showBackButton: false,
     });
-    if (!disableUrlParamManagement) {
-      // Remove orderId and paymentMethod from URL when going back to history
-      const params = new URLSearchParams(searchParams.toString());
-      params.delete("orderId");
-      params.delete("paymentMethod");
-      router.push(`${window.location.pathname}?${params.toString()}`);
-    }
+    // Remove orderId and paymentMethod from URL when going back to history
+    const params = new URLSearchParams(searchParams.toString());
+    params.delete("orderId");
+    params.delete("paymentMethod");
+    router.push(`${window.location.pathname}?${params.toString()}`);
   };
 
   // Handle crypto swap creation
@@ -971,25 +952,23 @@ function AnySpendInner({
 
   // Update useEffect for URL parameter to not override loadOrder
   useEffect(() => {
-    if (loadOrder || disableUrlParamManagement) return; // Skip if we have a loadOrder or URL param management is disabled
+    if (loadOrder) return; // Skip if we have a loadOrder
 
     const orderIdParam = searchParams.get("orderId");
     if (orderIdParam) {
       setOrderId(orderIdParam);
       setActivePanel(PanelView.ORDER_DETAILS);
     }
-  }, [searchParams, loadOrder, disableUrlParamManagement]);
+  }, [searchParams, loadOrder]);
 
   const onSelectOrder = (selectedOrderId: string) => {
     setOrderId(selectedOrderId);
     navigateToPanel(PanelView.ORDER_DETAILS, "forward");
-    if (!disableUrlParamManagement) {
-      // Update URL with the new orderId and preserve existing parameters
-      const params = new URLSearchParams(searchParams.toString());
-      params.set("orderId", selectedOrderId);
-      // Keep existing paymentMethod if present
-      router.push(`${window.location.pathname}?${params.toString()}`);
-    }
+    // Update URL with the new orderId and preserve existing parameters
+    const params = new URLSearchParams(searchParams.toString());
+    params.set("orderId", selectedOrderId);
+    // Keep existing paymentMethod if present
+    router.push(`${window.location.pathname}?${params.toString()}`);
   };
 
   // Save custom recipients to local storage when they change
@@ -1077,7 +1056,7 @@ function AnySpendInner({
     <div className={"mx-auto flex w-[460px] max-w-full flex-col items-center gap-2 pt-5"}>
       <div className={"flex w-full max-w-full flex-col items-center gap-2 px-5"}>
         {/* Token Header - Show when in buy mode */}
-        {isBuyMode && !hideHeader && (
+        {isBuyMode && (
           <div className="mb-4 flex flex-col items-center gap-3 text-center">
             {selectedDstToken.metadata?.logoURI && (
               <div className="relative">
@@ -1283,7 +1262,7 @@ function AnySpendInner({
             }
           }}
         >
-          {mode !== "page" && !hideBottomNavigation && <BottomNavigation />}
+          {mode !== "page" && <BottomNavigation />}
         </TabsPrimitive>
       </div>
     </div>
@@ -1305,18 +1284,16 @@ function AnySpendInner({
       onOrderCreated={orderId => {
         setOrderId(orderId);
         navigateToPanel(PanelView.ORDER_DETAILS, "forward");
-        if (!disableUrlParamManagement) {
-          // Add orderId and payment method to URL for persistence
-          const params = new URLSearchParams(searchParams.toString()); // Preserve existing params
-          params.set("orderId", orderId);
-          // For fiat payments, the payment method is always fiat (but we use the active tab context)
-          if (activeTab === "fiat") {
-            params.set("paymentMethod", "fiat");
-          } else if (selectedCryptoPaymentMethod !== CryptoPaymentMethodType.NONE) {
-            params.set("paymentMethod", selectedCryptoPaymentMethod);
-          }
-          router.push(`${window.location.pathname}?${params.toString()}`);
+        // Add orderId and payment method to URL for persistence
+        const params = new URLSearchParams(searchParams.toString()); // Preserve existing params
+        params.set("orderId", orderId);
+        // For fiat payments, the payment method is always fiat (but we use the active tab context)
+        if (activeTab === "fiat") {
+          params.set("paymentMethod", "fiat");
+        } else if (selectedCryptoPaymentMethod !== CryptoPaymentMethodType.NONE) {
+          params.set("paymentMethod", selectedCryptoPaymentMethod);
         }
+        router.push(`${window.location.pathname}?${params.toString()}`);
       }}
       onBack={navigateBack}
       recipientEnsName={globalWallet?.ensName}

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

@@ -57,7 +57,7 @@ export interface AnySpendCustomExactInProps {
   customUsdInputValues?: string[];
   preferEoa?: boolean;
   customExactInConfig?: CustomExactInConfig;
-  orderType?: "hype_duel" | "custom_exact_in" | "swap";
+  orderType?: "hype_duel" | "custom_exact_in";
   minDestinationAmount?: number;
   header?: ({
     anyspendPrice,
@@ -147,6 +147,7 @@ function AnySpendCustomExactInInner({
     paymentType,
     recipientAddress,
     loadOrder,
+    isDepositMode: true,
     onTransactionSuccess: onSuccess,
     sourceTokenAddress,
     sourceTokenChainId,
@@ -313,7 +314,7 @@ function AnySpendCustomExactInInner({
   );
 
   const mainView = (
-    <div className="anyspend-custom-exact-in-container mx-auto flex w-[460px] max-w-full flex-col items-center gap-2">
+    <div className="mx-auto flex w-[460px] max-w-full flex-col items-center gap-2">
       {headerContent}
 
       <div className="relative flex w-full max-w-[calc(100vw-32px)] flex-col gap-2">

package/src/anyspend/react/components/common/OrderDetails.tsx

@@ -90,7 +90,6 @@ function getOrderSuccessText({
   let actionText = "";
   switch (order.type) {
     case "swap":
-    case "deposit_first":
       actionText = `sent ${formattedActualDstAmount || "--"} ${dstToken.symbol}`;
       return `Successfully ${actionText} to ${recipient}`;
     case "mint_nft":
@@ -248,7 +247,6 @@ export const OrderDetails = memo(function OrderDetails({
   const { data: walletClient } = useWalletClient();
   const [txHash, setTxHash] = useState<`0x${string}` | undefined>();
   const [showQRCode, setShowQRCode] = useState(false);
-  const [orderDetailsOpen, setOrderDetailsOpen] = useState(true);
   const { isLoading: txLoading, isSuccess: txSuccess } = useWaitForTransactionReceipt({ hash: txHash });
 
   const { switchChainAndExecuteWithEOA, switchChainAndExecute, isSwitchingOrExecuting } =
@@ -445,8 +443,7 @@ export const OrderDetails = memo(function OrderDetails({
     order.type === "mint_nft" ||
     order.type === "join_tournament" ||
     order.type === "fund_tournament" ||
-    order.type === "custom" ||
-    order.type === "deposit_first"
+    order.type === "custom"
       ? "0"
       : order.payload.expectedDstAmount.toString();
   const formattedExpectedDstAmount = formatTokenAmount(BigInt(expectedDstAmount), dstToken.decimals);
@@ -468,8 +465,6 @@ export const OrderDetails = memo(function OrderDetails({
           recipientName={recipientName}
           formattedExpectedDstAmount={formattedExpectedDstAmount}
           points={points}
-          isOpen={orderDetailsOpen}
-          onOpenChange={setOrderDetailsOpen}
         />
         <Accordion type="single" collapsible className="order-details-accordion w-full">
           <AccordionItem value="refund-details" className="order-details-refund-item">
@@ -549,8 +544,6 @@ export const OrderDetails = memo(function OrderDetails({
           recipientName={recipientName}
           formattedExpectedDstAmount={formattedExpectedDstAmount}
           points={points}
-          isOpen={orderDetailsOpen}
-          onOpenChange={setOrderDetailsOpen}
         />
         <Accordion type="single" collapsible className="order-details-accordion w-full">
           <AccordionItem value="execute-details" className="order-details-execute-item">
@@ -584,7 +577,7 @@ export const OrderDetails = memo(function OrderDetails({
                   ? relayTxs.map(relayTx => (
                       <TransactionDetails
                         key={relayTx.txHash}
-                        title="Processed Swap"
+                        title="Processed Transaction"
                         chainId={relayTx.chain}
                         tx={relayTx}
                         delay={0.5}
@@ -595,7 +588,7 @@ export const OrderDetails = memo(function OrderDetails({
 
                 <TransactionDetails
                   title={
-                    order.type === "swap" || order.type === "deposit_first"
+                    order.type === "swap"
                       ? "Processed Swap"
                       : order.type === "mint_nft"
                         ? "Minted NFT"
@@ -679,8 +672,6 @@ export const OrderDetails = memo(function OrderDetails({
           recipientName={recipientName}
           formattedExpectedDstAmount={formattedExpectedDstAmount}
           points={points}
-          isOpen={orderDetailsOpen}
-          onOpenChange={setOrderDetailsOpen}
         />
         <Accordion type="single" collapsible className="order-details-accordion w-full">
           <AccordionItem value="more-details" className="order-details-more-item">
@@ -712,12 +703,7 @@ export const OrderDetails = memo(function OrderDetails({
                   : null}
                 {relayTxs.map(relayTx => (
                   <TransactionDetails
-                    key={relayTx.txHash}
-                    title={
-                      relayTx.chain === order.srcChain
-                        ? `Process swap on ${getChainName(relayTx.chain)}`
-                        : `Received on ${getChainName(relayTx.chain)}`
-                    }
+                    title="Processed Transaction"
                     chainId={relayTx.chain}
                     isProcessing={false}
                     tx={relayTx}
@@ -727,8 +713,8 @@ export const OrderDetails = memo(function OrderDetails({
                 {order.status === "executing" && (
                   <TransactionDetails
                     title={
-                      order.type === "swap" || order.type === "x402_swap" || order.type === "deposit_first"
-                        ? "Processing swap"
+                      order.type === "swap" || order.type === "x402_swap"
+                        ? "Processing Swap"
                         : order.type === "mint_nft"
                           ? "Minting NFT"
                           : order.type === "join_tournament"
@@ -818,8 +804,6 @@ export const OrderDetails = memo(function OrderDetails({
           recipientName={recipientName}
           formattedExpectedDstAmount={formattedExpectedDstAmount}
           points={points}
-          isOpen={orderDetailsOpen}
-          onOpenChange={setOrderDetailsOpen}
         />
         <Accordion type="single" collapsible className="order-details-accordion w-full">
           <AccordionItem value="deposit-details" className="order-details-deposit-item">
@@ -858,8 +842,8 @@ export const OrderDetails = memo(function OrderDetails({
                 ) : depositEnoughAmount ? (
                   <TransactionDetails
                     title={
-                      order.type === "swap" || order.type === "deposit_first"
-                        ? "Processing swap"
+                      order.type === "swap"
+                        ? "Processing Swap"
                         : order.type === "mint_nft"
                           ? "Minting NFT"
                           : order.type === "join_tournament"
@@ -1101,8 +1085,6 @@ export const OrderDetails = memo(function OrderDetails({
           recipientName={recipientName}
           formattedExpectedDstAmount={formattedExpectedDstAmount}
           points={points}
-          isOpen={orderDetailsOpen}
-          onOpenChange={setOrderDetailsOpen}
         />
       )}
 

package/src/anyspend/react/components/common/OrderDetailsCollapsible.tsx

@@ -29,8 +29,6 @@ interface OrderDetailsCollapsibleProps {
   showTotal?: boolean;
   totalAmount?: string;
   points?: number;
-  isOpen?: boolean;
-  onOpenChange?: (isOpen: boolean) => void;
 }
 
 export const OrderDetailsCollapsible = memo(function OrderDetailsCollapsible({
@@ -44,22 +42,15 @@ export const OrderDetailsCollapsible = memo(function OrderDetailsCollapsible({
   showTotal = false,
   totalAmount,
   points,
-  isOpen,
-  onOpenChange,
 }: OrderDetailsCollapsibleProps) {
-  const [internalOpen, setInternalOpen] = useState(true);
-
-  // Use controlled mode if isOpen is provided, otherwise use internal state
-  const showOrderDetails = isOpen !== undefined ? isOpen : internalOpen;
-  const setShowOrderDetails = onOpenChange || setInternalOpen;
+  const [showOrderDetails, setShowOrderDetails] = useState(true);
 
   // Calculate expected amount if not provided
   const expectedDstAmount =
     order.type === "mint_nft" ||
     order.type === "join_tournament" ||
     order.type === "fund_tournament" ||
-    order.type === "custom" ||
-    order.type === "deposit_first"
+    order.type === "custom"
       ? "0"
       : order.payload.expectedDstAmount.toString();
 
@@ -104,12 +95,9 @@ export const OrderDetailsCollapsible = memo(function OrderDetailsCollapsible({
             <div className="order-details-divider divider w-full" />
 
             {/* Expected Amount/Action Section */}
-            <div className="order-details-expected-section flex w-full items-start justify-between gap-2">
-              <div className="order-details-expected-label text-as-tertiarry shrink-0">
-                {order.type === "swap" ||
-                order.type === "deposit_first" ||
-                order.type === "mint_nft" ||
-                order.type === "hype_duel"
+            <div className="order-details-expected-section flex w-full items-center justify-between gap-2">
+              <div className="order-details-expected-label text-as-tertiarry">
+                {order.type === "swap" || order.type === "mint_nft" || order.type === "hype_duel"
                   ? "Expected to receive"
                   : order.type === "join_tournament"
                     ? "Join tournament"
@@ -122,9 +110,9 @@ export const OrderDetailsCollapsible = memo(function OrderDetailsCollapsible({
                         : ""}
               </div>
 
-              <div className="order-details-expected-value flex flex-wrap items-center justify-end gap-2">
-                {order.type === "swap" || order.type === "deposit_first" ? (
-                  <span className="order-details-amount-text">{`~${finalFormattedExpectedDstAmount} ${dstToken.symbol}`}</span>
+              <div className="order-details-expected-value flex items-end gap-2">
+                {order.type === "swap" ? (
+                  `~${finalFormattedExpectedDstAmount} ${dstToken.symbol}`
                 ) : order.type === "mint_nft" ? (
                   <div className="order-details-nft-info flex items-center gap-2">
                     <img src={nft?.imageUrl} alt={nft?.name || "NFT"} className="order-details-nft-image h-5 w-5" />

package/src/anyspend/react/components/common/OrderStatus.tsx

@@ -13,7 +13,7 @@ export const OrderStatus = memo(function OrderStatus({
   order: components["schemas"]["Order"];
   selectedCryptoPaymentMethod?: CryptoPaymentMethodType;
 }) {
-  const showCheck = order.status === "executed" || order.status === "quoting_after_deposit";
+  const isComplete = order.status === "executed";
   const { text, status: displayStatus, description } = getStatusDisplay(order);
   const searchParams = useSearchParams();
   const cryptoPaymentMethod = selectedCryptoPaymentMethod || searchParams.get("cryptoPaymentMethod");
@@ -51,7 +51,7 @@ export const OrderStatus = memo(function OrderStatus({
 
   return (
     <div className="flex items-center justify-center gap-2">
-      {showCheck ? (
+      {isComplete ? (
         <div className="flex flex-col items-center">
           <div className={`bg-as-success-secondary relative flex h-10 w-10 items-center justify-center rounded-full`}>
             <Check className="text-as-content-icon-success h-6 w-6" />

package/src/anyspend/react/components/index.ts

@@ -5,8 +5,6 @@ export { AnySpendBuySpin } from "./AnySpendBuySpin";
 export { AnySpendCollectorClubPurchase } from "./AnySpendCollectorClubPurchase";
 export { AnySpendCustom } from "./AnySpendCustom";
 export { AnySpendCustomExactIn } from "./AnySpendCustomExactIn";
-export { AnySpendDeposit } from "./AnySpendDeposit";
-export type { AnySpendDepositProps, ChainConfig, DepositContractConfig } from "./AnySpendDeposit";
 export { AnySpendDepositHype, HYPE_TOKEN_DETAILS } from "./AnyspendDepositHype";
 export * from "./AnySpendFingerprintWrapper";
 export { AnySpendNFT } from "./AnySpendNFT";

package/src/anyspend/react/hooks/index.ts

@@ -1,6 +1,5 @@
 export * from "./useAnyspendCreateOnrampOrder";
 export * from "./useAnyspendCreateOrder";
-export * from "./useCreateDepositFirstOrder";
 export * from "./useAnyspendOrderAndTransactions";
 export * from "./useAnyspendOrderHistory";
 export * from "./useAnyspendQuote";

package/src/anyspend/react/hooks/useAnyspendFlow.ts

@@ -21,7 +21,6 @@ import { useEffect, useMemo, useState } from "react";
 import { parseUnits } from "viem";
 import { base, mainnet } from "viem/chains";
 import { components } from "../../types/api";
-import { GetQuoteRequest } from "../../types/api_req_res";
 import { CryptoPaymentMethodType } from "../components/common/CryptoPaymentMethod";
 import { FiatPaymentMethod } from "../components/common/FiatPaymentMethod";
 import { useAutoSelectCryptoPaymentMethod } from "./useAutoSelectCryptoPaymentMethod";
@@ -53,7 +52,7 @@ interface UseAnyspendFlowProps {
   destinationTokenChainId?: number;
   slippage?: number;
   disableUrlParamManagement?: boolean;
-  orderType?: "hype_duel" | "custom_exact_in" | "swap";
+  orderType?: "hype_duel" | "custom_exact_in";
 }
 
 // This hook serves for order hype_duel and custom_exact_in
@@ -61,6 +60,7 @@ export function useAnyspendFlow({
   paymentType = "crypto",
   recipientAddress,
   loadOrder,
+  isDepositMode = false,
   onOrderSuccess,
   onTransactionSuccess,
   sourceTokenAddress,
@@ -199,41 +199,16 @@ export function useAnyspendFlow({
   // For fiat payments, always use USDC decimals (6) regardless of selectedSrcToken
   const effectiveDecimals = paymentType === "fiat" ? USDC_BASE.decimals : selectedSrcToken.decimals;
   const activeInputAmountInWei = parseUnits(srcAmount.replace(/,/g, ""), effectiveDecimals).toString();
-
-  // Build quote request based on order type
-  const quoteRequest: GetQuoteRequest = (() => {
-    const baseParams = {
-      srcChain: paymentType === "fiat" ? base.id : selectedSrcChainId,
-      dstChain: selectedDstChainId ?? base.id,
-      srcTokenAddress: paymentType === "fiat" ? USDC_BASE.address : selectedSrcToken.address,
-      dstTokenAddress: selectedDstToken.address,
-      recipientAddress: effectiveRecipientAddress,
-      onrampVendor: paymentType === "fiat" ? getOnrampVendor(selectedFiatPaymentMethod) : undefined,
-    };
-
-    if (orderType === "swap") {
-      return {
-        ...baseParams,
-        type: "swap" as const,
-        tradeType: "EXACT_INPUT" as const,
-        amount: activeInputAmountInWei,
-      };
-    } else if (orderType === "hype_duel") {
-      return {
-        ...baseParams,
-        type: "hype_duel" as const,
-        amount: activeInputAmountInWei,
-      };
-    } else {
-      return {
-        ...baseParams,
-        type: "custom_exact_in" as const,
-        amount: activeInputAmountInWei,
-      };
-    }
-  })();
-
-  const { anyspendQuote, isLoadingAnyspendQuote, getAnyspendQuoteError } = useAnyspendQuote(quoteRequest);
+  const { anyspendQuote, isLoadingAnyspendQuote, getAnyspendQuoteError } = useAnyspendQuote({
+    srcChain: paymentType === "fiat" ? base.id : selectedSrcChainId,
+    dstChain: isDepositMode ? base.id : selectedDstChainId, // For deposits, always Base; for swaps, use selected destination
+    srcTokenAddress: paymentType === "fiat" ? USDC_BASE.address : selectedSrcToken.address,
+    dstTokenAddress: selectedDstToken.address,
+    type: orderType,
+    amount: activeInputAmountInWei,
+    recipientAddress: effectiveRecipientAddress,
+    onrampVendor: paymentType === "fiat" ? getOnrampVendor(selectedFiatPaymentMethod) : undefined,
+  });
 
   // Get geo options for fiat
   const { geoData, coinbaseAvailablePaymentMethods, stripeWeb2Support } = useGeoOnrampOptions(

package/src/anyspend/utils/format.ts

@@ -1,29 +1,14 @@
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
-import { formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
 
 export const getStatusDisplay = (
   order: components["schemas"]["Order"],
 ): { text: string; status: "processing" | "success" | "failure"; description?: string } => {
-  const srcToken = order.metadata?.srcToken;
-  const dstToken = order.metadata?.dstToken;
-  const formattedSrcAmount = srcToken ? formatTokenAmount(BigInt(order.srcAmount), srcToken.decimals) : undefined;
-  const actualDstAmount = order.settlement?.actualDstAmount;
-  const formattedActualDstAmount =
-    actualDstAmount && dstToken ? formatTokenAmount(BigInt(actualDstAmount), dstToken.decimals) : undefined;
-
   switch (order.status) {
-    case "scanning_deposit_transaction": {
-      const depositText =
-        formattedSrcAmount && srcToken
-          ? `Awaiting ${formattedSrcAmount} ${srcToken.symbol}`
-          : order.onrampMetadata
-            ? "Awaiting Payment"
-            : "Awaiting Deposit";
+    case "scanning_deposit_transaction":
       return {
-        text: depositText,
+        text: order.onrampMetadata ? "Awaiting Payment" : "Awaiting Deposit",
         status: "processing",
       };
-    }
     case "waiting_stripe_payment":
       return {
         text: "Awaiting Payment",
@@ -49,18 +34,16 @@ export const getStatusDisplay = (
         description: "It will take approximately one minute to complete.",
       };
     case "executed": {
-      const receivedText =
-        formattedActualDstAmount && dstToken ? `Received ${formattedActualDstAmount} ${dstToken.symbol}` : undefined;
       const { text, description } =
         order.type === "swap"
-          ? { text: receivedText || "Swap Complete", description: "Your swap has been completed successfully." }
+          ? { text: "Swap Complete", description: "Your swap has been completed successfully." }
           : order.type === "mint_nft"
             ? { text: "NFT Minted", description: "Your NFT has been minted" }
             : order.type === "join_tournament"
               ? { text: "Tournament Joined", description: "You have joined the tournament" }
               : order.type === "fund_tournament"
                 ? { text: "Tournament Funded", description: "You have funded the tournament" }
-                : { text: receivedText || "Order Complete", description: "Your order has been completed" };
+                : { text: "Order Complete", description: "Your order has been completed" };
       return { text, status: "success", description };
     }
 
@@ -76,19 +59,8 @@ export const getStatusDisplay = (
         description: "This order has failed. Please try again or contact support.",
       };
 
-    case "quoting_after_deposit": {
-      return {
-        text: "Quoting After Deposit",
-        status: "processing",
-        description: "Getting quote for the order",
-      };
-    }
-
     default:
-      return {
-        text: order.status,
-        status: "processing",
-      };
+      throw new Error("Invalid order status");
   }
 };
 

package/src/global-account/react/stores/useModalStore.ts

@@ -151,10 +151,6 @@ export interface AnySpendModalProps extends BaseModalProps {
   customUsdInputValues?: string[];
   /** Client-provided reference ID for tracking orders */
   clientReferenceId?: string;
-  /** Whether to hide the header */
-  hideHeader?: boolean;
-  /** When true, disables URL parameter management for swap configuration */
-  disableUrlParamManagement?: boolean;
 }
 
 /**