@b3dotfun/sdk 0.0.62 → 0.0.63-alpha.1

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

@@ -0,0 +1,522 @@
+import { ABI_ERC20_STAKING, B3_TOKEN, eqci } from "@b3dotfun/sdk/anyspend";
+import { normalizeAddress } from "@b3dotfun/sdk/anyspend/utils";
+import {
+  Button,
+  GlareCardRounded,
+  Input,
+  StyleRoot,
+  TextLoop,
+  useHasMounted,
+  useModalStore,
+  useSimBalance,
+  useUnifiedChainSwitchAndExecute,
+} from "@b3dotfun/sdk/global-account/react";
+import { PUBLIC_BASE_RPC_URL } from "@b3dotfun/sdk/shared/constants";
+import { formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
+import { ArrowRight, Loader2 } from "lucide-react";
+import { motion } from "motion/react";
+import { useEffect, useState } from "react";
+import { toast } from "sonner";
+import { createPublicClient, encodeFunctionData, erc20Abi, http } from "viem";
+import { base } from "viem/chains";
+import { useAccount, useWaitForTransactionReceipt } from "wagmi";
+import { AnySpendCustomExactIn } from "./AnySpendCustomExactIn";
+import { EthIcon } from "./icons/EthIcon";
+import { SolIcon } from "./icons/SolIcon";
+import { UsdcIcon } from "./icons/USDCIcon";
+
+const basePublicClient = createPublicClient({
+  chain: base,
+  transport: http(PUBLIC_BASE_RPC_URL),
+});
+
+const ERC20Staking = "0xbf04200be3cbf371467a539706393c81c470f523";
+
+const STAKE_FUNCTION_ABI = JSON.stringify([
+  {
+    name: "stake",
+    type: "function",
+    stateMutability: "nonpayable",
+    inputs: [
+      { name: "amount", type: "uint256" },
+      { name: "beneficiary", type: "address" },
+    ],
+    outputs: [],
+  },
+]);
+
+export function AnySpendStakeB3ExactIn({
+  loadOrder,
+  mode = "modal",
+  sourceTokenAddress,
+  sourceTokenChainId,
+  recipientAddress,
+  stakeAmount,
+  onSuccess,
+}: {
+  loadOrder?: string;
+  mode?: "modal" | "page";
+  sourceTokenAddress?: string;
+  sourceTokenChainId?: number;
+  recipientAddress: string;
+  stakeAmount?: string;
+  onSuccess?: (amount: string) => void;
+}) {
+  const hasMounted = useHasMounted();
+  const { setB3ModalOpen } = useModalStore();
+
+  // Wagmi hooks for direct staking
+  const { address } = useAccount();
+  const { switchChainAndExecute, isSwitchingOrExecuting } = useUnifiedChainSwitchAndExecute();
+
+  // Fetch B3 token balance
+  const { data: simBalance, isLoading: isBalanceLoading } = useSimBalance(address, [base.id]);
+  const b3RawBalanceStr = simBalance?.balances.find(b => eqci(b.address, B3_TOKEN.address))?.amount || "0";
+  const b3RawBalance = BigInt(b3RawBalanceStr);
+  const b3Balance = formatTokenAmount(b3RawBalance, B3_TOKEN.decimals);
+
+  // State for direct staking flow
+  const [isStaking, setIsStaking] = useState(false);
+  const [stakingTxHash, setStakingTxHash] = useState<string>("");
+  const [showSuccessModal, setShowSuccessModal] = useState(false);
+
+  // Wait for transaction confirmation
+  const { isLoading: isTxPending, isSuccess: isTxSuccess } = useWaitForTransactionReceipt({
+    hash: stakingTxHash as `0x${string}`,
+    query: {
+      structuralSharing: false, // Disable to avoid BigInt serialization issues
+    },
+  });
+
+  // Show success modal when transaction is confirmed
+  useEffect(() => {
+    if (isTxSuccess && stakingTxHash) {
+      setShowAmountPrompt(false);
+      setShowSuccessModal(true);
+      setIsStaking(false);
+    }
+  }, [isTxSuccess, stakingTxHash]);
+
+  const [userStakeAmount, setUserStakeAmount] = useState<string>(stakeAmount || "");
+  const [showAmountPrompt, setShowAmountPrompt] = useState<boolean>(!stakeAmount);
+  const [isAmountValid, setIsAmountValid] = useState<boolean>(!!stakeAmount);
+  const [validationError, setValidationError] = useState<string>("");
+  // Store display amount for UI
+  const [displayAmount, setDisplayAmount] = useState<string>("");
+  // Debounced state for balance checks and messaging
+  const [debouncedAmount, setDebouncedAmount] = useState<string>("");
+  const [debouncedUserStakeAmount, setDebouncedUserStakeAmount] = useState<string>("");
+
+  // Debounce the amount for balance checks
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setDebouncedAmount(displayAmount);
+      setDebouncedUserStakeAmount(userStakeAmount);
+    }, 500);
+
+    return () => clearTimeout(timer);
+  }, [displayAmount, userStakeAmount]);
+
+  useEffect(() => {
+    if (stakeAmount) {
+      setUserStakeAmount(stakeAmount);
+      setShowAmountPrompt(false);
+      setIsAmountValid(true);
+    }
+  }, [stakeAmount]);
+
+  if (!recipientAddress) return null;
+
+  const validateAndSetAmount = (value: string) => {
+    // Allow decimal input by validating against a pattern
+    // This regex allows numbers with up to 18 decimal places
+    const isValidFormat = /^(\d+\.?\d{0,18}|\.\d{1,18})$/.test(value) || value === "";
+
+    if (!isValidFormat && value !== "") {
+      return;
+    }
+
+    setDisplayAmount(value);
+
+    try {
+      if (value === "" || value === ".") {
+        setUserStakeAmount("");
+        setIsAmountValid(false);
+        setValidationError("");
+        return;
+      }
+
+      // For UI validation - check if it's a positive number
+      const numValue = parseFloat(value);
+      if (isNaN(numValue) || numValue <= 0) {
+        setIsAmountValid(false);
+        setUserStakeAmount("");
+        setValidationError("Please enter a valid positive number");
+        return;
+      }
+
+      // Check minimum stake amount (50 B3)
+      if (numValue < 50) {
+        setIsAmountValid(false);
+        setUserStakeAmount("");
+        setValidationError("Minimum stake amount is 50 B3");
+        return;
+      }
+
+      // Convert to wei (multiply by 10^18)
+      // Handle decimal places correctly by removing the decimal point
+      let fullAmount;
+      if (value.includes(".")) {
+        const [whole, fraction = ""] = value.split(".");
+        // Pad with zeros to 18 decimal places
+        const paddedFraction = fraction.padEnd(18, "0");
+        fullAmount = whole + paddedFraction;
+      } else {
+        fullAmount = value + "000000000000000000"; // Add 18 zeros
+      }
+
+      // Remove leading zeros
+      fullAmount = fullAmount.replace(/^0+/, "") || "0";
+
+      // Set the full amount for the actual transaction
+      setUserStakeAmount(fullAmount);
+      setIsAmountValid(true);
+      setValidationError("");
+    } catch (error) {
+      setIsAmountValid(false);
+      setUserStakeAmount("");
+      setValidationError("Please enter a valid amount");
+    }
+  };
+
+  const handleDirectStaking = async () => {
+    if (!address || !basePublicClient || !userStakeAmount) return;
+
+    try {
+      setIsStaking(true);
+
+      // Check current allowance
+      const allowance = await basePublicClient.readContract({
+        address: B3_TOKEN.address as `0x${string}`,
+        abi: erc20Abi,
+        functionName: "allowance",
+        args: [address, ERC20Staking as `0x${string}`],
+      });
+
+      // If allowance is insufficient, request approval first
+      if (allowance < BigInt(userStakeAmount)) {
+        toast.info("Approving B3 spending...");
+
+        const approvalData = encodeFunctionData({
+          abi: erc20Abi,
+          functionName: "approve",
+          args: [ERC20Staking as `0x${string}`, BigInt(userStakeAmount)],
+        });
+
+        const approvalHash = await switchChainAndExecute(base.id, {
+          to: B3_TOKEN.address as `0x${string}`,
+          data: approvalData,
+          value: BigInt(0),
+        });
+
+        if (!approvalHash) {
+          toast.error("Approval failed. Please try again.");
+          return;
+        }
+
+        const approvalReceipt = await basePublicClient.waitForTransactionReceipt({
+          hash: approvalHash as `0x${string}`,
+          confirmations: 1,
+        });
+
+        if (approvalReceipt?.status !== "success") {
+          toast.error("Approval failed. Please try again.");
+          return;
+        }
+      }
+
+      // Execute the stake
+      toast.info("Staking B3...");
+
+      const stakeData = encodeFunctionData({
+        abi: ABI_ERC20_STAKING,
+        functionName: "stake",
+        args: [BigInt(userStakeAmount), recipientAddress as `0x${string}`],
+      });
+
+      const stakeHash = await switchChainAndExecute(base.id, {
+        to: ERC20Staking as `0x${string}`,
+        data: stakeData,
+        value: BigInt(0),
+      });
+
+      if (stakeHash) {
+        setStakingTxHash(stakeHash);
+        toast.success("Staking transaction submitted!");
+      }
+    } catch (error) {
+      console.error("@@b3-stake-custom-exact-in:error:", error);
+      toast.error("Staking failed. Please try again.");
+      setShowSuccessModal(false); // Ensure modal doesn't show on error
+    } finally {
+      setIsStaking(false);
+    }
+  };
+
+  const confirmAmount = () => {
+    if (!isAmountValid) {
+      toast.error("Please enter a valid amount to stake");
+      return;
+    }
+
+    // Check if user has sufficient B3 balance for direct staking
+    const hasEnoughBalance = b3RawBalance && BigInt(userStakeAmount) <= b3RawBalance;
+
+    if (hasEnoughBalance) {
+      // User has enough B3, proceed with direct staking
+      handleDirectStaking();
+    } else {
+      // User needs more B3, proceed to AnySpend conversion flow
+      setShowAmountPrompt(false);
+    }
+  };
+
+  const header = () => (
+    <>
+      <div className="relative mx-auto size-32">
+        <img alt="b3 coin" className="size-full" src="https://cdn.b3.fun/b3-coin-3d.png" />
+      </div>
+      <div className="from-b3-react-background to-as-on-surface-1 mt-[-60px] w-full rounded-t-lg bg-gradient-to-t">
+        <div className="h-[60px] w-full" />
+        <div className="mb-1 flex w-full flex-col items-center gap-2 p-5">
+          <span className="font-sf-rounded text-2xl font-semibold">
+            Swap & Stake {userStakeAmount ? formatTokenAmount(BigInt(userStakeAmount), 18) : ""} B3 (Exact In)
+          </span>
+        </div>
+      </div>
+    </>
+  );
+
+  const onFocusStakeAmountInput = () => {
+    window.scrollTo(0, 0);
+    document.body.scrollTop = 0;
+  };
+
+  const customExactInConfig = {
+    functionAbi: STAKE_FUNCTION_ABI,
+    functionName: "stake",
+    functionArgs: ["{{amount_out}}", normalizeAddress(recipientAddress)],
+    to: ERC20Staking,
+    spenderAddress: ERC20Staking,
+    action: "stake B3",
+  };
+
+  // Render amount input prompt if no stake amount is provided
+  if (showAmountPrompt) {
+    return (
+      <StyleRoot>
+        <div className="bg-b3-react-background flex w-full flex-col items-center">
+          <div className="w-full px-4">
+            <motion.div
+              initial={false}
+              animate={{
+                opacity: hasMounted ? 1 : 0,
+                y: hasMounted ? 0 : 20,
+                filter: hasMounted ? "blur(0px)" : "blur(10px)",
+              }}
+              transition={{ duration: 0.3, delay: 0, ease: "easeInOut" }}
+              className="relative mx-auto size-48"
+            >
+              <video autoPlay muted playsInline className="size-full" src="https://cdn.b3.fun/b3-sphere-to-coin.mp4" />
+            </motion.div>
+            <motion.div
+              initial={false}
+              animate={{
+                opacity: hasMounted ? 1 : 0,
+                y: hasMounted ? 0 : 20,
+                filter: hasMounted ? "blur(0px)" : "blur(10px)",
+              }}
+              transition={{ duration: 0.3, delay: 0.1, ease: "easeInOut" }}
+            >
+              <h2 className="font-sf-rounded font-neue-montreal-medium mb-1 text-center text-2xl font-semibold">
+                {(() => {
+                  const hasEnoughBalance = b3RawBalance && BigInt(debouncedUserStakeAmount || "0") <= b3RawBalance;
+                  return hasEnoughBalance || !debouncedAmount ? "Stake B3" : "Swap & Stake B3";
+                })()}
+              </h2>
+            </motion.div>
+          </div>
+
+          <motion.div
+            initial={false}
+            animate={{
+              opacity: hasMounted ? 1 : 0,
+              y: hasMounted ? 0 : 20,
+              filter: hasMounted ? "blur(0px)" : "blur(10px)",
+            }}
+            transition={{ duration: 0.3, delay: 0.2, ease: "easeInOut" }}
+            className="bg-b3-react-background w-full p-6"
+          >
+            <div className="mb-2">
+              <div className="flex items-center justify-between">
+                <p className="text-as-primary/70 text-sm font-medium">I want to stake</p>
+                <span className="text-as-primary/50 flex items-center gap-1 text-sm">
+                  Available: {isBalanceLoading ? <Loader2 className="h-3 w-3 animate-spin" /> : `${b3Balance} B3`}
+                </span>
+              </div>
+            </div>
+
+            <div className="relative">
+              <Input
+                onFocus={onFocusStakeAmountInput}
+                type="text"
+                placeholder="0.00"
+                value={displayAmount}
+                onChange={e => validateAndSetAmount(e.target.value)}
+                className={`h-14 px-4 text-lg ${!isAmountValid && displayAmount ? "border-as-red" : "border-b3-react-border"}`}
+              />
+              <div className="font-pack absolute right-4 top-1/2 -translate-y-1/2 text-lg font-medium text-blue-500/70">
+                B3
+              </div>
+            </div>
+
+            {!isAmountValid && displayAmount && <p className="text-as-red mt-2 text-sm">{validationError}</p>}
+
+            <div className="mt-4">
+              {(() => {
+                const hasEnoughBalance = b3RawBalance && BigInt(debouncedUserStakeAmount || "0") <= b3RawBalance;
+
+                if (!hasEnoughBalance || !debouncedAmount) {
+                  return (
+                    <div className="bg-as-brand/10 flex flex-col items-center gap-2 rounded-lg p-4 pb-5">
+                      <div className="flex items-center justify-center gap-2">
+                        <span className="text-as-primary text-sm font-semibold">Swap & stake from any token</span>
+                        <TextLoop>
+                          <EthIcon className="h-8 w-8" />
+                          <SolIcon className="h-8 w-8" />
+                          <UsdcIcon className="h-8 w-8" />
+                        </TextLoop>
+                        <ArrowRight className="text-as-primary h-4 w-4" />
+                        <img src="https://cdn.b3.fun/b3-coin-3d.png" className="h-7 w-7" alt="B3 Token" />
+                      </div>
+                      <p className="text-as-primary/50 text-sm font-medium">
+                        {debouncedAmount
+                          ? `No problem, we'll help you swap to ${debouncedAmount} B3!`
+                          : "Not enough B3? We'll help you swap from other coins."}
+                      </p>
+                    </div>
+                  );
+                }
+              })()}
+            </div>
+
+            <Button
+              onClick={confirmAmount}
+              disabled={!isAmountValid || !displayAmount || isStaking || isTxPending || isSwitchingOrExecuting}
+              className="bg-as-brand hover:bg-as-brand/90 text-as-primary mt-4 h-14 w-full rounded-xl text-lg font-medium"
+            >
+              {isStaking || isSwitchingOrExecuting ? "Staking..." : isTxPending ? "Confirming..." : "Continue"}
+            </Button>
+          </motion.div>
+        </div>
+      </StyleRoot>
+    );
+  }
+
+  // Success Modal for Direct Staking
+  if (showSuccessModal) {
+    return (
+      <StyleRoot>
+        <div className="bg-b3-react-background flex w-full flex-col items-center">
+          <div className="w-full p-4">
+            <motion.div
+              initial={false}
+              animate={{
+                opacity: hasMounted ? 1 : 0,
+                y: hasMounted ? 0 : 20,
+                filter: hasMounted ? "blur(0px)" : "blur(10px)",
+              }}
+              transition={{ duration: 0.3, delay: 0, ease: "easeInOut" }}
+              className="relative mx-auto mb-4 size-[120px]"
+            >
+              <div className="absolute inset-0 scale-95 rounded-[50%] bg-black/30 blur-md"></div>
+              <GlareCardRounded className="overflow-hidden rounded-full border-none">
+                <img
+                  alt="b3 coin"
+                  loading="lazy"
+                  width="64"
+                  height="64"
+                  decoding="async"
+                  data-nimg="1"
+                  className="size-full shrink-0 bg-transparent text-transparent"
+                  src="https://cdn.b3.fun/b3-coin-3d.png"
+                />
+                <div className="absolute inset-0 rounded-[50%] border border-white/10"></div>
+              </GlareCardRounded>
+            </motion.div>
+            <motion.div
+              initial={false}
+              animate={{
+                opacity: hasMounted ? 1 : 0,
+                y: hasMounted ? 0 : 20,
+                filter: hasMounted ? "blur(0px)" : "blur(10px)",
+              }}
+              transition={{ duration: 0.3, delay: 0.1, ease: "easeInOut" }}
+            >
+              <h2 className="font-sf-rounded mb-1 text-center text-2xl font-semibold">
+                Staked {formatTokenAmount(BigInt(userStakeAmount), 18)} B3
+              </h2>
+            </motion.div>
+          </div>
+
+          <motion.div
+            initial={false}
+            animate={{
+              opacity: hasMounted ? 1 : 0,
+              y: hasMounted ? 0 : 20,
+              filter: hasMounted ? "blur(0px)" : "blur(10px)",
+            }}
+            transition={{ duration: 0.3, delay: 0.2, ease: "easeInOut" }}
+            className="bg-b3-react-background w-full p-6"
+          >
+            <div className="mb-6">
+              <a
+                href={`https://basescan.org/tx/${stakingTxHash}`}
+                target="_blank"
+                rel="noopener noreferrer"
+                className="text-as-primary/70 hover:text-as-primary block break-all text-center font-mono text-sm underline transition-colors"
+              >
+                View transaction
+              </a>
+            </div>
+
+            <Button
+              onClick={() => {
+                setB3ModalOpen(false);
+                onSuccess?.(formatTokenAmount(BigInt(userStakeAmount), 18) ?? "");
+              }}
+              className="bg-as-brand hover:bg-as-brand/90 text-as-primary h-14 w-full rounded-xl text-lg font-medium"
+            >
+              Done
+            </Button>
+          </motion.div>
+        </div>
+      </StyleRoot>
+    );
+  }
+
+  return (
+    <AnySpendCustomExactIn
+      loadOrder={loadOrder}
+      mode={mode}
+      recipientAddress={recipientAddress}
+      sourceTokenAddress={sourceTokenAddress}
+      sourceTokenChainId={sourceTokenChainId}
+      destinationToken={B3_TOKEN}
+      destinationChainId={base.id}
+      customExactInConfig={customExactInConfig}
+      header={header}
+      onSuccess={onSuccess}
+    />
+  );
+}

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

