@b3dotfun/sdk 0.0.41 → 0.0.42-alpha.1

package/dist/types/anyspend/react/components/AnySpendNFT.d.ts

@@ -1,8 +1,9 @@
 import { components } from "@b3dotfun/sdk/anyspend/types/api";
-export declare function AnySpendNFT({ loadOrder, mode, recipientAddress, nftContract, onSuccess, }: {
+export declare function AnySpendNFT({ loadOrder, mode, recipientAddress, nftContract, onSuccess, onShowPointsDetail, }: {
     loadOrder?: string;
     mode?: "modal" | "page";
     recipientAddress?: string;
     nftContract: components["schemas"]["NftContract"];
     onSuccess?: (txHash?: string) => void;
+    onShowPointsDetail?: () => void;
 }): import("react/jsx-runtime").JSX.Element;

package/dist/types/anyspend/react/components/common/PointsBadge.d.ts

@@ -0,0 +1,7 @@
+interface PointsBadgeProps {
+    pointsAmount: number;
+    pointsMultiplier?: number;
+    onClick?: () => void;
+}
+export declare function PointsBadge({ pointsAmount, pointsMultiplier, onClick }: PointsBadgeProps): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/types/anyspend/services/anyspend.d.ts

@@ -28,7 +28,7 @@ export declare const anyspendService: {
     }>;
     getOrderAndTransactions: (orderId: string | undefined) => Promise<GetOrderAndTxsResponse>;
     getOrderHistory: (creatorAddress: string | undefined, limit?: number, offset?: number) => Promise<GetOrderHistoryResponse>;
-    getCoinbaseOnrampOptions: (country: string, visitorData?: VisitorData) => Promise<GetCoinbaseOnrampOptionsResponse>;
+    getCoinbaseOnrampOptions: (country: string | undefined, visitorData?: VisitorData) => Promise<GetCoinbaseOnrampOptionsResponse>;
     checkStripeSupport: (usdAmount?: string, visitorData?: VisitorData) => Promise<{
         stripeOnramp: boolean;
         stripeWeb2: components["schemas"]["StripeWeb2Support"];

package/dist/types/anyspend/types/api.d.ts

@@ -503,11 +503,16 @@ export interface paths {
                          * @example 0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913
                          */
                         dstTokenAddress: string;
+                        /**
+                         * @description Recipient address
+                         * @example 0x55c71fca5e01cf246718748ae540473e608d0282
+                         */
+                        recipientAddress?: string;
                         /**
                          * @description Type of trade execution
                          * @enum {string}
                          */
-                        tradeType: "EXACT_INPUT" | "EXPECTED_OUTPUT" | "EXACT_OUTPUT";
+                        tradeType: "EXACT_INPUT" | "EXACT_OUTPUT";
                         /**
                          * @description Amount to quote
                          * @example 1000000000000000000
@@ -544,6 +549,11 @@ export interface paths {
                          * @example 0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913
                          */
                         dstTokenAddress: string;
+                        /**
+                         * @description Recipient address
+                         * @example 0x55c71fca5e01cf246718748ae540473e608d0282
+                         */
+                        recipientAddress?: string;
                         /** @description Custom payload for execution */
                         payload: {
                             /** @description Encoded transaction data */
@@ -567,6 +577,11 @@ export interface paths {
                         dstChain: number;
                         srcTokenAddress: string;
                         dstTokenAddress: string;
+                        /**
+                         * @description Recipient address
+                         * @example 0x55c71fca5e01cf246718748ae540473e608d0282
+                         */
+                        recipientAddress?: string;
                         /** @enum {string} */
                         onrampVendor?: "coinbase" | "stripe" | "stripe-web2";
                         contractAddress: string;
@@ -581,6 +596,11 @@ export interface paths {
                         dstChain: number;
                         srcTokenAddress: string;
                         dstTokenAddress: string;
+                        /**
+                         * @description Recipient address
+                         * @example 0x55c71fca5e01cf246718748ae540473e608d0282
+                         */
+                        recipientAddress?: string;
                         /** @enum {string} */
                         onrampVendor?: "coinbase" | "stripe" | "stripe-web2";
                         contractAddress: string;
@@ -592,6 +612,11 @@ export interface paths {
                         dstChain: number;
                         srcTokenAddress: string;
                         dstTokenAddress: string;
+                        /**
+                         * @description Recipient address
+                         * @example 0x55c71fca5e01cf246718748ae540473e608d0282
+                         */
+                        recipientAddress?: string;
                         /** @enum {string} */
                         onrampVendor?: "coinbase" | "stripe" | "stripe-web2";
                         contractAddress: string;
@@ -622,6 +647,11 @@ export interface paths {
                          * @example 0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913
                          */
                         dstTokenAddress: string;
+                        /**
+                         * @description Recipient address
+                         * @example 0x55c71fca5e01cf246718748ae540473e608d0282
+                         */
+                        recipientAddress?: string;
                         /**
                          * @description Amount to quote
                          * @example 1000000000000000000
@@ -1087,6 +1117,11 @@ export interface components {
              * @example 990000
              */
             actualDstAmount: string | null;
+            /**
+             * @description Amount in after fee
+             * @example 990000
+             */
+            amountInAfterFee: string | null;
         };
         /** @description HypeDuel-specific payload */
         HypeDuelPayload: {
@@ -1100,6 +1135,11 @@ export interface components {
              * @example 990000
              */
             actualDstAmount: string | null;
+            /**
+             * @description Amount in after fee
+             * @example 990000
+             */
+            amountInAfterFee: string | null;
         };
         /** @description Custom execution payload */
         CustomPayload: {

package/dist/types/global-account/react/hooks/index.d.ts

@@ -14,6 +14,7 @@ export { useExchangeRate } from "./useExchangeRate";
 export { useFirstEOA } from "./useFirstEOA";
 export { useGetAllTWSigners, type TWSignerWithMetadata } from "./useGetAllTWSigners";
 export { useGetGeo } from "./useGetGeo";
+export { useGlobalAccount } from "./useGlobalAccount";
 export { useHandleConnectWithPrivy } from "./useHandleConnectWithPrivy";
 export { useHasMounted } from "./useHasMounted";
 export { useIsMobile } from "./useIsMobile";

package/dist/types/global-account/react/hooks/useGlobalAccount.d.ts

@@ -0,0 +1,6 @@
+import { Wallet } from "thirdweb/wallets";
+export declare function useGlobalAccount(): {
+    account: Wallet | undefined;
+    address: string | undefined;
+    info: import("@tanstack/react-query").UseQueryResult<import("thirdweb/wallets").WalletInfo, Error>;
+};

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

@@ -117,7 +117,7 @@ export interface AnySpendModalProps extends BaseModalProps {
     /** Whether to hide the transaction history button */
     hideTransactionHistoryButton?: boolean;
     /** Callback function called when the transaction is successful */
-    onSuccess?: () => void;
+    onSuccess?: (txHash?: string) => void;
     /** Token address of the destination token to buy (enables buy mode) */
     destinationTokenAddress?: string;
     /** Chain ID where the destination token exists (enables buy mode) */

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

@@ -13,4 +13,4 @@ export interface AssetBalance {
     totalBalance: string;
     chainBalances: ChainBalance[];
 }
-export declare const fetchBalances: (address: string, testnet?: boolean) => Promise<AssetBalance[]>;
+export declare const fetchBalances: (address: string | undefined, testnet?: boolean) => Promise<AssetBalance[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b3dotfun/sdk",
-  "version": "0.0.41",
+  "version": "0.0.42-alpha.1",
   "source": "src/index.ts",
   "main": "./dist/cjs/index.js",
   "react-native": "./dist/cjs/index.native.js",
@@ -236,27 +236,6 @@
     "utils",
     "constants"
   ],
-  "scripts": {
-    "clean": "rm -rf dist",
-    "prebuild": "pnpm clean",
-    "fix-dist": "[ -d ./dist/react/src ] && cp -r ./dist/react/src/* ./dist/ && rm -rf ./dist/react || echo \"No react directory found\"",
-    "build": "pnpm clean && pnpm lint && pnpm build:types && pnpm build:cjs && pnpm build:esm && pnpm build:css",
-    "build:types": "tsc -p tsconfig.cjs.json --emitDeclarationOnly --declarationDir dist/types",
-    "build:cjs": "tsc -p tsconfig.cjs.json --outDir dist/cjs --module commonjs && tsc-alias -p tsconfig.cjs.json --outDir dist/cjs && mkdir -p dist/cjs/shared/generated && cp src/shared/generated/chain-networks.json src/shared/generated/coingecko-chains.json dist/cjs/shared/generated/ && ([ -d src/bondkit/json_abis ] && mkdir -p dist/cjs/bondkit/json_abis && cp -r src/bondkit/json_abis/* dist/cjs/bondkit/json_abis/ || echo \"No bondkit json_abis\")",
-    "build:esm": "tsc -p tsconfig.esm.json --outDir dist/esm --module esnext  && tsc-alias -p tsconfig.esm.json --outDir dist/esm && mkdir -p dist/esm/shared/generated && cp src/shared/generated/chain-networks.json src/shared/generated/coingecko-chains.json dist/esm/shared/generated/ && ([ -d src/bondkit/json_abis ] && mkdir -p dist/esm/bondkit/json_abis && cp -r src/bondkit/json_abis/* dist/esm/bondkit/json_abis/ || echo \"No bondkit json_abis\") && node scripts/fix-esm-imports.js",
-    "build:css": "postcss src/styles/index.css -o dist/styles/index.css",
-    "dev:cjs": "tsc-watch -p tsconfig.cjs.json --onSuccess \"tsc-alias -p tsconfig.cjs.json --outDir dist/cjs\"",
-    "dev:esm": "tsc-watch -p tsconfig.esm.json --onSuccess \"tsc-alias -p tsconfig.esm.json --outDir dist/esm\"",
-    "dev": "concurrently \"pnpm dev:cjs\" \"pnpm dev:esm\" \"pnpm dev:css\"",
-    "dev:css": "postcss src/styles/index.css -o dist/styles/index.css --watch",
-    "prepublishOnly": "pnpm build",
-    "release:test": "pnpm version prerelease --preid test && git push --follow-tags && pnpm publish --tag test --no-git-checks",
-    "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",
-    "lint": "eslint 'src/**/*.{ts,tsx}'",
-    "lint:fix": "eslint 'src/**/*.{ts,tsx}' --fix"
-  },
   "dependencies": {
     "@b3dotfun/b3-api": "0.0.50",
     "@b3dotfun/basement-api": "0.0.11",
@@ -369,5 +348,25 @@
     "three": {
       "optional": true
     }
+  },
+  "scripts": {
+    "clean": "rm -rf dist",
+    "prebuild": "pnpm clean",
+    "fix-dist": "[ -d ./dist/react/src ] && cp -r ./dist/react/src/* ./dist/ && rm -rf ./dist/react || echo \"No react directory found\"",
+    "build": "pnpm clean && pnpm lint && pnpm build:types && pnpm build:cjs && pnpm build:esm && pnpm build:css",
+    "build:types": "tsc -p tsconfig.cjs.json --emitDeclarationOnly --declarationDir dist/types",
+    "build:cjs": "tsc -p tsconfig.cjs.json --outDir dist/cjs --module commonjs && tsc-alias -p tsconfig.cjs.json --outDir dist/cjs && mkdir -p dist/cjs/shared/generated && cp src/shared/generated/chain-networks.json src/shared/generated/coingecko-chains.json dist/cjs/shared/generated/ && ([ -d src/bondkit/json_abis ] && mkdir -p dist/cjs/bondkit/json_abis && cp -r src/bondkit/json_abis/* dist/cjs/bondkit/json_abis/ || echo \"No bondkit json_abis\")",
+    "build:esm": "tsc -p tsconfig.esm.json --outDir dist/esm --module esnext  && tsc-alias -p tsconfig.esm.json --outDir dist/esm && mkdir -p dist/esm/shared/generated && cp src/shared/generated/chain-networks.json src/shared/generated/coingecko-chains.json dist/esm/shared/generated/ && ([ -d src/bondkit/json_abis ] && mkdir -p dist/esm/bondkit/json_abis && cp -r src/bondkit/json_abis/* dist/esm/bondkit/json_abis/ || echo \"No bondkit json_abis\") && node scripts/fix-esm-imports.js",
+    "build:css": "postcss src/styles/index.css -o dist/styles/index.css",
+    "dev:cjs": "tsc-watch -p tsconfig.cjs.json --onSuccess \"tsc-alias -p tsconfig.cjs.json --outDir dist/cjs\"",
+    "dev:esm": "tsc-watch -p tsconfig.esm.json --onSuccess \"tsc-alias -p tsconfig.esm.json --outDir dist/esm\"",
+    "dev": "concurrently \"pnpm dev:cjs\" \"pnpm dev:esm\" \"pnpm dev:css\"",
+    "dev:css": "postcss src/styles/index.css -o dist/styles/index.css --watch",
+    "release:test": "pnpm version prerelease --preid test && git push --follow-tags && pnpm publish --tag test --no-git-checks",
+    "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",
+    "lint": "eslint 'src/**/*.{ts,tsx}'",
+    "lint:fix": "eslint 'src/**/*.{ts,tsx}' --fix"
   }
-}
+}

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

@@ -78,6 +78,7 @@ export function AnySpend(props: {
    * Useful for handling special cases like B3 token selection.
    */
   onTokenSelect?: (token: components["schemas"]["Token"], event: { preventDefault: () => void }) => void;
+  onSuccess?: (txHash?: string) => void;
 }) {
   const fingerprintConfig = getFingerprintConfig();
 
@@ -97,6 +98,7 @@ function AnySpendInner({
   hideTransactionHistoryButton,
   recipientAddress: recipientAddressFromProps,
   onTokenSelect,
+  onSuccess,
 }: {
   destinationTokenAddress?: string;
   destinationTokenChainId?: number;
@@ -106,6 +108,7 @@ function AnySpendInner({
   hideTransactionHistoryButton?: boolean;
   recipientAddress?: string;
   onTokenSelect?: (token: components["schemas"]["Token"], event: { preventDefault: () => void }) => void;
+  onSuccess?: (txHash?: string) => void;
 }) {
   const searchParams = useSearchParamsSSR();
   const router = useRouter();
@@ -131,6 +134,9 @@ function AnySpendInner({
     toAmount?: string;
   } | null>(null);
 
+  // Track if onSuccess has been called for the current order
+  const onSuccessCalled = useRef(false);
+
   const [activeTab, setActiveTab] = useState<"crypto" | "fiat">(defaultActiveTab);
 
   const [orderId, setOrderId] = useState<string | undefined>(loadOrder);
@@ -446,8 +452,9 @@ function AnySpendInner({
           srcTokenAddress: selectedSrcToken.address,
           dstTokenAddress: isBuyMode ? destinationTokenAddress : selectedDstToken.address,
           type: "swap",
-          tradeType: isSrcInputDirty ? "EXACT_INPUT" : "EXPECTED_OUTPUT",
+          tradeType: isSrcInputDirty ? "EXACT_INPUT" : "EXACT_OUTPUT",
           amount: activeInputAmountInWei,
+          recipientAddress,
         }
       : {
           srcChain: base.id,
@@ -457,6 +464,7 @@ function AnySpendInner({
           type: "swap",
           tradeType: "EXACT_INPUT",
           amount: srcAmountOnrampInWei,
+          recipientAddress,
           onrampVendor: getOnrampVendor(selectedFiatPaymentMethod),
         },
   );
@@ -514,6 +522,20 @@ function AnySpendInner({
     }
   }, [anyspendQuote, isSrcInputDirty]);
 
+  useEffect(() => {
+    if (oat?.data?.order.status === "executed" && !onSuccessCalled.current) {
+      console.log("Calling onSuccess");
+      const txHash = oat?.data?.executeTx?.txHash;
+      onSuccess?.(txHash);
+      onSuccessCalled.current = true;
+    }
+  }, [oat?.data?.order.status, oat?.data?.executeTx?.txHash, onSuccess]);
+
+  // Reset flag when orderId changes
+  useEffect(() => {
+    onSuccessCalled.current = false;
+  }, [orderId]);
+
   const { createOrder, isCreatingOrder } = useAnyspendCreateOrder({
     onSuccess: data => {
       const orderId = data.data.id;

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

@@ -366,7 +366,6 @@ export function AnySpendBondKit({
       contractAddress={contractAddress}
       encodedData={encodedData}
       metadata={{
-        type: "custom",
         action: "BondKit Buy",
       }}
       header={header}

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

@@ -675,7 +675,6 @@ export function AnySpendBuySpin({
       spenderAddress={paymentConfig.entryModule}
       encodedData={encodedData}
       metadata={{
-        type: "custom",
         action: `buy ${userSpinQuantity} spin${userSpinQuantity !== "1" ? "s" : ""}`,
       }}
       header={header}

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

@@ -42,12 +42,15 @@ import { motion } from "motion/react";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { toast } from "sonner";
 import { base } from "viem/chains";
+import { useFeatureFlags } from "../contexts/FeatureFlagsContext";
 import { AnySpendFingerprintWrapper, getFingerprintConfig } from "./AnySpendFingerprintWrapper";
 import { CryptoPaymentMethod, CryptoPaymentMethodType } from "./common/CryptoPaymentMethod";
 import { FiatPaymentMethod, FiatPaymentMethodComponent } from "./common/FiatPaymentMethod";
 import { OrderDetails } from "./common/OrderDetails";
 import { OrderHistory } from "./common/OrderHistory";
 import { OrderToken } from "./common/OrderToken";
+import { PointsBadge } from "./common/PointsBadge";
+import { PointsDetailPanel } from "./common/PointsDetailPanel";
 import { RecipientSelection } from "./common/RecipientSelection";
 
 enum PanelView {
@@ -58,6 +61,7 @@ enum PanelView {
   RECIPIENT_SELECTION,
   CRYPTO_PAYMENT_METHOD,
   FIAT_PAYMENT_METHOD,
+  POINTS_DETAIL,
 }
 
 function generateGetRelayQuoteRequest({
@@ -66,6 +70,7 @@ function generateGetRelayQuoteRequest({
   srcToken,
   dstChainId,
   dstToken,
+  recipientAddress,
   dstAmount,
   contractAddress,
   tokenId,
@@ -78,6 +83,7 @@ function generateGetRelayQuoteRequest({
   srcToken: components["schemas"]["Token"];
   dstChainId: number;
   dstToken: components["schemas"]["Token"];
+  recipientAddress: string | undefined;
   dstAmount: string;
   contractAddress: string;
   tokenId?: number | null;
@@ -94,6 +100,7 @@ function generateGetRelayQuoteRequest({
         srcTokenAddress: srcToken.address,
         dstChain: dstChainId,
         dstTokenAddress: dstToken.address,
+        recipientAddress,
         price: dstAmount,
         contractAddress: contractAddress,
         tokenId: tokenId,
@@ -107,6 +114,7 @@ function generateGetRelayQuoteRequest({
         srcTokenAddress: srcToken.address,
         dstChain: dstChainId,
         dstTokenAddress: dstToken.address,
+        recipientAddress,
         price: dstAmount,
         contractAddress: contractAddress,
       };
@@ -118,6 +126,7 @@ function generateGetRelayQuoteRequest({
         srcTokenAddress: srcToken.address,
         dstChain: dstChainId,
         dstTokenAddress: dstToken.address,
+        recipientAddress,
         fundAmount: dstAmount,
         contractAddress: contractAddress,
       };
@@ -129,6 +138,7 @@ function generateGetRelayQuoteRequest({
         srcTokenAddress: srcToken.address,
         dstChain: dstChainId,
         dstTokenAddress: dstToken.address,
+        recipientAddress,
         payload: {
           amount: dstAmount,
           data: encodedData,
@@ -165,6 +175,7 @@ export function AnySpendCustom(props: {
   }) => React.JSX.Element;
   onSuccess?: (txHash?: string) => void;
   showRecipient?: boolean;
+  onShowPointsDetail?: () => void;
 }) {
   const fingerprintConfig = getFingerprintConfig();
 
@@ -191,6 +202,7 @@ function AnySpendCustomInner({
   header,
   onSuccess,
   showRecipient = true,
+  onShowPointsDetail,
 }: {
   loadOrder?: string;
   mode?: "modal" | "page";
@@ -213,8 +225,10 @@ function AnySpendCustomInner({
   }) => React.JSX.Element;
   onSuccess?: (txHash?: string) => void;
   showRecipient?: boolean;
+  onShowPointsDetail?: () => void;
 }) {
   const hasMounted = useHasMounted();
+  const featureFlags = useFeatureFlags();
 
   const searchParams = useSearchParamsSSR();
   const router = useRouter();
@@ -241,6 +255,9 @@ function AnySpendCustomInner({
 
   const [orderId, setOrderId] = useState<string | undefined>(loadOrder);
 
+  // Track if onSuccess has been called for the current order
+  const onSuccessCalled = React.useRef(false);
+
   const [srcChainId, setSrcChainId] = useState<number>(base.id);
 
   // Get token list for token balance check
@@ -312,10 +329,11 @@ function AnySpendCustomInner({
       srcToken: activeTab === "fiat" ? USDC_BASE : srcToken,
       dstChainId: dstChainId,
       dstToken: dstToken,
+      recipientAddress,
       dstAmount: dstAmount,
       contractAddress: contractAddress,
-      tokenId: metadata.type === "mint_nft" ? metadata.nftContract.tokenId : undefined,
-      contractType: metadata.type === "mint_nft" ? metadata.nftContract.type : undefined,
+      tokenId: orderType === "mint_nft" ? metadata?.nftContract?.tokenId : undefined,
+      contractType: orderType === "mint_nft" ? metadata?.nftContract?.type : undefined,
       encodedData: encodedData,
       spenderAddress: spenderAddress,
     });
@@ -328,8 +346,8 @@ function AnySpendCustomInner({
     encodedData,
     metadata?.nftContract?.tokenId,
     metadata?.nftContract?.type,
-    metadata?.type,
     orderType,
+    recipientAddress,
     spenderAddress,
     srcChainId,
     srcToken,
@@ -375,12 +393,18 @@ function AnySpendCustomInner({
     useGeoOnrampOptions(srcFiatAmount);
 
   useEffect(() => {
-    if (oat?.data?.order.status === "executed") {
+    if (oat?.data?.order.status === "executed" && !onSuccessCalled.current) {
       console.log("Calling onSuccess");
       const txHash = oat?.data?.executeTx?.txHash;
       onSuccess?.(txHash);
+      onSuccessCalled.current = true;
     }
-  }, [oat?.data?.executeTx?.txHash, oat?.data?.order.status, onSuccess]);
+  }, [oat?.data?.order.status, oat?.data?.executeTx?.txHash, onSuccess]);
+
+  // Reset flag when orderId changes
+  useEffect(() => {
+    onSuccessCalled.current = false;
+  }, [orderId]);
 
   const { createOrder: createRegularOrder, isCreatingOrder: isCreatingRegularOrder } = useAnyspendCreateOrder({
     onSuccess: data => {
@@ -426,7 +450,7 @@ function AnySpendCustomInner({
         recipientAddress,
         creatorAddress: currentWallet?.wallet?.address,
         nft:
-          metadata.type === "mint_nft"
+          orderType === "mint_nft"
             ? metadata.nftContract.type === "erc1155"
               ? {
                   type: "erc1155",
@@ -448,7 +472,7 @@ function AnySpendCustomInner({
                 }
             : undefined,
         tournament:
-          metadata.type === "join_tournament" || metadata.type === "fund_tournament"
+          orderType === "join_tournament" || orderType === "fund_tournament"
             ? {
                 ...metadata.tournament,
                 contractAddress: contractAddress,
@@ -457,13 +481,12 @@ function AnySpendCustomInner({
             : undefined,
         // only populate payload for custom tx
         payload:
-          metadata.type === "custom"
+          orderType === "custom"
             ? {
                 amount: dstAmount,
                 data: encodedData,
                 spenderAddress: spenderAddress,
                 to: contractAddress,
-                action: metadata.action,
               }
             : undefined,
       } as CreateOrderParams;
@@ -749,6 +772,23 @@ function AnySpendCustomInner({
     </div>
   );
 
+  // Render points badge if conditions are met
+  const renderPointsBadge = () => {
+    if (featureFlags.showPoints && anyspendQuote?.data?.pointsAmount && anyspendQuote.data.pointsAmount > 0) {
+      return (
+        <PointsBadge
+          pointsAmount={anyspendQuote.data.pointsAmount}
+          pointsMultiplier={anyspendQuote.data.pointsMultiplier}
+          onClick={() => {
+            onShowPointsDetail?.();
+            setActivePanel(PanelView.POINTS_DETAIL);
+          }}
+        />
+      );
+    }
+    return null;
+  };
+
   // Confirm order view.
   const confirmOrderView = (
     <div className={"relative mx-auto flex w-full flex-col items-center"}>
@@ -917,9 +957,12 @@ function AnySpendCustomInner({
                   transition={{ duration: 0.3, delay: 0.1, ease: "easeInOut" }}
                   className="relative flex w-full items-center justify-between"
                 >
-                  <span className="text-as-tertiarry text-sm">
-                    Total <span className="text-as-tertiarry">(with fee)</span>
-                  </span>
+                  <div className="flex items-center gap-2">
+                    <span className="text-as-tertiarry text-sm">
+                      Total <span className="text-as-tertiarry">(with fee)</span>
+                    </span>
+                    {renderPointsBadge()}
+                  </div>
                   <span className="text-as-primary font-semibold">
                     {formattedSrcAmount || "--"} {srcToken.symbol}
                   </span>
@@ -1040,9 +1083,12 @@ function AnySpendCustomInner({
                 transition={{ duration: 0.3, delay: 0.1, ease: "easeInOut" }}
                 className="relative flex w-full items-center justify-between"
               >
-                <span className="text-as-tertiarry text-sm">
-                  Total <span className="text-as-tertiarry">(USD)</span>
-                </span>
+                <div className="flex items-center gap-2">
+                  <span className="text-as-tertiarry text-sm">
+                    Total <span className="text-as-tertiarry">(USD)</span>
+                  </span>
+                  {renderPointsBadge()}
+                </div>
                 <span className="text-as-primary text-xl font-semibold">${srcFiatAmount || "0.00"}</span>
               </motion.div>
             </div>
@@ -1153,6 +1199,16 @@ function AnySpendCustomInner({
     </div>
   );
 
+  // Points detail view
+  const pointsDetailView = (
+    <div className={cn("bg-as-surface-primary mx-auto w-[460px] max-w-full rounded-xl p-4")}>
+      <PointsDetailPanel
+        pointsAmount={anyspendQuote?.data?.pointsAmount || 0}
+        onBack={() => setActivePanel(PanelView.CONFIRM_ORDER)}
+      />
+    </div>
+  );
+
   // Return the TransitionPanel with all views
   return (
     <StyleRoot>
@@ -1196,6 +1252,9 @@ function AnySpendCustomInner({
           <div key="fiat-payment-method-view" className="w-full">
             {fiatPaymentMethodView}
           </div>,
+          <div key="points-detail-view" className="w-full">
+            {pointsDetailView}
+          </div>,
         ]}
       </TransitionPanel>
     </StyleRoot>

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

@@ -36,12 +36,14 @@ export function AnySpendNFT({
   recipientAddress,
   nftContract,
   onSuccess,
+  onShowPointsDetail,
 }: {
   loadOrder?: string;
   mode?: "modal" | "page";
   recipientAddress?: string;
   nftContract: components["schemas"]["NftContract"];
   onSuccess?: (txHash?: string) => void;
+  onShowPointsDetail?: () => void;
 }) {
   const [imageUrlWithFallback, setFallbackImageUrl] = useState<string | null>(nftContract.imageUrl);
   const [isLoadingFallback, setIsLoadingFallback] = useState(false);
@@ -164,6 +166,7 @@ export function AnySpendNFT({
       }}
       header={header}
       onSuccess={onSuccess}
+      onShowPointsDetail={onShowPointsDetail}
     />
   );
 }

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

@@ -491,7 +491,6 @@ export function AnySpendStakeB3({
       contractAddress={ERC20Staking}
       encodedData={encodedData}
       metadata={{
-        type: "custom",
         action: "stake B3",
       }}
       header={header}

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

@@ -141,10 +141,9 @@ export function AnyspendSignatureMint({
       dstChainId={signatureData.collection.chainId}
       dstToken={dstToken}
       dstAmount={price.toString()}
-      contractAddress={signatureData.collection.address!}
+      contractAddress={signatureData.collection.address || ""}
       encodedData={encodedData}
       metadata={{
-        type: "custom",
         action: "Signature Mint",
       }}
       header={header}

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

@@ -48,7 +48,7 @@ export function CryptoPaySection({
   const walletAddress =
     selectedCryptoPaymentMethod === CryptoPaymentMethodType.GLOBAL_WALLET
       ? connectedSmartWallet?.getAccount()?.address
-      : connectedEOAWallet?.getAccount()?.address || connectedSmartWallet?.getAccount()?.address;
+      : connectedEOAWallet?.getAccount()?.address;
 
   const { data: profileData } = useProfile({ address: walletAddress });
   const connectedName = profileData?.displayName;