fix: deposit token address and amount

akbarsaputrait · akbarsaputrait · commit 9444a390f0b9 · 2025-12-15T09:08:47.000+07:00
diff --git a/examples/nextjs-app/package.json b/examples/nextjs-app/package.json
@@ -13,8 +13,8 @@
     "@farcaster/frame-sdk": "^0.0.26",
     "@headlessui/react": "^2.2.0",
     "@rainbow-me/rainbowkit": "^2.2.8",
-    "@rozoai/intent-common": "0.1.6-beta.2",
-    "@rozoai/intent-pay": "0.1.5-beta.3",
+    "@rozoai/intent-common": "workspace:*",
+    "@rozoai/intent-pay": "workspace:*",
     "@tanstack/react-query": "^5.51.11",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@wagmi/core": "^2.22.0",
diff --git a/packages/connectkit/bundle-analysis.html b/packages/connectkit/bundle-analysis.html
diff --git a/packages/connectkit/package.json b/packages/connectkit/package.json
@@ -47,7 +47,7 @@
     "@albedo-link/intent": "^0.13.0",
     "@reown/appkit": "^1.7.0",
     "@rollup/plugin-typescript": "^12.1.2",
-    "@rozoai/intent-common": "0.1.6-beta.2",
+    "@rozoai/intent-common": "workspace:*",
     "@solana/spl-token": "^0.4.14",
     "@solana/wallet-adapter-base": "^0.9.27",
     "@solana/wallet-adapter-react": "^0.15.39",
diff --git a/packages/connectkit/src/components/Pages/SelectWalletChain/index.tsx b/packages/connectkit/src/components/Pages/SelectWalletChain/index.tsx
@@ -4,7 +4,7 @@ import {
   Chain,
   ethereum,
   polygon,
-  rozoSolana,
+  solana,
   supportedTokens,
 } from "@rozoai/intent-common";
 import React, { useCallback, useMemo } from "react";
@@ -65,9 +65,9 @@ const SelectWalletChain: React.FC = () => {
           availableChainIds.has(bsc.chainId) && wallet?.id !== "app.phantom",
       },
       {
-        chain: rozoSolana,
+        chain: solana,
         icon: <Solana key="solana" />,
-        supported: availableChainIds.has(rozoSolana.chainId),
+        supported: availableChainIds.has(solana.chainId),
       },
     ],
     [availableChainIds, wallet?.id]
