@b3dotfun/sdk 0.0.46 → 0.0.47-test.4

package/dist/types/global-account/react/stores/useModalStore.d.ts

@@ -32,8 +32,6 @@ export interface SignInWithB3ModalProps extends BaseModalProps {
     sessionKeyAddress?: Address;
     /** Unique identifier for the partner application */
     partnerId: string;
-    /** Whether to authenticate with Sign In With Ethereum */
-    loginWithSiwe?: boolean;
     /** Whether to close the modal after successful login */
     closeAfterLogin?: boolean;
     /** Source of the sign-in request */

package/dist/types/shared/react/hooks/__tests__/useCurrencyConversion.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/shared/utils/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./auth-token";
 export * from "./cn";
 export * from "./formatNumber";
 export * from "./formatUsername";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b3dotfun/sdk",
-  "version": "0.0.46",
+  "version": "0.0.47-test.4",
   "source": "src/index.ts",
   "main": "./dist/cjs/index.js",
   "react-native": "./dist/cjs/index.native.js",
@@ -170,26 +170,6 @@
       "import": "./dist/esm/global-account/server.js",
       "require": "./dist/cjs/global-account/server.js"
     },
-    "./notifications": {
-      "types": "./dist/types/notifications/index.d.ts",
-      "import": "./dist/esm/notifications/index.js",
-      "require": "./dist/cjs/notifications/index.js"
-    },
-    "./notifications/react": {
-      "types": "./dist/types/notifications/react/index.d.ts",
-      "import": "./dist/esm/notifications/react/index.js",
-      "require": "./dist/cjs/notifications/react/index.js"
-    },
-    "./notifications/services": {
-      "types": "./dist/types/notifications/services/index.d.ts",
-      "import": "./dist/esm/notifications/services/index.js",
-      "require": "./dist/cjs/notifications/services/index.js"
-    },
-    "./notifications/types": {
-      "types": "./dist/types/notifications/types/index.d.ts",
-      "import": "./dist/esm/notifications/types/index.js",
-      "require": "./dist/cjs/notifications/types/index.js"
-    },
     "./shared/utils": {
       "types": "./dist/types/shared/utils/index.d.ts",
       "import": "./dist/esm/shared/utils/index.js",
@@ -301,7 +281,7 @@
     "@solana/web3.js": "^1.98.2",
     "@stripe/react-stripe-js": "^3.7.0",
     "@stripe/stripe-js": "^7.3.1",
-    "@thirdweb-dev/wagmi-adapter": "^0.2.141",
+    "@thirdweb-dev/wagmi-adapter": "0.2.159",
     "@web3icons/react": "3.16.0",
     "big.js": "^7.0.1",
     "class-variance-authority": "0.7.0",
@@ -374,7 +354,7 @@
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0",
     "react-native-mmkv": "^3.2.0",
-    "thirdweb": "5.106.0",
+    "thirdweb": "5.108.9",
     "three": "^0.175.0",
     "viem": "^2.28.1",
     "wagmi": "^2.14.15"
@@ -410,6 +390,7 @@
     "release:alpha": "pnpm version prerelease --preid alpha && git push --follow-tags && pnpm publish --tag alpha --no-git-checks",
     "typecheck": "tsc --noEmit",
     "generate:thirdweb": "npx @hey-api/openapi-ts --file src/thirdweb/openapi-ts.config.ts --input src/thirdweb/insight-service.json",
+    "generate:anyspend": "npx openapi-typescript https://mainnet.anyspend.com/openapi.json -o src/anyspend/types/api.ts",
     "lint": "eslint 'src/**/*.{ts,tsx}'",
     "lint:fix": "eslint 'src/**/*.{ts,tsx}' --fix",
     "test": "vitest run",

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

@@ -23,7 +23,7 @@ import {
 import { cn } from "@b3dotfun/sdk/shared/utils/cn";
 import { formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
 import invariant from "invariant";
-import { ArrowDown, HistoryIcon } from "lucide-react";
+import { ArrowDown, HistoryIcon, Loader2 } from "lucide-react";
 import { motion } from "motion/react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
@@ -34,7 +34,6 @@ import { AnySpendFingerprintWrapper, getFingerprintConfig } from "./AnySpendFing
 import { CryptoPaymentMethod, CryptoPaymentMethodType } from "./common/CryptoPaymentMethod";
 import { CryptoPaySection } from "./common/CryptoPaySection";
 import { CryptoReceiveSection } from "./common/CryptoReceiveSection";
-import { ErrorSection } from "./common/ErrorSection";
 import { FiatPaymentMethod, FiatPaymentMethodComponent } from "./common/FiatPaymentMethod";
 import { OrderDetails, OrderDetailsLoadingView } from "./common/OrderDetails";
 import { OrderHistory } from "./common/OrderHistory";
@@ -469,7 +468,7 @@ function AnySpendInner({
     ? parseUnits(srcAmount.replace(/,/g, ""), selectedSrcToken.decimals).toString()
     : parseUnits(dstAmount.replace(/,/g, ""), selectedDstToken.decimals).toString();
   const srcAmountOnrampInWei = parseUnits(srcAmountOnRamp.replace(/,/g, ""), USDC_BASE.decimals).toString();
-  const { anyspendQuote, isLoadingAnyspendQuote, getAnyspendQuoteError } = useAnyspendQuote(
+  const { anyspendQuote, isLoadingAnyspendQuote } = useAnyspendQuote(
     activeTab === "crypto"
       ? {
           srcChain: selectedSrcChainId,
@@ -609,40 +608,42 @@ function AnySpendInner({
   });
 
   // Determine button state and text
-  const btnInfo: { text: string; disable: boolean; error: boolean } = useMemo(() => {
-    if (activeInputAmountInWei === "0") return { text: "Enter an amount", disable: true, error: false };
-    if (isLoadingAnyspendQuote) return { text: "Loading...", disable: true, error: false };
-    if (!recipientAddress) return { text: "Select recipient", disable: false, error: false };
-    if (isCreatingOrder || isCreatingOnrampOrder) return { text: "Creating order...", disable: true, error: false };
-    if (!anyspendQuote || !anyspendQuote.success) return { text: "Get rate error", disable: true, error: true };
+  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 (!recipientAddress) return { text: "Select recipient", disable: false, error: false, loading: false };
+    if (isCreatingOrder || isCreatingOnrampOrder)
+      return { text: "Creating order...", disable: true, error: false, loading: true };
+    if (!anyspendQuote || !anyspendQuote.success)
+      return { text: "No quote found", disable: true, error: false, loading: false };
 
     if (activeTab === "crypto") {
       // If no payment method selected, show "Choose payment method"
       if (selectedCryptoPaymentMethod === CryptoPaymentMethodType.NONE) {
-        return { text: "Choose payment method", disable: false, error: false };
+        return { text: "Choose payment method", disable: false, error: false, loading: false };
       }
       // If payment method selected, show appropriate action
       if (
         selectedCryptoPaymentMethod === CryptoPaymentMethodType.CONNECT_WALLET ||
         selectedCryptoPaymentMethod === CryptoPaymentMethodType.GLOBAL_WALLET
       ) {
-        return { text: "Swap", disable: false, error: false };
+        return { text: "Swap", disable: false, error: false, loading: false };
       }
       if (selectedCryptoPaymentMethod === CryptoPaymentMethodType.TRANSFER_CRYPTO) {
-        return { text: "Continue to payment", disable: false, error: false };
+        return { text: "Continue to payment", disable: false, error: false, loading: false };
       }
     }
 
     if (activeTab === "fiat") {
       // If no fiat payment method selected, show "Select payment method"
       if (selectedFiatPaymentMethod === FiatPaymentMethod.NONE) {
-        return { text: "Select payment method", disable: false, error: false };
+        return { text: "Select payment method", disable: false, error: false, loading: false };
       }
       // If payment method is selected, show "Buy"
-      return { text: "Buy", disable: false, error: false };
+      return { text: "Buy", disable: false, error: false, loading: false };
     }
 
-    return { text: "Buy", disable: false, error: false };
+    return { text: "Buy", disable: false, error: false, loading: false };
   }, [
     activeInputAmountInWei,
     isLoadingAnyspendQuote,
@@ -1052,15 +1053,13 @@ function AnySpendInner({
           />
         )}
       </div>
-      {/* Error message section */}
-      <ErrorSection error={getAnyspendQuoteError} />
 
       {/* 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", getAnyspendQuoteError && "mt-0")}
+        className={cn("mt-4 flex w-full max-w-[460px] flex-col gap-2")}
       >
         <ShinyButton
           accentColor={"hsl(var(--as-brand))"}
@@ -1072,7 +1071,10 @@ function AnySpendInner({
           )}
           textClassName={cn(btnInfo.error ? "text-white" : btnInfo.disable ? "text-as-secondary" : "text-white")}
         >
-          {btnInfo.text}
+          <div className="flex items-center justify-center gap-2">
+            {btnInfo.loading && <Loader2 className="h-4 w-4 animate-spin" />}
+            {btnInfo.text}
+          </div>
         </ShinyButton>
 
         {!hideTransactionHistoryButton && (globalAddress || recipientAddress) ? (

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

@@ -12,13 +12,12 @@ import { AnySpendFingerprintWrapper, getFingerprintConfig } from "./AnySpendFing
 import { CryptoPaySection } from "./common/CryptoPaySection";
 import { CryptoPaymentMethod, CryptoPaymentMethodType } from "./common/CryptoPaymentMethod";
 import { CryptoReceiveSection } from "./common/CryptoReceiveSection";
-import { ErrorSection } from "./common/ErrorSection";
 import { FiatPaymentMethod, FiatPaymentMethodComponent } from "./common/FiatPaymentMethod";
 import { OrderDetails } from "./common/OrderDetails";
 import { PointsDetailPanel } from "./common/PointsDetailPanel";
 import { RecipientSelection } from "./common/RecipientSelection";
 
-import { ArrowDown } from "lucide-react";
+import { ArrowDown, Loader2 } from "lucide-react";
 import { PanelOnramp } from "./common/PanelOnramp";
 
 const SLIPPAGE_PERCENT = 3;
@@ -92,7 +91,6 @@ function AnySpendDepositHypeInner({
     globalAddress,
     anyspendQuote,
     isLoadingAnyspendQuote,
-    getAnyspendQuoteError,
     activeInputAmountInWei,
     geoData,
     coinbaseAvailablePaymentMethods,
@@ -114,13 +112,15 @@ function AnySpendDepositHypeInner({
   });
 
   // Button state logic
-  const btnInfo: { text: string; disable: boolean; error: boolean } = useMemo(() => {
-    if (activeInputAmountInWei === "0") return { text: "Enter an amount", disable: true, error: false };
-    if (isLoadingAnyspendQuote) return { text: "Loading quote...", disable: true, error: false };
-    if (isCreatingOrder || isCreatingOnrampOrder) return { text: "Creating order...", disable: true, error: false };
-    if (!selectedRecipientAddress) return { text: "Select recipient", disable: false, error: false };
-    if (!anyspendQuote || !anyspendQuote.success) return { text: "Get quote error", disable: true, error: true };
-    if (!dstAmount) return { text: "No quote available", disable: true, error: true };
+  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
@@ -130,25 +130,25 @@ function AnySpendDepositHypeInner({
       const actualAmount = parseFloat(rawAmountInWei) / Math.pow(10, decimals);
 
       if (actualAmount < 10) {
-        return { text: "Minimum 10 HYPE deposit", disable: true, error: true };
+        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 };
+        return { text: "Choose payment method", disable: false, error: false, loading: false };
       }
-      return { text: "Continue to deposit", disable: false, error: 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 };
+        return { text: "Select payment method", disable: false, error: false, loading: false };
       }
-      return { text: "Buy", disable: false, error: false };
+      return { text: "Buy", disable: false, error: false, loading: false };
     }
 
-    return { text: "Continue to deposit", disable: false, error: false };
+    return { text: "Continue to deposit", disable: false, error: false, loading: false };
   }, [
     activeInputAmountInWei,
     isLoadingAnyspendQuote,
@@ -283,15 +283,12 @@ function AnySpendDepositHypeInner({
         </div>
       </div>
 
-      {/* Error message section */}
-      <ErrorSection error={getAnyspendQuoteError} />
-
       {/* 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", getAnyspendQuoteError && "mt-0")}
+        className={cn("mt-4 flex w-full max-w-[460px] flex-col gap-2")}
       >
         <ShinyButton
           accentColor={"hsl(var(--as-brand))"}
@@ -303,7 +300,10 @@ function AnySpendDepositHypeInner({
           )}
           textClassName={cn(btnInfo.error ? "text-white" : btnInfo.disable ? "text-as-secondary" : "text-white")}
         >
-          {btnInfo.text}
+          <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>
 

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

@@ -17,37 +17,37 @@ export function OrderHistory({ mode, onBack, onSelectOrder }: OrderHistoryProps)
 
   return (
     <>
-      <div className="mb-6 flex w-full items-center gap-4">
-        <Button onClick={onBack} variant="ghost" size="icon">
-          <ArrowLeft className="h-4 w-4" />
+      <div className="mb-8 flex w-full items-center gap-3">
+        <Button onClick={onBack} variant="ghost" size="icon" className="hover:bg-as-surface-secondary">
+          <ArrowLeft className="h-5 w-5" />
         </Button>
         <div className="flex-1">
-          <h3 className="text-xl font-semibold">Order History</h3>
-          <p className="text-as-primary/30 text-sm">View your past transactions</p>
+          <h3 className="text-as-primary text-2xl font-bold">Order History</h3>
         </div>
         <Button
           variant="ghost"
           size="icon"
+          className="hover:bg-as-surface-secondary"
           onClick={() => {
             refetchOrderHistory();
           }}
         >
-          <RefreshCcw className="text-as-primary/30 hover:text-as-primary h-4 w-4 cursor-pointer transition-all hover:rotate-180" />
+          <RefreshCcw className="text-as-secondary hover:text-as-primary h-5 w-5 cursor-pointer transition-all hover:rotate-180" />
         </Button>
       </div>
 
       {isLoadingOrderHistory ? (
-        <div className="w-full space-y-4">
+        <div className="w-full space-y-3">
           {[1, 2, 3].map(i => (
-            <Skeleton key={i} className="h-[160px] w-full rounded-lg" />
+            <Skeleton key={i} className="h-[180px] w-full rounded-2xl" />
           ))}
         </div>
       ) : !orderHistory?.length ? (
-        <div className="bg-as-light-brand w-full rounded-lg border p-8 text-center">
-          <p className="text-b3-react-muted-foreground">No order history found</p>
+        <div className="bg-as-surface-secondary w-full rounded-2xl p-12 text-center">
+          <p className="text-as-secondary text-sm">No order history found</p>
         </div>
       ) : (
-        <div className="mb-12 w-full space-y-4">
+        <div className="mb-12 w-full space-y-3">
           {[...orderHistory]
             .sort((a, b) => b.createdAt - a.createdAt)
             .map(order => (

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

@@ -1,10 +1,10 @@
 import { ALL_CHAINS, getChainName, getStatusDisplay } from "@b3dotfun/sdk/anyspend";
-import { Badge, Button, useIsMobile } from "@b3dotfun/sdk/global-account/react";
+import { Badge, useIsMobile } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils";
 import { formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
-import { ArrowRight, ChevronDown } from "lucide-react";
+import { getVendorDisplayName } from "@b3dotfun/sdk/shared/utils/payment.utils";
+import { ArrowRight } from "lucide-react";
 import TimeAgo from "react-timeago";
-import { b3 } from "viem/chains";
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
 
 interface OrderHistoryItemProps {
@@ -31,153 +31,148 @@ export function OrderHistoryItem({ order, onSelectOrder, mode }: OrderHistoryIte
 
   const isSmallView = useIsMobile() || mode === "modal";
 
+  // Check if this is a one-click payment order
+  const isOneClickPayment = !!order.oneClickBuyUrl;
+  const vendorName = order.onrampMetadata?.vendor ? getVendorDisplayName(order.onrampMetadata.vendor) : null;
+
   return (
     <div
       key={`anyspend-${order.id}`}
       className={cn(
-        "bg-as-light-brand/20 rounded-lg border p-4",
-        onSelectOrder && "hover:bg-as-light-brand/30 hover:border-as-brand cursor-pointer transition-colors",
+        "bg-as-surface-secondary hover:bg-as-surface-tertiary rounded-xl p-4 transition-all",
+        onSelectOrder && "cursor-pointer",
       )}
       onClick={() => onSelectOrder?.(order.id)}
     >
-      <div className="flex items-center justify-between">
-        <Badge
-          className={cn(
-            "px-3 py-1 text-xs",
-            orderDisplayStatus === "processing" && "bg-yellow-500/10 text-yellow-500",
-            orderDisplayStatus === "success" && "bg-green-500/10 text-green-500",
-            orderDisplayStatus === "failure" && "bg-red-500/10 text-red-500",
-          )}
-        >
-          {orderStatusText}
-        </Badge>
-
+      {/* Header: Status and Time */}
+      <div className="mb-3 flex items-center justify-between">
         <div className="flex items-center gap-2">
-          <span className="text-nano label-style text-as-primary/30">
-            <TimeAgo date={new Date(order.createdAt)} />
-          </span>
+          <div
+            className={cn(
+              "text-xs font-semibold",
+              orderDisplayStatus === "processing" && "text-yellow-600",
+              orderDisplayStatus === "success" && "text-green-600",
+              orderDisplayStatus === "failure" && "text-red-600",
+            )}
+          >
+            {orderStatusText}
+          </div>
+          {isOneClickPayment && vendorName && (
+            <Badge variant="outline" className="text-as-secondary px-2 py-0.5 text-[10px]">
+              {vendorName}
+            </Badge>
+          )}
+        </div>
+        <div className="text-as-secondary text-[10px] font-medium uppercase tracking-wide">
+          <TimeAgo date={new Date(order.createdAt)} />
         </div>
       </div>
 
-      {order.oneClickBuyUrl ? (
-        <div className="mb-3 mt-4 flex items-center gap-1">
-          <div className="bg-b3-react-background flex flex-1 flex-col gap-1 rounded-lg border p-4 px-5">
-            <h3 className="text-as-primary/50 flex items-center gap-2 text-xl font-semibold">
-              <span>
-                {"Buy "}
-                <span className="text-as-primary">
-                  ${formatTokenAmount(BigInt(order.srcAmount), order.metadata.srcToken.decimals)}
-                </span>
-                {` of`}
-              </span>
-
-              <span className="text-as-primary flex items-center gap-2">
-                {nft ? (
-                  <img src={nft.imageUrl} alt={nft.name} className="h-6 w-6" />
-                ) : tournament ? (
-                  <img src={tournament.imageUrl} alt={tournament.name} className="h-6 w-6" />
-                ) : (
-                  <img src={dstToken.metadata.logoURI} alt={dstToken.symbol} className="h-6 w-6" />
-                )}
-                {nft ? nft.name : tournament ? tournament.name : dstToken.symbol}
-              </span>
-
-              <span className="flex items-center gap-2">
-                {` on `}
-                <span className="text-as-primary flex items-center gap-2">
-                  <img src={ALL_CHAINS[order.dstChain]?.logoUrl} alt={getChainName(order.dstChain)} className="h-4" />
-                  {order.dstChain !== b3.id && getChainName(order.dstChain)}
-                </span>
-              </span>
-            </h3>
-
-            <p className="label-style text-as-primary/30 mt-1 flex items-center gap-2 text-xs">
-              Paying via{" "}
-              <img src="https://cdn.b3.fun/coinbase-wordmark-blue.svg" alt="Coinbase" className="-mt-1 h-3" />
-            </p>
+      {/* Main Content: From -> To */}
+      <div className={cn("flex items-center", isSmallView ? "gap-2" : "gap-4")}>
+        {/* From Section */}
+        <div className={cn("flex min-w-0 flex-1 items-center", isSmallView ? "gap-1.5" : "gap-2")}>
+          <img
+            src={order.metadata.srcToken.metadata.logoURI}
+            alt={order.metadata.srcToken.symbol}
+            className={cn("shrink-0 rounded-full", isSmallView ? "h-7 w-7" : "h-8 w-8")}
+          />
+          <div className="min-w-0 flex-1">
+            <div className={cn("text-as-primary truncate font-bold", isSmallView ? "text-xs" : "text-sm")}>
+              {formatTokenAmount(BigInt(order.srcAmount), order.metadata.srcToken.decimals)}{" "}
+              {order.metadata.srcToken.symbol}
+            </div>
+            <div className={cn("text-as-secondary flex items-center gap-1", isSmallView ? "text-[10px]" : "text-xs")}>
+              <img src={ALL_CHAINS[order.srcChain]?.logoUrl} alt={getChainName(order.srcChain)} className="h-3 w-3" />
+              <span className="truncate">{getChainName(order.srcChain)}</span>
+            </div>
           </div>
         </div>
-      ) : (
-        <div className={cn("mb-3 mt-4 flex items-center gap-1", isSmallView && "flex-col")}>
-          <div className="bg-b3-react-background flex w-full flex-1 flex-col gap-1 overflow-hidden rounded-lg border p-4 px-5">
-            <div className="flex items-center gap-2">
+
+        {/* Arrow */}
+        <ArrowRight className={cn("text-as-secondary shrink-0 opacity-30", isSmallView ? "h-4 w-4" : "h-5 w-5")} />
+
+        {/* To Section */}
+        <div className={cn("flex min-w-0 flex-1 items-center", isSmallView ? "gap-1.5" : "gap-2")}>
+          {nft ? (
+            <>
               <img
-                src={order.metadata.srcToken.metadata.logoURI}
-                alt={order.metadata.srcToken.symbol}
-                className="h-6 w-6 rounded-full"
+                src={nft.imageUrl}
+                alt={nft.name}
+                className={cn("shrink-0 rounded-full", isSmallView ? "h-7 w-7" : "h-8 w-8")}
               />
-              <div className="text-as-primary flex items-center gap-2 overflow-hidden text-ellipsis whitespace-nowrap text-xl font-semibold">
-                {formatTokenAmount(BigInt(order.srcAmount), order.metadata.srcToken.decimals)}{" "}
-                {order.metadata.srcToken.symbol}
+              <div className="min-w-0 flex-1">
+                <div className={cn("text-as-primary truncate font-bold", isSmallView ? "text-xs" : "text-sm")}>
+                  {nft.name}
+                </div>
+                <div
+                  className={cn("text-as-secondary flex items-center gap-1", isSmallView ? "text-[10px]" : "text-xs")}
+                >
+                  <img
+                    src={ALL_CHAINS[order.dstChain]?.logoUrl}
+                    alt={getChainName(order.dstChain)}
+                    className="h-3 w-3"
+                  />
+                  <span className="truncate">{getChainName(order.dstChain)}</span>
+                </div>
               </div>
-            </div>
-
-            <div className="label-style text-as-primary/50 flex items-center gap-2 text-sm">
-              from
+            </>
+          ) : tournament ? (
+            <>
               <img
-                src={ALL_CHAINS[order.srcChain]?.logoUrl}
-                alt={getChainName(order.srcChain)}
-                className={cn("h-4", order.srcChain !== b3.id && "w-4 rounded-full", order.srcChain === b3.id && "h-3")}
+                src={tournament.imageUrl}
+                alt={tournament.name}
+                className={cn("shrink-0 rounded-full", isSmallView ? "h-7 w-7" : "h-8 w-8")}
               />
-              {getChainName(order.srcChain)}
-            </div>
-          </div>
-
-          <div className={cn("h-8 w-8 shrink-0 -rotate-90 opacity-30", isSmallView && "rotate-0")}>
-            <ChevronDown className="h-8 w-8" />
-          </div>
-
-          <div className="bg-b3-react-background flex w-full flex-1 flex-col gap-1 overflow-hidden rounded-lg border p-4 px-5">
-            <div className="flex items-center gap-2">
-              {nft ? (
-                <>
-                  <img src={nft.imageUrl} alt={nft.name} className="h-6 w-6 rounded-full" />
-                  <div className="text-as-primary overflow-hidden text-ellipsis whitespace-nowrap text-xl font-semibold">
-                    {nft.name}
-                  </div>
-                </>
-              ) : tournament ? (
-                <>
-                  <img src={tournament.imageUrl} alt={tournament.name} className="h-6 w-6 rounded-full" />
-                  <div className="text-as-primary overflow-hidden text-ellipsis whitespace-nowrap text-xl font-semibold">
-                    {tournament.name}
-                  </div>
-                </>
-              ) : (
-                <>
-                  <img src={dstToken.metadata.logoURI} alt={dstToken.symbol} className="h-6 w-6 rounded-full" />
-                  <div className="text-as-primary overflow-hidden text-ellipsis whitespace-nowrap text-xl font-semibold">
-                    {formatTokenAmount(
-                      actualDstAmount
-                        ? BigInt(actualDstAmount)
-                        : expectedDstAmount
-                          ? BigInt(expectedDstAmount)
-                          : BigInt(0),
-                      dstToken.decimals,
-                    )}{" "}
-                    {dstToken.symbol}
-                  </div>
-                </>
-              )}
-            </div>
-            <div className="label-style text-as-primary/50 flex items-center gap-2 text-sm">
-              to
+              <div className="min-w-0 flex-1">
+                <div className={cn("text-as-primary truncate font-bold", isSmallView ? "text-xs" : "text-sm")}>
+                  {tournament.name}
+                </div>
+                <div
+                  className={cn("text-as-secondary flex items-center gap-1", isSmallView ? "text-[10px]" : "text-xs")}
+                >
+                  <img
+                    src={ALL_CHAINS[order.dstChain]?.logoUrl}
+                    alt={getChainName(order.dstChain)}
+                    className="h-3 w-3"
+                  />
+                  <span className="truncate">{getChainName(order.dstChain)}</span>
+                </div>
+              </div>
+            </>
+          ) : (
+            <>
               <img
-                src={ALL_CHAINS[order.dstChain]?.logoUrl}
-                alt={getChainName(order.dstChain)}
-                className={cn("h-4", order.dstChain !== b3.id && "w-4 rounded-full", order.dstChain === b3.id && "h-3")}
+                src={dstToken.metadata.logoURI}
+                alt={dstToken.symbol}
+                className={cn("shrink-0 rounded-full", isSmallView ? "h-7 w-7" : "h-8 w-8")}
               />
-              {getChainName(order.dstChain)}
-            </div>
-          </div>
+              <div className="min-w-0 flex-1">
+                <div className={cn("text-as-primary truncate font-bold", isSmallView ? "text-xs" : "text-sm")}>
+                  {formatTokenAmount(
+                    actualDstAmount
+                      ? BigInt(actualDstAmount)
+                      : expectedDstAmount
+                        ? BigInt(expectedDstAmount)
+                        : BigInt(0),
+                    dstToken.decimals,
+                  )}{" "}
+                  {dstToken.symbol}
+                </div>
+                <div
+                  className={cn("text-as-secondary flex items-center gap-1", isSmallView ? "text-[10px]" : "text-xs")}
+                >
+                  <img
+                    src={ALL_CHAINS[order.dstChain]?.logoUrl}
+                    alt={getChainName(order.dstChain)}
+                    className="h-3 w-3"
+                  />
+                  <span className="truncate">{getChainName(order.dstChain)}</span>
+                </div>
+              </div>
+            </>
+          )}
         </div>
-      )}
-
-      <div className="flex items-center justify-end">
-        <Button variant="link" size="sm" className="h-auto" onClick={() => onSelectOrder?.(order.id)}>
-          {orderDisplayStatus === "processing" ? "Proceed with payment" : "Details"}{" "}
-          <ArrowRight className="ml-2 h-3 w-3" />
-        </Button>
       </div>
     </div>
   );