@b3dotfun/sdk 0.0.65-test.5 → 0.0.66

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

@@ -1,28 +1,7 @@
 import { B3_TOKEN } from "@b3dotfun/sdk/anyspend";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
-import { Button, ShinyButton, StyleRoot, TransitionPanel, useAccountWallet } from "@b3dotfun/sdk/global-account/react";
-import { cn } from "@b3dotfun/sdk/shared/utils/cn";
-import invariant from "invariant";
-import { motion } from "motion/react";
-import { useEffect, useMemo, useRef } from "react";
-import { toast } from "sonner";
-import { useSetActiveWallet } from "thirdweb/react";
 import { base } from "viem/chains";
-import { PanelView, useAnyspendFlow } from "../hooks/useAnyspendFlow";
-import { AnySpendFingerprintWrapper, getFingerprintConfig } from "./AnySpendFingerprintWrapper";
-import { CryptoPaySection } from "./common/CryptoPaySection";
-import { CryptoPaymentMethod, CryptoPaymentMethodType } from "./common/CryptoPaymentMethod";
-import { CryptoReceiveSection } from "./common/CryptoReceiveSection";
-import { FeeDetailPanel } from "./common/FeeDetailPanel";
-import { FiatPaymentMethod, FiatPaymentMethodComponent } from "./common/FiatPaymentMethod";
-import { OrderDetails } from "./common/OrderDetails";
-import { PointsDetailPanel } from "./common/PointsDetailPanel";
-import { RecipientSelection } from "./common/RecipientSelection";
-
-import { ArrowDown, Loader2 } from "lucide-react";
-import { PanelOnramp } from "./common/PanelOnramp";
-
-const SLIPPAGE_PERCENT = 3;
+import { AnySpendCustomExactIn } from "./AnySpendCustomExactIn";
 
 export const HYPE_TOKEN_DETAILS = {
   SYMBOL: "HYPE",
@@ -47,17 +26,7 @@ export interface AnySpendDepositHypeProps {
   preferEoa?: boolean;
 }
 
-export function AnySpendDepositHype(props: AnySpendDepositHypeProps) {
-  const fingerprintConfig = getFingerprintConfig();
-
-  return (
-    <AnySpendFingerprintWrapper fingerprint={fingerprintConfig}>
-      <AnySpendDepositHypeInner {...props} />
-    </AnySpendFingerprintWrapper>
-  );
-}
-
-function AnySpendDepositHypeInner({
+export function AnySpendDepositHype({
   loadOrder,
   mode = "modal",
   recipientAddress,
@@ -70,503 +39,46 @@ function AnySpendDepositHypeInner({
   customUsdInputValues,
   preferEoa,
 }: AnySpendDepositHypeProps) {
-  // Use shared flow hook
-  const {
-    activePanel,
-    setActivePanel,
-    orderId,
-    setOrderId,
-    oat,
-    selectedSrcChainId,
-    setSelectedSrcChainId,
-    selectedSrcToken,
-    setSelectedSrcToken,
-    srcAmount,
-    setSrcAmount,
-    dstAmount,
-    isSrcInputDirty,
-    setIsSrcInputDirty,
-    selectedCryptoPaymentMethod,
-    setSelectedCryptoPaymentMethod,
-    selectedFiatPaymentMethod,
-    setSelectedFiatPaymentMethod,
-    selectedRecipientAddress,
-    setSelectedRecipientAddress,
-    recipientName,
-    globalAddress,
-    anyspendQuote,
-    isLoadingAnyspendQuote,
-    activeInputAmountInWei,
-    geoData,
-    coinbaseAvailablePaymentMethods,
-    stripeWeb2Support,
-    createOrder,
-    isCreatingOrder,
-    createOnrampOrder,
-    isCreatingOnrampOrder,
-  } = useAnyspendFlow({
-    paymentType,
-    recipientAddress,
-    loadOrder,
-    isDepositMode: true,
-    onTransactionSuccess: onSuccess,
-    sourceTokenAddress,
-    sourceTokenChainId,
-    slippage: SLIPPAGE_PERCENT,
-    disableUrlParamManagement: true,
-  });
-
-  const { connectedEOAWallet: connectedEOAWallet } = useAccountWallet();
-  const setActiveWallet = useSetActiveWallet();
-  const appliedPreferEoa = useRef(false);
-
-  useEffect(() => {
-    if (preferEoa && !appliedPreferEoa.current) {
-      if (connectedEOAWallet) {
-        appliedPreferEoa.current = true;
-        setActiveWallet(connectedEOAWallet);
-      }
-    }
-  }, [preferEoa, connectedEOAWallet, setActiveWallet]);
-
-  // Button state logic
-  const btnInfo: { text: string; disable: boolean; error: boolean; loading: boolean } = useMemo(() => {
-    if (activeInputAmountInWei === "0") return { text: "Enter an amount", disable: true, error: false, loading: false };
-    if (isLoadingAnyspendQuote) return { text: "Loading quote...", disable: true, error: false, loading: true };
-    if (isCreatingOrder || isCreatingOnrampOrder)
-      return { text: "Creating order...", disable: true, error: false, loading: true };
-    if (!selectedRecipientAddress) return { text: "Select recipient", disable: false, error: false, loading: false };
-    if (!anyspendQuote || !anyspendQuote.success)
-      return { text: "Get quote error", disable: true, error: true, loading: false };
-    if (!dstAmount) return { text: "No quote available", disable: true, error: true, loading: false };
-
-    // Check minimum deposit amount (10 HYPE)
-    // Use the raw amount from the quote instead of the formatted display string
-    if (anyspendQuote.data?.currencyOut?.amount && anyspendQuote.data.currencyOut.currency?.decimals) {
-      const rawAmountInWei = anyspendQuote.data.currencyOut.amount;
-      const decimals = anyspendQuote.data.currencyOut.currency.decimals;
-      const actualAmount = parseFloat(rawAmountInWei) / Math.pow(10, decimals);
-
-      if (actualAmount < 10) {
-        return { text: "Minimum 10 HYPE deposit", disable: true, error: true, loading: false };
-      }
-    }
-
-    if (paymentType === "crypto") {
-      if (selectedCryptoPaymentMethod === CryptoPaymentMethodType.NONE) {
-        return { text: "Choose payment method", disable: false, error: false, loading: false };
-      }
-      return { text: "Continue to deposit", disable: false, error: false, loading: false };
-    }
-
-    if (paymentType === "fiat") {
-      if (selectedFiatPaymentMethod === FiatPaymentMethod.NONE) {
-        return { text: "Select payment method", disable: false, error: false, loading: false };
-      }
-      return { text: "Buy", disable: false, error: false, loading: false };
-    }
-
-    return { text: "Continue to deposit", disable: false, error: false, loading: false };
-  }, [
-    activeInputAmountInWei,
-    isLoadingAnyspendQuote,
-    isCreatingOrder,
-    isCreatingOnrampOrder,
-    selectedRecipientAddress,
-    anyspendQuote,
-    dstAmount,
-    paymentType,
-    selectedCryptoPaymentMethod,
-    selectedFiatPaymentMethod,
-  ]);
-
-  const onMainButtonClick = async () => {
-    if (btnInfo.disable) return;
-
-    if (!selectedRecipientAddress) {
-      setActivePanel(PanelView.RECIPIENT_SELECTION);
-      return;
-    }
-
-    if (paymentType === "crypto") {
-      if (selectedCryptoPaymentMethod === CryptoPaymentMethodType.NONE) {
-        setActivePanel(PanelView.CRYPTO_PAYMENT_METHOD);
-        return;
-      }
-      await handleCryptoOrder();
-    } else if (paymentType === "fiat") {
-      if (selectedFiatPaymentMethod === FiatPaymentMethod.NONE) {
-        setActivePanel(PanelView.FIAT_PAYMENT_METHOD);
-        return;
-      }
-      await handleFiatOrder();
-    }
-  };
-
-  const mainView = (
-    <div className="mx-auto flex w-[460px] max-w-full flex-col items-center gap-2">
-      {/* Header */}
-      <div className="mb-4 flex flex-col items-center gap-3 text-center">
-        <div>
-          <h1 className="text-as-primary text-xl font-bold">
-            {paymentType === "crypto" ? "Deposit Crypto" : "Fund with Fiat"}
-          </h1>
-        </div>
-      </div>
-
-      <div className="relative flex w-full max-w-[calc(100vw-32px)] flex-col gap-2">
-        <div className="relative flex w-full max-w-[calc(100vw-32px)] flex-col gap-2">
-          {/* Send section */}
-          {paymentType === "crypto" ? (
-            <CryptoPaySection
-              selectedSrcChainId={selectedSrcChainId}
-              setSelectedSrcChainId={setSelectedSrcChainId}
-              selectedSrcToken={selectedSrcToken}
-              setSelectedSrcToken={setSelectedSrcToken}
-              srcAmount={srcAmount}
-              setSrcAmount={setSrcAmount}
-              isSrcInputDirty={isSrcInputDirty}
-              setIsSrcInputDirty={setIsSrcInputDirty}
-              selectedCryptoPaymentMethod={selectedCryptoPaymentMethod}
-              onSelectCryptoPaymentMethod={() => setActivePanel(PanelView.CRYPTO_PAYMENT_METHOD)}
-              anyspendQuote={anyspendQuote}
-              onTokenSelect={onTokenSelect}
-            />
-          ) : (
-            <motion.div
-              initial={{ opacity: 0, y: 20, filter: "blur(10px)" }}
-              animate={{ opacity: 1, y: 0, filter: "blur(0px)" }}
-              transition={{ duration: 0.3, delay: 0, ease: "easeInOut" }}
-            >
-              <PanelOnramp
-                srcAmountOnRamp={srcAmount}
-                setSrcAmountOnRamp={setSrcAmount}
-                selectedPaymentMethod={selectedFiatPaymentMethod}
-                setActivePanel={setActivePanel}
-                _recipientAddress={recipientAddress}
-                destinationToken={B3_TOKEN}
-                destinationChainId={base.id}
-                dstTokenSymbol={HYPE_TOKEN_DETAILS.SYMBOL}
-                hideDstToken
-                destinationAmount={dstAmount}
-                onDestinationTokenChange={() => {}}
-                onDestinationChainChange={() => {}}
-                fiatPaymentMethodIndex={PanelView.FIAT_PAYMENT_METHOD}
-                recipientSelectionPanelIndex={PanelView.RECIPIENT_SELECTION}
-                anyspendQuote={anyspendQuote}
-                onShowPointsDetail={() => setActivePanel(PanelView.POINTS_DETAIL)}
-                onShowFeeDetail={() => setActivePanel(PanelView.FEE_DETAIL)}
-                customUsdInputValues={customUsdInputValues}
-              />
-            </motion.div>
-          )}
-
-          {/* Reverse swap direction section */}
-          <div
-            className={cn("relative -my-1 flex h-0 items-center justify-center", paymentType === "fiat" && "hidden")}
-          >
-            <Button
-              variant="ghost"
-              className={cn(
-                "swap-direction-button border-as-stroke bg-as-surface-primary z-10 h-10 w-10 cursor-default rounded-xl border-2 sm:h-8 sm:w-8 sm:rounded-xl",
-              )}
-            >
-              <div className="relative flex items-center justify-center transition-opacity">
-                <ArrowDown className="text-as-primary/50 h-5 w-5" />
-              </div>
-            </Button>
-          </div>
-
-          {/* Receive section - Hidden when fiat tab is active */}
-          {paymentType === "crypto" && (
-            <CryptoReceiveSection
-              isDepositMode={false}
-              isBuyMode={true}
-              selectedRecipientAddress={selectedRecipientAddress}
-              recipientName={recipientName || undefined}
-              onSelectRecipient={() => setActivePanel(PanelView.RECIPIENT_SELECTION)}
-              setRecipientAddress={setSelectedRecipientAddress}
-              recipientAddressFromProps={recipientAddress}
-              globalAddress={globalAddress}
-              dstAmount={dstAmount}
-              dstToken={B3_TOKEN}
-              dstTokenSymbol={HYPE_TOKEN_DETAILS.SYMBOL}
-              dstTokenLogoURI={HYPE_TOKEN_DETAILS.LOGO_URI}
-              selectedDstChainId={base.id}
-              setSelectedDstChainId={() => {}}
-              setSelectedDstToken={() => {}}
-              isSrcInputDirty={isSrcInputDirty}
-              onChangeDstAmount={value => {
-                setIsSrcInputDirty(false);
-                setSrcAmount(value);
-              }}
-              anyspendQuote={anyspendQuote}
-              onShowPointsDetail={() => setActivePanel(PanelView.POINTS_DETAIL)}
-              onShowFeeDetail={() => setActivePanel(PanelView.FEE_DETAIL)}
-              selectedCryptoPaymentMethod={selectedCryptoPaymentMethod}
-            />
-          )}
-        </div>
+  if (!recipientAddress) return null;
+
+  const header = () => (
+    <div className="mb-4 flex flex-col items-center gap-3 text-center">
+      <div>
+        <h1 className="text-as-primary text-xl font-bold">
+          {paymentType === "crypto" ? "Deposit Crypto" : "Fund with Fiat"}
+        </h1>
       </div>
-
-      {/* Main button section */}
-      <motion.div
-        initial={{ opacity: 0, y: 20, filter: "blur(10px)" }}
-        animate={{ opacity: 1, y: 0, filter: "blur(0px)" }}
-        transition={{ duration: 0.3, delay: 0.2, ease: "easeInOut" }}
-        className={cn("mt-4 flex w-full max-w-[460px] flex-col gap-2")}
-      >
-        <ShinyButton
-          accentColor={"hsl(var(--as-brand))"}
-          disabled={btnInfo.disable}
-          onClick={onMainButtonClick}
-          className={cn(
-            "as-main-button relative w-full",
-            btnInfo.error ? "!bg-as-red" : btnInfo.disable ? "!bg-as-on-surface-2" : "!bg-as-brand",
-          )}
-          textClassName={cn(btnInfo.error ? "text-white" : btnInfo.disable ? "text-as-secondary" : "text-white")}
-        >
-          <div className="flex items-center justify-center gap-2">
-            {btnInfo.loading && <Loader2 className="h-4 w-4 animate-spin" />}
-            {btnInfo.text}
-          </div>
-        </ShinyButton>
-      </motion.div>
-
-      {mainFooter ? mainFooter : null}
     </div>
   );
 
-  // Handle crypto order creation
-  const handleCryptoOrder = async () => {
-    try {
-      invariant(anyspendQuote, "Relay price is not found");
-      invariant(selectedRecipientAddress, "Recipient address is not found");
-
-      const srcAmountBigInt = BigInt(activeInputAmountInWei);
-      createOrder({
-        recipientAddress: selectedRecipientAddress,
-        orderType: "hype_duel",
-        srcChain: selectedSrcChainId,
-        dstChain: base.id,
-        srcToken: selectedSrcToken,
-        dstToken: B3_TOKEN,
-        srcAmount: srcAmountBigInt.toString(),
-        expectedDstAmount: anyspendQuote?.data?.currencyOut?.amount?.toString() || "0",
-        creatorAddress: globalAddress,
-      });
-    } catch (err: any) {
-      console.error(err);
-      toast.error("Failed to create order: " + err.message);
-    }
-  };
-
-  // Handle fiat order creation
-  const handleFiatOrder = async () => {
-    try {
-      invariant(anyspendQuote, "Relay price is not found");
-      invariant(selectedRecipientAddress, "Recipient address is not found");
-
-      if (!srcAmount || parseFloat(srcAmount) <= 0) {
-        toast.error("Please enter a valid amount");
-        return;
-      }
-
-      // Determine vendor and payment method string
-      let vendor: "coinbase" | "stripe" | "stripe-web2";
-      let paymentMethodString = "";
-
-      if (selectedFiatPaymentMethod === FiatPaymentMethod.COINBASE_PAY) {
-        if (coinbaseAvailablePaymentMethods.length === 0) {
-          toast.error("Coinbase Pay not available");
-          return;
-        }
-        vendor = "coinbase";
-        paymentMethodString = coinbaseAvailablePaymentMethods[0]?.id || "";
-      } else if (selectedFiatPaymentMethod === FiatPaymentMethod.STRIPE) {
-        if (!stripeWeb2Support || !stripeWeb2Support.isSupport) {
-          toast.error("Stripe not available");
-          return;
-        }
-        vendor = "stripe-web2";
-        paymentMethodString = "";
-      } else {
-        toast.error("Please select a payment method");
-        return;
-      }
-
-      createOnrampOrder({
-        recipientAddress: selectedRecipientAddress,
-        orderType: "hype_duel",
-        dstChain: base.id,
-        dstToken: B3_TOKEN,
-        srcFiatAmount: srcAmount,
-        onramp: {
-          vendor: vendor,
-          paymentMethod: paymentMethodString,
-          country: geoData?.country || "US",
-          redirectUrl: window.location.origin,
-        },
-        expectedDstAmount: anyspendQuote?.data?.currencyOut?.amount?.toString() || "0",
-        creatorAddress: globalAddress,
-      });
-    } catch (err: any) {
-      console.error(err);
-      toast.error("Failed to create order: " + err.message);
-    }
+  // Create a modified B3_TOKEN with HYPE branding
+  const hypeToken: components["schemas"]["Token"] = {
+    ...B3_TOKEN,
+    symbol: HYPE_TOKEN_DETAILS.SYMBOL,
+    metadata: {
+      ...B3_TOKEN.metadata,
+      logoURI: HYPE_TOKEN_DETAILS.LOGO_URI,
+    },
   };
 
-  // Order details view
-  const orderDetailsView = (
-    <div className={"mx-auto w-[460px] max-w-full"}>
-      <div className="relative flex flex-col gap-4">
-        {oat && (
-          <OrderDetails
-            mode={mode}
-            order={oat.data.order}
-            depositTxs={oat.data.depositTxs}
-            relayTxs={oat.data.relayTxs}
-            executeTx={oat.data.executeTx}
-            refundTxs={oat.data.refundTxs}
-            cryptoPaymentMethod={paymentType === "fiat" ? CryptoPaymentMethodType.NONE : selectedCryptoPaymentMethod}
-            selectedCryptoPaymentMethod={selectedCryptoPaymentMethod}
-            onPaymentMethodChange={setSelectedCryptoPaymentMethod}
-            onBack={() => {
-              setOrderId(undefined);
-              setActivePanel(PanelView.MAIN);
-            }}
-            disableUrlParamManagement
-            points={oat.data.points || undefined}
-          />
-        )}
-      </div>
-    </div>
-  );
-
-  // Loading view
-  const loadingView = (
-    <div className="mx-auto flex w-full flex-col items-center gap-4 p-5">
-      <div className="text-as-primary">Loading order details...</div>
-    </div>
-  );
-
-  // Panel views
-  const recipientSelectionView = (
-    <RecipientSelection
-      initialValue={selectedRecipientAddress || ""}
-      onBack={() => setActivePanel(PanelView.MAIN)}
-      onConfirm={address => {
-        setSelectedRecipientAddress(address);
-        setActivePanel(PanelView.MAIN);
-      }}
-    />
-  );
-
-  const cryptoPaymentMethodView = (
-    <CryptoPaymentMethod
-      selectedPaymentMethod={selectedCryptoPaymentMethod}
-      setSelectedPaymentMethod={setSelectedCryptoPaymentMethod}
-      isCreatingOrder={isCreatingOrder}
-      onBack={() => setActivePanel(PanelView.MAIN)}
-      onSelectPaymentMethod={(method: CryptoPaymentMethodType) => {
-        setSelectedCryptoPaymentMethod(method);
-        setActivePanel(PanelView.MAIN);
-      }}
-    />
-  );
-
-  const fiatPaymentMethodView = (
-    <FiatPaymentMethodComponent
-      selectedPaymentMethod={selectedFiatPaymentMethod}
-      setSelectedPaymentMethod={setSelectedFiatPaymentMethod}
-      onBack={() => setActivePanel(PanelView.MAIN)}
-      onSelectPaymentMethod={(method: FiatPaymentMethod) => {
-        setSelectedFiatPaymentMethod(method);
-        setActivePanel(PanelView.MAIN);
-      }}
-      srcAmountOnRamp={srcAmount}
-    />
-  );
-
-  const pointsDetailView = (
-    <PointsDetailPanel
-      pointsAmount={anyspendQuote?.data?.pointsAmount || 0}
-      onBack={() => setActivePanel(PanelView.MAIN)}
-    />
-  );
-
-  const feeDetailView = anyspendQuote?.data?.fee ? (
-    <FeeDetailPanel
-      fee={anyspendQuote.data.fee}
-      transactionAmountUsd={
-        paymentType === "fiat"
-          ? parseFloat(srcAmount)
-          : anyspendQuote.data.currencyIn?.amountUsd
-            ? Number(anyspendQuote.data.currencyIn.amountUsd)
-            : undefined
-      }
-      onBack={() => setActivePanel(PanelView.MAIN)}
-    />
-  ) : null;
-
-  // If showing token selection, render with panel transitions
   return (
-    <StyleRoot>
-      <div
-        className={cn(
-          "anyspend-container font-inter mx-auto w-full max-w-[460px]",
-          mode === "page" &&
-            "bg-as-surface-primary border-as-border-secondary overflow-hidden rounded-2xl border shadow-xl",
-        )}
-      >
-        <TransitionPanel
-          activeIndex={
-            orderId
-              ? oat
-                ? PanelView.ORDER_DETAILS
-                : PanelView.LOADING
-              : activePanel === PanelView.ORDER_DETAILS
-                ? PanelView.MAIN
-                : activePanel
-          }
-          className={cn("rounded-2xl", {
-            "mt-0": mode === "modal",
-          })}
-          variants={{
-            enter: { x: 300, opacity: 0 },
-            center: { x: 0, opacity: 1 },
-            exit: { x: -300, opacity: 0 },
-          }}
-          transition={{ type: "spring", stiffness: 300, damping: 30 }}
-        >
-          {[
-            <div key="main-view" className={cn(mode === "page" && "p-6")}>
-              {mainView}
-            </div>,
-            <div key="crypto-payment-method-view" className={cn(mode === "page" && "p-6")}>
-              {cryptoPaymentMethodView}
-            </div>,
-            <div key="fiat-payment-method-view" className={cn(mode === "page" && "p-6")}>
-              {fiatPaymentMethodView}
-            </div>,
-            <div key="recipient-selection-view" className={cn(mode === "page" && "p-6")}>
-              {recipientSelectionView}
-            </div>,
-            <div key="order-details-view" className={cn(mode === "page" && "p-6")}>
-              {orderDetailsView}
-            </div>,
-            <div key="loading-view" className={cn(mode === "page" && "p-6")}>
-              {loadingView}
-            </div>,
-            <div key="points-detail-view" className={cn(mode === "page" && "p-6")}>
-              {pointsDetailView}
-            </div>,
-            <div key="fee-detail-view" className={cn(mode === "page" && "p-6")}>
-              {feeDetailView}
-            </div>,
-          ]}
-        </TransitionPanel>
-      </div>
-    </StyleRoot>
+    <AnySpendCustomExactIn
+      loadOrder={loadOrder}
+      mode={mode}
+      recipientAddress={recipientAddress}
+      paymentType={paymentType}
+      sourceTokenAddress={sourceTokenAddress}
+      sourceTokenChainId={sourceTokenChainId}
+      destinationToken={hypeToken}
+      destinationChainId={base.id}
+      orderType="hype_duel"
+      minDestinationAmount={10}
+      header={header}
+      onSuccess={onSuccess}
+      mainFooter={mainFooter}
+      onTokenSelect={onTokenSelect}
+      customUsdInputValues={customUsdInputValues}
+      preferEoa={preferEoa}
+    />
   );
 }

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

@@ -1,7 +1,6 @@
 "use client";
 
 import { useAccountWallet } from "@b3dotfun/sdk/global-account/react";
-import { useAccountWalletImage } from "@b3dotfun/sdk/global-account/react/hooks/useAccountWallet";
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
 import { shortenAddress } from "@b3dotfun/sdk/shared/utils/formatAddress";
 import { client } from "@b3dotfun/sdk/shared/utils/thirdweb";
@@ -23,6 +22,12 @@ export enum CryptoPaymentMethodType {
 }
 
 interface CryptoPaymentMethodProps {
+  globalAddress?: string;
+  globalWallet?: {
+    meta?: {
+      icon?: string;
+    };
+  };
   selectedPaymentMethod: CryptoPaymentMethodType;
   setSelectedPaymentMethod: (method: CryptoPaymentMethodType) => void;
   isCreatingOrder: boolean;
@@ -37,7 +42,11 @@ export function CryptoPaymentMethod({
   onBack,
   onSelectPaymentMethod,
 }: CryptoPaymentMethodProps) {
-  const { connectedEOAWallet: connectedEOAWallet, connectedSmartWallet: connectedSmartWallet } = useAccountWallet();
+  const {
+    wallet: globalWallet,
+    connectedEOAWallet: connectedEOAWallet,
+    connectedSmartWallet: connectedSmartWallet,
+  } = useAccountWallet();
   const { connector, address } = useAccount();
   const { connect, connectors, isPending } = useConnect();
   const { disconnect } = useDisconnect();
@@ -49,8 +58,6 @@ export function CryptoPaymentMethod({
   const isConnected = !!connectedEOAWallet;
   const globalAddress = connectedSmartWallet?.getAccount()?.address;
 
-  const walletImage = useAccountWalletImage();
-
   // Use custom hook to determine wallet display logic
   const { shouldShowConnectedEOA, shouldShowWagmiWallet } = useConnectedWalletDisplay(selectedPaymentMethod);
 
@@ -185,7 +192,7 @@ export function CryptoPaymentMethod({
   };
 
   return (
-    <div className="crypto-payment-method mx-auto h-fit w-[460px] max-w-full px-5 pb-5 pt-5 sm:px-0 sm:pt-5">
+    <div className="crypto-payment-method mx-auto h-fit w-[460px] max-w-full">
       <div className={cn("relative flex flex-col gap-10")}>
         {/* Header */}
         <button
@@ -334,8 +341,8 @@ export function CryptoPaymentMethod({
                   >
                     <div className="flex items-center justify-between">
                       <div className="flex items-center gap-3">
-                        {walletImage ? (
-                          <img src={walletImage} alt="Global Account" className="h-10 w-10 rounded-full" />
+                        {globalWallet?.meta?.icon ? (
+                          <img src={globalWallet.meta.icon} alt="Global Account" className="h-10 w-10 rounded-full" />
                         ) : (
                           <div className="wallet-icon flex h-10 w-10 items-center justify-center rounded-full bg-purple-100">
                             <Wallet className="h-5 w-5 text-purple-600" />

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

@@ -83,7 +83,7 @@ export function FeeDetailPanel({ fee, transactionAmountUsd, onBack }: FeeDetailP
   const [showAllDiscountTiers, setShowAllDiscountTiers] = useState(false);
 
   return (
-    <div className="mx-auto flex w-[460px] max-w-full flex-col items-center gap-3 px-5">
+    <div className="mx-auto flex w-[460px] max-w-full flex-col items-center gap-3">
       <div className="flex w-full flex-col gap-3">
         <div className="text-center">
           <h3 className="text-as-primary text-lg font-bold">Fee Breakdown</h3>

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

@@ -81,7 +81,7 @@ export function FiatPaymentMethodComponent({
   // Show loading state while checking geo availability
   if (isLoadingGeoOnramp) {
     return (
-      <div className="fiat-payment-method mx-auto w-[460px] max-w-full px-5">
+      <div className="fiat-payment-method mx-auto w-[460px] max-w-full">
         <div className="flex flex-col gap-6">
           <div className="flex items-center gap-4">
             <button
@@ -104,7 +104,7 @@ export function FiatPaymentMethodComponent({
   }
 
   return (
-    <div className="fiat-payment-method mx-auto w-[460px] max-w-full px-5">
+    <div className="fiat-payment-method mx-auto w-[460px] max-w-full">
       <div className="flex flex-col gap-6">
         {/* Header */}
         <div className="flex items-center gap-4">