diff --git a/packages/connectkit/src/components/Pages/WaitingDepositAddress/index.tsx b/packages/connectkit/src/components/Pages/WaitingDepositAddress/index.tsx
@@ -241,6 +241,7 @@ export default function WaitingDepositAddress() {
 
   // If we selected a deposit address option, generate the address...
   const generateDepositAddress = async () => {
+    console.log("selectedDepositAddressOption", selectedDepositAddressOption);
     if (selectedDepositAddressOption == null) {
       if (order == null || !isHydrated(order)) return;
       if (order.sourceTokenAmount == null) return;
@@ -266,15 +267,17 @@ export default function WaitingDepositAddress() {
         expirationS = Number(order.expirationTs);
       }
 
+      console.log("order", order);
+
       const evmDeepLink = generateEVMDeepLink({
         amountUnits: order.destFinalCallTokenAmount.amount,
         chainId: order.destFinalCallTokenAmount.token.chainId,
-        recipientAddress: order.destFinalCall.to,
+        recipientAddress: order.intentAddr,
         tokenAddress: order.destFinalCallTokenAmount.token.token,
       });
 
       setDepAddr({
-        address: order.destFinalCall.to,
+        address: order.intentAddr,
         amount: String(order.usdValue),
         underpayment: {
           unitsPaid: order.destFinalCallTokenAmount.amount,
@@ -287,14 +290,14 @@ export default function WaitingDepositAddress() {
         uri: evmDeepLink,
         displayToken: order.destFinalCallTokenAmount.token,
         logoURI: "", // Not needed for underpaid orders
-        memo: order.metadata?.memo || "",
+        memo: order.memo || order.metadata?.memo || undefined,
       });
     } else {
       // Prevent multiple executions for the same deposit option
       if (isLoading || hasExecutedDepositCall) return;
 
       const displayToken = getKnownToken(
-        selectedDepositAddressOption.chainId,
+        selectedDepositAddressOption.token.chainId,
         selectedDepositAddressOption.token.token
       );
       const logoURI = selectedDepositAddressOption.logoURI;
@@ -321,6 +324,7 @@ export default function WaitingDepositAddress() {
       });
 
       try {
+        let feeData: FeeResponseData | null = null;
         // Fetch fee using amount and appId before generating deposit address
         if (amount && payParams?.appId) {
           try {
@@ -329,10 +333,11 @@ export default function WaitingDepositAddress() {
               type: payParams?.feeType ?? FeeType.ExactIn,
               toUnits: amount.toString(),
               appId: payParams.appId,
-              toChain: selectedDepositAddressOption.chainId,
+              toChain: selectedDepositAddressOption.token.chainId,
             });
 
             if (feeResponse.data) {
+              feeData = feeResponse.data;
               setFeeData(feeResponse.data);
               setFeeError(null);
             } else if (feeResponse.error) {
@@ -368,7 +373,9 @@ export default function WaitingDepositAddress() {
 
         const details = await payWithDepositAddress(
           selectedDepositAddressOption.id,
-          store as any
+          store as any,
+          feeData,
+          context.log
         );
         if (details) {
           const shouldShowMemo = ![DepositAddressPaymentOptions.BSC].includes(
@@ -414,10 +421,8 @@ export default function WaitingDepositAddress() {
   // Reset payment hash when deposit option changes
   useEffect(() => {
     setPayinTransactionHash(null);
-  }, [selectedDepositAddressOption]);
 
-  // Reset execution flag when selectedDepositAddressOption changes
-  useEffect(() => {
+    // Reset execution flag when selectedDepositAddressOption changes
     if (selectedDepositAddressOption) {
       setHasExecutedDepositCall(false);
       setFailed(false);
@@ -446,13 +451,7 @@ export default function WaitingDepositAddress() {
       reset();
       createPreviewOrder(payParams);
     }
-  }, [
-    selectedDepositAddressOption,
-    rozoPaymentState,
-    payParams,
-    reset,
-    createPreviewOrder,
-  ]);
+  }, [selectedDepositAddressOption, rozoPaymentState, payParams]);
 
   // Generate deposit address when conditions are met
   useEffect(() => {
diff --git a/packages/connectkit/src/hooks/usePaymentState.ts b/packages/connectkit/src/hooks/usePaymentState.ts
@@ -10,9 +10,12 @@ import {
   DepositAddressPaymentOptionMetadata,
   DepositAddressPaymentOptions,
   ethereum,
+  ethereumUSDC,
+  ethereumUSDT,
   ExternalPaymentOptionMetadata,
   ExternalPaymentOptions,
   ExternalPaymentOptionsString,
+  FeeResponseData,
   FeeType,
   formatPaymentResponseToHydratedOrder,
   generateEVMDeepLink,
@@ -22,18 +25,17 @@ import {
   mergedMetadata,
   PaymentResponse,
   PlatformType,
-  polygonUSDC,
   readRozoPayOrderID,
   RozoPayHydratedOrderWithOrg,
   RozoPayOrder,
   rozoSolana,
   rozoSolanaUSDC,
+  rozoSolanaUSDT,
   rozoStellar,
   rozoStellarUSDC,
   solana,
   Token,
   WalletPaymentOption,
-  worldchainUSDC,
   writeRozoPayOrderID,
 } from "@rozoai/intent-common";
 import { useConnection, useWallet } from "@solana/wallet-adapter-react";
@@ -167,7 +169,9 @@ export interface PaymentState {
   payWithExternal: (option: ExternalPaymentOptions) => Promise<string>;
   payWithDepositAddress: (
     option: DepositAddressPaymentOptions,
-    store: Store<PaymentState, PaymentEvent>
+    store: Store<PaymentState, PaymentEvent>,
+    fees: FeeResponseData | null,
+    log?: (message: string) => void
   ) => Promise<
     | (DepositAddressPaymentOptionData & { externalId: string; memo: string })
     | null
@@ -1059,46 +1063,53 @@ export function usePaymentState({
 
   const payWithDepositAddress = async (
     option: DepositAddressPaymentOptions,
-    store: Store<PaymentState, PaymentEvent>
+    store: Store<PaymentState, PaymentEvent>,
+    fees: FeeResponseData | null,
+    log?: (message: string) => void
   ) => {
     // Prevent duplicate calls for the same option
     if (depositAddressCallRef.current.has(option)) {
-      log(
+      log?.(
         `[PAY DEPOSIT ADDRESS] Already processing ${option}, skipping duplicate call`
       );
       return null;
     }
 
     // Mark this option as being processed
     depositAddressCallRef.current.add(option);
-    log(`[PAY DEPOSIT ADDRESS] Starting processing for ${option}`);
+    log?.(`[PAY DEPOSIT ADDRESS] Starting processing for ${option}`);
 
     try {
       let token: Token = baseUSDC;
 
-      if (option === DepositAddressPaymentOptions.SOLANA) {
+      // Map option to correct token, mimicking useDepositAddressOptions.ts
+      if (option === DepositAddressPaymentOptions.ETHEREUM_USDT) {
+        token = ethereumUSDT;
+      } else if (option === DepositAddressPaymentOptions.ETHEREUM_USDC) {
+        token = ethereumUSDC;
+      } else if (option === DepositAddressPaymentOptions.BASE_USDC) {
+        token = baseUSDC;
+      } else if (option === DepositAddressPaymentOptions.SOLANA_USDT) {
+        token = rozoSolanaUSDT;
+      } else if (option === DepositAddressPaymentOptions.SOLANA_USDC) {
         token = rozoSolanaUSDC;
-      } else if (option === DepositAddressPaymentOptions.STELLAR) {
-        token = rozoStellarUSDC;
-      } else if (option === DepositAddressPaymentOptions.POLYGON) {
-        token = polygonUSDC;
-      } else if (option === DepositAddressPaymentOptions.BSC) {
-        token = bscUSDT;
-      } else if (option === DepositAddressPaymentOptions.WORLD) {
-        token = worldchainUSDC;
       }
 
-      log("[PAY DEPOSIT ADDRESS] hydrating order");
+      log?.("[PAY DEPOSIT ADDRESS] hydrating order");
 
       const { order } = await pay.hydrateOrder(undefined, {
         required: {
           token: {
             token: token.token,
+            chainId: token.chainId,
           } as any,
         } as any,
+        fees: {
+          usd: fees?.fee ?? 0,
+        },
       } as any);
 
-      log(
+      log?.(
         `[PAY DEPOSIT ADDRESS] hydrated order ${order.id} for ${order.usdValue} USD, checking out with deposit address: ${option}`
       );
 
@@ -1109,7 +1120,7 @@ export function usePaymentState({
 
       const chain = getChainById(token.chainId);
 
-      log(order);
+      log?.(`[PAY DEPOSIT ADDRESS] order: ${debugJson(order)}`);
 
       const evmDeeplink = generateEVMDeepLink({
         amountUnits: order.destFinalCallTokenAmount.amount,
@@ -1138,7 +1149,7 @@ export function usePaymentState({
     } finally {
       // Remove from processing set when done (allow retries after completion/failure)
       depositAddressCallRef.current.delete(option);
-      log(`[PAY DEPOSIT ADDRESS] Finished processing for ${option}`);
+      log?.(`[PAY DEPOSIT ADDRESS] Finished processing for ${option}`);
     }
   };
 
diff --git a/packages/connectkit/src/payment/paymentEffects.ts b/packages/connectkit/src/payment/paymentEffects.ts
@@ -380,6 +380,9 @@ async function runHydratePayParamsEffects(
   const payParams = prev.payParamsData;
   const walletOption = event.walletPaymentOption;
   const feeType = payParams.feeType ?? FeeType.ExactIn;
+  console.log("walletOption", walletOption);
+  console.log("order", JSON.stringify(order, null, 2));
+  console.log("payParams", JSON.stringify(payParams, null, 2));
 
   const toUnits = formatUnits(
     BigInt(order.destFinalCallTokenAmount.amount),
@@ -389,7 +392,8 @@ async function runHydratePayParamsEffects(
     feeType === FeeType.ExactIn
       ? Number(toUnits)
       : Number(toUnits) - Number(walletOption?.fees.usd ?? 0);
-
+  console.log("toUnits", toUnits);
+  console.log("calculatedToUnits", calculatedToUnits);
   const toChain = getOrderDestChainId(order);
   const toToken = order.destFinalCallTokenAmount.token.token;
 
diff --git a/packages/pay-common/src/bridge-utils.ts b/packages/pay-common/src/bridge-utils.ts
@@ -1,6 +1,5 @@
 import { parseUnits } from "viem";
 import {
-  baseUSDC,
   getChainById,
   getKnownToken,
   isChainSupported,
@@ -316,16 +315,6 @@ export function formatPaymentResponseToHydratedOrder(
     );
   }
 
-  // Determine the chain from metadata or default to the source chain
-  const requiredChain = order.source?.chainId || baseUSDC.chainId;
-
-  const token = getKnownToken(
-    Number(requiredChain),
-    Number(requiredChain) === rozoStellarUSDC.chainId
-      ? rozoStellarUSDC.token
-      : order.source?.tokenAddress || ""
-  );
-
   return {
     id: BigInt(Math.floor(Math.random() * Number.MAX_SAFE_INTEGER)),
     mode: RozoPayOrderMode.HYDRATED,
@@ -335,23 +324,21 @@ export function formatPaymentResponseToHydratedOrder(
     preferredTokenAddress: order.source?.tokenAddress ?? null,
     destFinalCallTokenAmount: {
       token: {
-        chainId: destToken ? destToken.chainId : baseUSDC.chainId,
-        token: destToken ? destToken.token : baseUSDC.token,
-        symbol: destToken ? destToken.symbol : baseUSDC.symbol,
+        chainId: destToken.chainId,
+        token: destToken.token,
+        symbol: destToken.symbol,
         usd: Number(sourceAmountUnits),
         priceFromUsd: 1,
-        decimals: destToken ? destToken.decimals : baseUSDC.decimals,
+        decimals: destToken.decimals,
         displayDecimals: 2,
-        logoSourceURI: destToken
-          ? destToken.logoSourceURI
-          : baseUSDC.logoSourceURI,
-        logoURI: destToken ? destToken.logoURI : baseUSDC.logoURI,
+        logoSourceURI: destToken.logoSourceURI,
+        logoURI: destToken.logoURI,
         maxAcceptUsd: 100000,
         maxSendUsd: 0,
       },
       amount: parseUnits(
         sourceAmountUnits,
-        destToken ? destToken.decimals : baseUSDC.decimals
+        destToken.decimals
       ).toString() as `${bigint}`,
       usd: Number(sourceAmountUnits),
     },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
