@b3dotfun/sdk 0.0.44-alpha.0 → 0.0.44-alpha.2

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

@@ -2,6 +2,7 @@ import { ALL_CHAINS, getChainName, getStatusDisplay } from "@b3dotfun/sdk/anyspe
 import { Badge, Button, useIsMobile } from "@b3dotfun/sdk/global-account/react";
 import { cn } from "@b3dotfun/sdk/shared/utils";
 import { formatTokenAmount } from "@b3dotfun/sdk/shared/utils/number";
+import { getVendorDisplayName } from "@b3dotfun/sdk/shared/utils/payment.utils";
 import { ArrowRight, ChevronDown } from "lucide-react";
 import TimeAgo from "react-timeago";
 import { b3 } from "viem/chains";
@@ -18,13 +19,7 @@ export function OrderHistoryItem({ order, onSelectOrder, mode }: OrderHistoryIte
   const tournament =
     order.type === "join_tournament" || order.type === "fund_tournament" ? order.metadata.tournament : undefined;
   const dstToken = order.metadata.dstToken;
-  const actualDstAmount =
-    order.type === "mint_nft" ||
-    order.type === "join_tournament" ||
-    order.type === "fund_tournament" ||
-    order.type === "custom"
-      ? undefined
-      : order.payload.actualDstAmount;
+  const actualDstAmount = order.settlement?.actualDstAmount;
   const expectedDstAmount =
     order.type === "mint_nft" ||
     order.type === "join_tournament" ||
@@ -37,153 +32,126 @@ 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>
-          </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">
-              <img
-                src={order.metadata.srcToken.metadata.logoURI}
-                alt={order.metadata.srcToken.symbol}
-                className="h-6 w-6 rounded-full"
-              />
-              <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>
+      {/* Main Content: From -> To */}
+      <div className="flex items-center gap-4">
+        {/* From Section */}
+        <div className="flex min-w-0 flex-1 items-center gap-2">
+          <img
+            src={order.metadata.srcToken.metadata.logoURI}
+            alt={order.metadata.srcToken.symbol}
+            className="h-8 w-8 shrink-0 rounded-full"
+          />
+          <div className="min-w-0 flex-1">
+            <div className="text-as-primary truncate text-sm font-bold">
+              {formatTokenAmount(BigInt(order.srcAmount), order.metadata.srcToken.decimals)}{" "}
+              {order.metadata.srcToken.symbol}
             </div>
-
-            <div className="label-style text-as-primary/50 flex items-center gap-2 text-sm">
-              from
-              <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")}
-              />
-              {getChainName(order.srcChain)}
+            <div className="text-as-secondary flex items-center gap-1 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("h-8 w-8 shrink-0 -rotate-90 opacity-30", isSmallView && "rotate-0")}>
-            <ChevronDown className="h-8 w-8" />
-          </div>
+        {/* Arrow */}
+        <ArrowRight className="text-as-secondary h-5 w-5 shrink-0 opacity-30" />
 
-          <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
-              <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")}
-              />
-              {getChainName(order.dstChain)}
-            </div>
-          </div>
+        {/* To Section */}
+        <div className="flex min-w-0 flex-1 items-center gap-2">
+          {nft ? (
+            <>
+              <img src={nft.imageUrl} alt={nft.name} className="h-8 w-8 shrink-0 rounded-full" />
+              <div className="min-w-0 flex-1">
+                <div className="text-as-primary truncate text-sm font-bold">{nft.name}</div>
+                <div className="text-as-secondary flex items-center gap-1 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>
+            </>
+          ) : tournament ? (
+            <>
+              <img src={tournament.imageUrl} alt={tournament.name} className="h-8 w-8 shrink-0 rounded-full" />
+              <div className="min-w-0 flex-1">
+                <div className="text-as-primary truncate text-sm font-bold">{tournament.name}</div>
+                <div className="text-as-secondary flex items-center gap-1 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={dstToken.metadata.logoURI} alt={dstToken.symbol} className="h-8 w-8 shrink-0 rounded-full" />
+              <div className="min-w-0 flex-1">
+                <div className="text-as-primary truncate text-sm font-bold">
+                  {formatTokenAmount(
+                    actualDstAmount
+                      ? BigInt(actualDstAmount)
+                      : expectedDstAmount
+                        ? BigInt(expectedDstAmount)
+                        : BigInt(0),
+                    dstToken.decimals,
+                  )}{" "}
+                  {dstToken.symbol}
+                </div>
+                <div className="text-as-secondary flex items-center gap-1 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>
   );

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

@@ -247,8 +247,8 @@ export function useAnyspendFlow({
   // Handle order completion
   useEffect(() => {
     if (oat?.data?.order.status === "executed") {
-      // get the actualDstAmount if available from custompayload
-      const amount = (oat.data.order.payload as { actualDstAmount?: string })?.actualDstAmount;
+      // get the actualDstAmount if available from settlement
+      const amount = oat.data.order.settlement?.actualDstAmount;
       const formattedActualDstAmount = amount
         ? formatTokenAmount(BigInt(amount), oat.data.order.metadata.dstToken.decimals)
         : undefined;
@@ -256,7 +256,7 @@ export function useAnyspendFlow({
     }
   }, [
     oat?.data?.order.status,
-    oat?.data?.order.payload,
+    oat?.data?.order.settlement?.actualDstAmount,
     onTransactionSuccess,
     oat?.data?.order.metadata.dstToken.decimals,
   ]);