@@ -0,0 +1,73 @@
+import { components } from "@b3dotfun/sdk/anyspend/types/api";
+import { normalizeAddress } from "@b3dotfun/sdk/anyspend/utils";
+import { base } from "viem/chains";
+import { AnySpendCustomExactIn } from "./AnySpendCustomExactIn";
+
+const STAKE_FOR_FUNCTION_ABI = JSON.stringify([
+  {
+    name: "stakeFor",
+    type: "function",
+    stateMutability: "nonpayable",
+    inputs: [
+      { name: "user", type: "address" },
+      { name: "amount", type: "uint256" },
+    ],
+    outputs: [],
+  },
+]);
+
+export function AnySpendStakeUpsideExactIn({
+  loadOrder,
+  mode = "modal",
+  recipientAddress,
+  sourceTokenAddress,
+  sourceTokenChainId,
+  stakingContractAddress,
+  token,
+  onSuccess,
+}: {
+  loadOrder?: string;
+  mode?: "modal" | "page";
+  recipientAddress: string;
+  sourceTokenAddress?: string;
+  sourceTokenChainId?: number;
+  stakingContractAddress: string;
+  token: components["schemas"]["Token"];
+  onSuccess?: (amount: string) => void;
+}) {
+  if (!recipientAddress) return null;
+
+  const header = () => (
+    <>
+      <div className="from-b3-react-background to-as-on-surface-1 w-full rounded-t-lg bg-gradient-to-t">
+        <div className="mb-1 flex w-full flex-col items-center gap-2">
+          <span className="font-sf-rounded text-2xl font-semibold">Swap & Stake {token.symbol} (Exact In)</span>
+        </div>
+      </div>
+    </>
+  );
+
+  const customExactInConfig = {
+    functionAbi: STAKE_FOR_FUNCTION_ABI,
+    functionName: "stakeFor",
+    functionArgs: [normalizeAddress(recipientAddress), "{{amount_out}}"],
+    to: stakingContractAddress,
+    spenderAddress: stakingContractAddress,
+    action: `stake ${token.symbol}`,
+  };
+
+  return (
+    <AnySpendCustomExactIn
+      loadOrder={loadOrder}
+      mode={mode}
+      recipientAddress={recipientAddress}
+      sourceTokenAddress={sourceTokenAddress}
+      sourceTokenChainId={sourceTokenChainId}
+      destinationToken={token}
+      destinationChainId={base.id}
+      customExactInConfig={customExactInConfig}
+      header={header}
+      onSuccess={onSuccess}
+    />
+  );
+}

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

@@ -6,6 +6,7 @@ import invariant from "invariant";
 import { motion } from "motion/react";
 import { useEffect, useMemo, useRef } from "react";
 import { toast } from "sonner";
+import { useActiveWallet, useSetActiveWallet } from "thirdweb/react";
 import { base } from "viem/chains";
 import { PanelView, useAnyspendFlow } from "../hooks/useAnyspendFlow";
 import { AnySpendFingerprintWrapper, getFingerprintConfig } from "./AnySpendFingerprintWrapper";
@@ -17,11 +18,10 @@ import { FiatPaymentMethod, FiatPaymentMethodComponent } from "./common/FiatPaym
 import { OrderDetails } from "./common/OrderDetails";
 import { PointsDetailPanel } from "./common/PointsDetailPanel";
 import { RecipientSelection } from "./common/RecipientSelection";
-import { useActiveWallet, useSetActiveWallet } from "thirdweb/react";
 
 import { ArrowDown, Loader2 } from "lucide-react";
-import { PanelOnramp } from "./common/PanelOnramp";
 import { useGlobalWalletState } from "../../utils";
+import { PanelOnramp } from "./common/PanelOnramp";
 
 const SLIPPAGE_PERCENT = 3;
 
@@ -286,9 +286,12 @@ function AnySpendDepositHypeInner({
             <CryptoReceiveSection
               isDepositMode={false}
               isBuyMode={true}
-              selectedRecipientAddress={recipientAddress}
+              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}
@@ -304,6 +307,7 @@ function AnySpendDepositHypeInner({
               anyspendQuote={anyspendQuote}
               onShowPointsDetail={() => setActivePanel(PanelView.POINTS_DETAIL)}
               onShowFeeDetail={() => setActivePanel(PanelView.FEE_DETAIL)}
+              selectedCryptoPaymentMethod={selectedCryptoPaymentMethod}
             />
           )}
         </div>

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

@@ -1,4 +1,4 @@
-import { useAccountWallet, useProfile, useTokenData } from "@b3dotfun/sdk/global-account/react";
+import { useProfile, useTokenData } from "@b3dotfun/sdk/global-account/react";
 import { formatUsername } from "@b3dotfun/sdk/shared/utils";
 import { shortenAddress } from "@b3dotfun/sdk/shared/utils/formatAddress";
 import { formatDisplayNumber } from "@b3dotfun/sdk/shared/utils/number";
@@ -6,6 +6,7 @@ import { ChevronRight, Info } from "lucide-react";
 import { motion } from "motion/react";
 import { useEffect, useRef } from "react";
 import { components } from "../../../types/api";
+import { useConnectedWalletDisplay } from "../../hooks/useConnectedWalletDisplay";
 import { CryptoPaymentMethodType } from "./CryptoPaymentMethod";
 import { OrderTokenAmount } from "./OrderTokenAmount";
 import { TokenBalance } from "./TokenBalance";
@@ -46,14 +47,10 @@ export function CryptoPaySection({
   onTokenSelect,
   onShowFeeDetail,
 }: CryptoPaySectionProps) {
-  const { connectedSmartWallet, connectedEOAWallet } = useAccountWallet();
   const { data: srcTokenMetadata } = useTokenData(selectedSrcToken?.chainId, selectedSrcToken?.address);
 
-  // Determine which address to use based on payment method
-  const walletAddress =
-    selectedCryptoPaymentMethod === CryptoPaymentMethodType.GLOBAL_WALLET
-      ? connectedSmartWallet?.getAccount()?.address
-      : connectedEOAWallet?.getAccount()?.address;
+  // Use custom hook to determine wallet address based on payment method
+  const { walletAddress } = useConnectedWalletDisplay(selectedCryptoPaymentMethod);
 
   const { data: profileData } = useProfile({ address: walletAddress });
   const connectedName = profileData?.displayName;
@@ -137,6 +134,7 @@ export function CryptoPaySection({
       </div>
       <OrderTokenAmount
         address={walletAddress}
+        walletAddress={walletAddress}
         context="from"
         inputValue={srcAmount}
         onChangeInput={value => {