@spicenet-io/spiceflow-ui 1.2.4 → 1.2.5

package/dist/index.cjs.js

@@ -6141,11 +6141,9 @@ const DepositModal = React.memo(
       refreshAssets
     } = useAssets({
       address: sourceAddress || address,
-      // Prioritize external wallet for showing balances
       supportedChains,
       fetchBalances,
       refreshInterval: 3e4
-      // Refresh balances every 30 seconds
     });
     const [isExecuting, setIsExecuting] = React.useState(false);
     const [error, setError] = React.useState(null);
@@ -6183,29 +6181,23 @@ const DepositModal = React.memo(
       if (nonEip7702Mode && intentStatus?.overallStatus === "success" && postDepositInstruction && postDepositStatus === "idle") {
         const bridgedAmount = bridgedAmountRef.current;
         const depositData = depositDataRef.current;
-        console.log("Success detected, bridgedAmount from ref:", bridgedAmount);
-        console.log("Deposit data from ref:", depositData);
         if (bridgedAmount) {
           (async () => {
             try {
-              console.log(
-                "Calling postDepositInstruction with:",
-                bridgedAmount
-              );
               setPostDepositStatus("executing");
               await postDepositInstruction(bridgedAmount);
               if (depositData && depositData.length > 0) {
                 console.log(
-                  "Submitting deposit data to backend after successful postDepositInstruction"
+                  "Submitting deposit data to backend after bridging completes:",
+                  depositData
                 );
                 for (const data of depositData) {
-                  await relayerService.submitSpiceDeposit({
-                    ...data,
-                    chainId: destinationChainId
-                    // Use destination chain, not source
-                  });
+                  console.log("Calling submitSpiceDeposit with:", data);
+                  await relayerService.submitSpiceDeposit(data);
+                  console.log(
+                    `Successfully submitted deposit for txHash: ${data.txHash} on chainId: ${data.chainId}`
+                  );
                 }
-                console.log("All deposit data submitted successfully");
               }
               setPostDepositStatus("success");
               setPostDepositAmount(bridgedAmount);
@@ -6224,10 +6216,6 @@ const DepositModal = React.memo(
               depositDataRef.current = null;
             }
           })();
-        } else {
-          console.error(
-            "bridgedAmountRef.current is null/undefined when success detected"
-          );
         }
       }
     }, [intentStatus?.overallStatus, nonEip7702Mode, postDepositStatus]);
@@ -6373,15 +6361,13 @@ const DepositModal = React.memo(
               throw new Error(
                 `Chain ${chainId} is not configured in your wallet. Please add it manually.`
               );
-            } else {
-              throw switchError;
             }
+            throw switchError;
           }
         }
         if (nonEip7702Mode) {
           const isNativeChainDeposit = nativeChainId && chainId === nativeChainId;
           if (isNativeChainDeposit) {
-            console.log("Native chain detected, skipping bridging");
             if (!postDepositInstruction) {
               throw new Error(
                 "Post-deposit instruction is required for native chain deposits"
@@ -6396,7 +6382,7 @@ const DepositModal = React.memo(
               chainId
             });
             setShowConfirmation(true);
-            if (validAssets.length > 0 && validAssets[0]?.amount) {
+            if (validAssets[0]?.amount) {
               const amountToStore = validAssets[0].amount;
               setPostDepositStatus("executing");
               try {
@@ -6404,29 +6390,6 @@ const DepositModal = React.memo(
                 setPostDepositStatus("success");
                 setPostDepositAmount(amountToStore);
                 setPostDepositSuccess(true);
-                for (const selectedAsset of validAssets) {
-                  const amount = viem.parseUnits(
-                    selectedAsset.amount,
-                    selectedAsset.asset.decimals
-                  );
-                  let tokenAddress = selectedAsset.asset.address;
-                  if ([
-                    "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
-                    "0x0000000000000000000000000000000000000000"
-                  ].includes(tokenAddress.toLowerCase())) {
-                    tokenAddress = "0x0";
-                  }
-                  await relayerService.submitSpiceDeposit({
-                    txHash: "0x0",
-                    // Placeholder for native chain deposits
-                    sender: sourceAddress,
-                    tokenAddress: destinationTokenAddress ? destinationTokenAddress : tokenAddress,
-                    chainId,
-                    // Native chain = destination chain
-                    amount: amount.toString(),
-                    user: sourceAddress
-                  });
-                }
               } catch (error2) {
                 console.error("postDepositInstruction failed:", error2);
                 setPostDepositStatus("error");
@@ -6449,11 +6412,6 @@ const DepositModal = React.memo(
             const tokenTransfers = [];
             let sourceTransactionHash = null;
             for (const selectedAsset of validAssets) {
-              console.log(
-                selectedAsset.asset.symbol,
-                selectedAsset.amount,
-                selectedAsset.asset.decimals
-              );
               const amount = viem.parseUnits(
                 selectedAsset.amount,
                 selectedAsset.asset.decimals
@@ -6466,35 +6424,34 @@ const DepositModal = React.memo(
                 tokenAddress = "0x0";
               }
               const isNative = selectedAsset.asset.isNative || tokenAddress.toLowerCase() === "0x0";
-              let txHash;
-              if (isNative) {
-                txHash = await externalWalletClient.sendTransaction({
-                  to: delegateContract,
-                  value: amount
-                });
-              } else {
-                const transferData2 = viem.encodeFunctionData({
+              const txHash = isNative ? await externalWalletClient.sendTransaction({
+                to: delegateContract,
+                value: amount
+              }) : await externalWalletClient.sendTransaction({
+                to: tokenAddress,
+                data: viem.encodeFunctionData({
                   abi: erc20ABI,
                   functionName: "transfer",
                   args: [delegateContract, amount]
-                });
-                txHash = await externalWalletClient.sendTransaction({
-                  to: tokenAddress,
-                  data: transferData2
-                });
-              }
+                })
+              });
               if (!sourceTransactionHash) {
                 sourceTransactionHash = txHash;
               }
-              console.log("txHash", txHash);
               const client = getClientForChain(chainId);
-              console.log(client.chain?.id);
+              console.log(`Waiting for transaction receipt: ${txHash}`);
               const receipt = await client.waitForTransactionReceipt({
                 hash: txHash,
                 timeout: 6e4,
                 pollingInterval: 5e3,
                 confirmations: 1
               });
+              console.log("Transaction receipt:", {
+                hash: receipt.transactionHash,
+                blockNumber: receipt.blockNumber,
+                status: receipt.status,
+                confirmations: 1
+              });
               if (receipt.status !== "success") {
                 throw new Error(
                   `Transfer to delegate contract failed for ${selectedAsset.asset.symbol}`
@@ -6511,13 +6468,19 @@ const DepositModal = React.memo(
                 amount: amount.toString(),
                 user: sourceAddress
               });
-              const transferData = {
+              console.log("Stored deposit data for later submission:", {
+                txHash,
+                sender: sourceAddress,
+                tokenAddress,
+                chainId,
+                amount: amount.toString()
+              });
+              tokenTransfers.push({
                 tokenAddress,
                 tokenAmount: amount.toString(),
                 sender: sourceAddress,
                 receiver: delegateContract
-              };
-              tokenTransfers.push(transferData);
+              });
             }
             if (!sourceTransactionHash) {
               throw new Error("No transaction hash generated");
@@ -6537,20 +6500,8 @@ const DepositModal = React.memo(
             });
             if (result.success && result.data) {
               const transactionId = result.data.transactionId;
-              if (validAssets.length > 0 && validAssets[0]?.amount) {
-                const amountToStore = validAssets[0].amount;
-                bridgedAmountRef.current = amountToStore;
-                console.log(
-                  "Stored bridged amount in ref:",
-                  amountToStore,
-                  "Ref now:",
-                  bridgedAmountRef.current
-                );
-              } else {
-                console.log(
-                  "No valid assets or amount found. validAssets:",
-                  validAssets
-                );
+              if (validAssets[0]?.amount) {
+                bridgedAmountRef.current = validAssets[0].amount;
               }
               if (transactionId) {
                 const chainConfig = getChainConfig(chainId);
@@ -6590,39 +6541,46 @@ const DepositModal = React.memo(
               tokenAddress = "0x0";
             }
             const isNative = selectedAsset.asset.isNative || tokenAddress.toLowerCase() === "0x0";
-            let transferToEmbeddedTx;
-            if (isNative) {
-              transferToEmbeddedTx = await externalWalletClient.sendTransaction(
-                {
-                  to: address,
-                  value: amount
-                }
-              );
-            } else {
-              const transferToEmbeddedData = viem.encodeFunctionData({
+            const transferToEmbeddedTx = isNative ? await externalWalletClient.sendTransaction({
+              to: address,
+              value: amount
+            }) : await externalWalletClient.sendTransaction({
+              to: tokenAddress,
+              data: viem.encodeFunctionData({
                 abi: erc20ABI,
                 functionName: "transfer",
                 args: [address, amount]
-              });
-              transferToEmbeddedTx = await externalWalletClient.sendTransaction(
-                {
-                  to: tokenAddress,
-                  data: transferToEmbeddedData
-                }
-              );
-            }
+              })
+            });
             const client2 = getClientForChain(chainId);
+            console.log(
+              `Waiting for transaction receipt (EIP-7702): ${transferToEmbeddedTx}`
+            );
             const receipt = await client2.waitForTransactionReceipt({
               hash: transferToEmbeddedTx,
               timeout: 6e4,
-              pollingInterval: 5e3
+              pollingInterval: 5e3,
+              confirmations: 1
+            });
+            console.log("Transaction receipt (EIP-7702):", {
+              hash: receipt.transactionHash,
+              blockNumber: receipt.blockNumber,
+              status: receipt.status,
+              confirmations: 1
             });
             if (receipt.status !== "success") {
               throw new Error(
                 `Transfer to embedded wallet failed for ${selectedAsset.asset.symbol}`
               );
             }
-            console.log("Submitting deposit to API");
+            console.log("Calling submitSpiceDeposit (EIP-7702) with:", {
+              txHash: transferToEmbeddedTx,
+              sender: sourceAddress,
+              tokenAddress,
+              chainId,
+              amount: amount.toString(),
+              user: address
+            });
             await relayerService.submitSpiceDeposit({
               txHash: transferToEmbeddedTx,
               sender: sourceAddress,
@@ -6631,15 +6589,15 @@ const DepositModal = React.memo(
               amount: amount.toString(),
               user: address
             });
-            console.log("Deposit successfully submitted to API");
-            if (isNative) {
-              escrowCalls.push({
+            console.log(
+              `Successfully submitted deposit for txHash: ${transferToEmbeddedTx}`
+            );
+            escrowCalls.push(
+              isNative ? {
                 to: escrowAddress,
                 value: amount,
                 data: "0x"
-              });
-            } else {
-              escrowCalls.push({
+              } : {
                 to: tokenAddress,
                 value: BigInt(0),
                 data: viem.encodeFunctionData({
@@ -6647,18 +6605,14 @@ const DepositModal = React.memo(
                   functionName: "transfer",
                   args: [escrowAddress, amount]
                 })
-              });
-            }
-            let transferData = {
+              }
+            );
+            tokenTransfers.push({
               tokenAddress,
               tokenAmount: amount,
               sender: address,
-              receiver: ""
-            };
-            if (!isNative) {
-              transferData.receiver = escrowAddress;
-            }
-            tokenTransfers.push(transferData);
+              receiver: isNative ? "" : escrowAddress
+            });
           }
           const client = getClientForChain(chainId);
           const sourceRecentBlock = await client.getBlockNumber();
@@ -6767,13 +6721,24 @@ const DepositModal = React.memo(
       return allAvailable;
     }, [supportedChains, assets, allowedTokens]);
     const secondAssetOptions = React.useMemo(() => {
-      if (selectedDepositAssets.length === 0 || !selectedDepositAssets[0]?.asset) {
+      if (!selectedDepositAssets[0]?.asset) {
         return [];
       }
       const firstChainId = selectedDepositAssets[0].asset.chainId;
       return depositAssets.filter((asset) => asset.chainId === firstChainId);
     }, [depositAssets, selectedDepositAssets]);
     const canDeposit = selectedDepositAssets.length > 0 && selectedDepositAssets[0]?.asset && selectedDepositAssets[0]?.amount && parseFloat(selectedDepositAssets[0].amount) > 0 && isConnected && !isExecuting;
+    const getButtonLabel = () => {
+      if (isExecuting) return "Executing Deposit...";
+      if (!isConnected) return "Wallet Not Connected";
+      if (!nonEip7702Mode) {
+        if (!ready) return "Loading...";
+        if (!authenticated) return "Authentication Required";
+      }
+      if (!selectedDepositAssets[0]?.asset) return "SELECT TOKEN";
+      if (!selectedDepositAssets[0]?.amount) return "ENTER AMOUNT";
+      return "DEPOSIT";
+    };
     if (!isOpen) return null;
     const subtitle = /* @__PURE__ */ jsxRuntime.jsxs(
       "div",
@@ -6825,7 +6790,6 @@ const DepositModal = React.memo(
         theme,
         children: /* @__PURE__ */ jsxRuntime.jsxs("div", { style: { padding: "24px 24px 5px 24px" }, children: [
           selectedDepositAssets.map((selectedAsset, index) => {
-            const assetKey = `asset-${index}`;
             const label = selectedDepositAssets.length === 1 ? "Deposit" : `Asset ${index + 1}`;
             return /* @__PURE__ */ jsxRuntime.jsxs(
               "div",
@@ -6891,7 +6855,7 @@ const DepositModal = React.memo(
                   )
                 ]
               },
-              assetKey
+              `asset-${index}`
             );
           }),
           selectedDepositAssets.length === 0 && /* @__PURE__ */ jsxRuntime.jsx("div", { style: { marginBottom: theme.spacing.md }, children: /* @__PURE__ */ jsxRuntime.jsx(
@@ -7019,7 +6983,7 @@ const DepositModal = React.memo(
                       ...styles?.button
                     }
                   },
-                  children: nonEip7702Mode ? !isConnected ? "Wallet Not Connected" : isExecuting ? "Executing Deposit..." : selectedDepositAssets.length === 0 || !selectedDepositAssets[0]?.asset ? "SELECT TOKEN" : !selectedDepositAssets[0]?.amount ? "ENTER AMOUNT" : "DEPOSIT" : !ready ? "Loading..." : !authenticated ? "Authentication Required" : !isConnected ? "Wallet Not Connected" : isExecuting ? "Executing Deposit..." : selectedDepositAssets.length === 0 || !selectedDepositAssets[0]?.asset ? "SELECT TOKEN" : !selectedDepositAssets[0]?.amount ? "ENTER AMOUNT" : "DEPOSIT"
+                  children: getButtonLabel()
                 }
               )
             }

package/dist/index.js

@@ -6139,11 +6139,9 @@ const DepositModal = React.memo(
       refreshAssets
     } = useAssets({
       address: sourceAddress || address,
-      // Prioritize external wallet for showing balances
       supportedChains,
       fetchBalances,
       refreshInterval: 3e4
-      // Refresh balances every 30 seconds
     });
     const [isExecuting, setIsExecuting] = useState(false);
     const [error, setError] = useState(null);
@@ -6181,29 +6179,23 @@ const DepositModal = React.memo(
       if (nonEip7702Mode && intentStatus?.overallStatus === "success" && postDepositInstruction && postDepositStatus === "idle") {
         const bridgedAmount = bridgedAmountRef.current;
         const depositData = depositDataRef.current;
-        console.log("Success detected, bridgedAmount from ref:", bridgedAmount);
-        console.log("Deposit data from ref:", depositData);
         if (bridgedAmount) {
           (async () => {
             try {
-              console.log(
-                "Calling postDepositInstruction with:",
-                bridgedAmount
-              );
               setPostDepositStatus("executing");
               await postDepositInstruction(bridgedAmount);
               if (depositData && depositData.length > 0) {
                 console.log(
-                  "Submitting deposit data to backend after successful postDepositInstruction"
+                  "Submitting deposit data to backend after bridging completes:",
+                  depositData
                 );
                 for (const data of depositData) {
-                  await relayerService.submitSpiceDeposit({
-                    ...data,
-                    chainId: destinationChainId
-                    // Use destination chain, not source
-                  });
+                  console.log("Calling submitSpiceDeposit with:", data);
+                  await relayerService.submitSpiceDeposit(data);
+                  console.log(
+                    `Successfully submitted deposit for txHash: ${data.txHash} on chainId: ${data.chainId}`
+                  );
                 }
-                console.log("All deposit data submitted successfully");
               }
               setPostDepositStatus("success");
               setPostDepositAmount(bridgedAmount);
@@ -6222,10 +6214,6 @@ const DepositModal = React.memo(
               depositDataRef.current = null;
             }
           })();
-        } else {
-          console.error(
-            "bridgedAmountRef.current is null/undefined when success detected"
-          );
         }
       }
     }, [intentStatus?.overallStatus, nonEip7702Mode, postDepositStatus]);
@@ -6371,15 +6359,13 @@ const DepositModal = React.memo(
               throw new Error(
                 `Chain ${chainId} is not configured in your wallet. Please add it manually.`
               );
-            } else {
-              throw switchError;
             }
+            throw switchError;
           }
         }
         if (nonEip7702Mode) {
           const isNativeChainDeposit = nativeChainId && chainId === nativeChainId;
           if (isNativeChainDeposit) {
-            console.log("Native chain detected, skipping bridging");
             if (!postDepositInstruction) {
               throw new Error(
                 "Post-deposit instruction is required for native chain deposits"
@@ -6394,7 +6380,7 @@ const DepositModal = React.memo(
               chainId
             });
             setShowConfirmation(true);
-            if (validAssets.length > 0 && validAssets[0]?.amount) {
+            if (validAssets[0]?.amount) {
               const amountToStore = validAssets[0].amount;
               setPostDepositStatus("executing");
               try {
@@ -6402,29 +6388,6 @@ const DepositModal = React.memo(
                 setPostDepositStatus("success");
                 setPostDepositAmount(amountToStore);
                 setPostDepositSuccess(true);
-                for (const selectedAsset of validAssets) {
-                  const amount = parseUnits(
-                    selectedAsset.amount,
-                    selectedAsset.asset.decimals
-                  );
-                  let tokenAddress = selectedAsset.asset.address;
-                  if ([
-                    "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
-                    "0x0000000000000000000000000000000000000000"
-                  ].includes(tokenAddress.toLowerCase())) {
-                    tokenAddress = "0x0";
-                  }
-                  await relayerService.submitSpiceDeposit({
-                    txHash: "0x0",
-                    // Placeholder for native chain deposits
-                    sender: sourceAddress,
-                    tokenAddress: destinationTokenAddress ? destinationTokenAddress : tokenAddress,
-                    chainId,
-                    // Native chain = destination chain
-                    amount: amount.toString(),
-                    user: sourceAddress
-                  });
-                }
               } catch (error2) {
                 console.error("postDepositInstruction failed:", error2);
                 setPostDepositStatus("error");
@@ -6447,11 +6410,6 @@ const DepositModal = React.memo(
             const tokenTransfers = [];
             let sourceTransactionHash = null;
             for (const selectedAsset of validAssets) {
-              console.log(
-                selectedAsset.asset.symbol,
-                selectedAsset.amount,
-                selectedAsset.asset.decimals
-              );
               const amount = parseUnits(
                 selectedAsset.amount,
                 selectedAsset.asset.decimals
@@ -6464,35 +6422,34 @@ const DepositModal = React.memo(
                 tokenAddress = "0x0";
               }
               const isNative = selectedAsset.asset.isNative || tokenAddress.toLowerCase() === "0x0";
-              let txHash;
-              if (isNative) {
-                txHash = await externalWalletClient.sendTransaction({
-                  to: delegateContract,
-                  value: amount
-                });
-              } else {
-                const transferData2 = encodeFunctionData({
+              const txHash = isNative ? await externalWalletClient.sendTransaction({
+                to: delegateContract,
+                value: amount
+              }) : await externalWalletClient.sendTransaction({
+                to: tokenAddress,
+                data: encodeFunctionData({
                   abi: erc20ABI,
                   functionName: "transfer",
                   args: [delegateContract, amount]
-                });
-                txHash = await externalWalletClient.sendTransaction({
-                  to: tokenAddress,
-                  data: transferData2
-                });
-              }
+                })
+              });
               if (!sourceTransactionHash) {
                 sourceTransactionHash = txHash;
               }
-              console.log("txHash", txHash);
               const client = getClientForChain(chainId);
-              console.log(client.chain?.id);
+              console.log(`Waiting for transaction receipt: ${txHash}`);
               const receipt = await client.waitForTransactionReceipt({
                 hash: txHash,
                 timeout: 6e4,
                 pollingInterval: 5e3,
                 confirmations: 1
               });
+              console.log("Transaction receipt:", {
+                hash: receipt.transactionHash,
+                blockNumber: receipt.blockNumber,
+                status: receipt.status,
+                confirmations: 1
+              });
               if (receipt.status !== "success") {
                 throw new Error(
                   `Transfer to delegate contract failed for ${selectedAsset.asset.symbol}`
@@ -6509,13 +6466,19 @@ const DepositModal = React.memo(
                 amount: amount.toString(),
                 user: sourceAddress
               });
-              const transferData = {
+              console.log("Stored deposit data for later submission:", {
+                txHash,
+                sender: sourceAddress,
+                tokenAddress,
+                chainId,
+                amount: amount.toString()
+              });
+              tokenTransfers.push({
                 tokenAddress,
                 tokenAmount: amount.toString(),
                 sender: sourceAddress,
                 receiver: delegateContract
-              };
-              tokenTransfers.push(transferData);
+              });
             }
             if (!sourceTransactionHash) {
               throw new Error("No transaction hash generated");
@@ -6535,20 +6498,8 @@ const DepositModal = React.memo(
             });
             if (result.success && result.data) {
               const transactionId = result.data.transactionId;
-              if (validAssets.length > 0 && validAssets[0]?.amount) {
-                const amountToStore = validAssets[0].amount;
-                bridgedAmountRef.current = amountToStore;
-                console.log(
-                  "Stored bridged amount in ref:",
-                  amountToStore,
-                  "Ref now:",
-                  bridgedAmountRef.current
-                );
-              } else {
-                console.log(
-                  "No valid assets or amount found. validAssets:",
-                  validAssets
-                );
+              if (validAssets[0]?.amount) {
+                bridgedAmountRef.current = validAssets[0].amount;
               }
               if (transactionId) {
                 const chainConfig = getChainConfig(chainId);
@@ -6588,39 +6539,46 @@ const DepositModal = React.memo(
               tokenAddress = "0x0";
             }
             const isNative = selectedAsset.asset.isNative || tokenAddress.toLowerCase() === "0x0";
-            let transferToEmbeddedTx;
-            if (isNative) {
-              transferToEmbeddedTx = await externalWalletClient.sendTransaction(
-                {
-                  to: address,
-                  value: amount
-                }
-              );
-            } else {
-              const transferToEmbeddedData = encodeFunctionData({
+            const transferToEmbeddedTx = isNative ? await externalWalletClient.sendTransaction({
+              to: address,
+              value: amount
+            }) : await externalWalletClient.sendTransaction({
+              to: tokenAddress,
+              data: encodeFunctionData({
                 abi: erc20ABI,
                 functionName: "transfer",
                 args: [address, amount]
-              });
-              transferToEmbeddedTx = await externalWalletClient.sendTransaction(
-                {
-                  to: tokenAddress,
-                  data: transferToEmbeddedData
-                }
-              );
-            }
+              })
+            });
             const client2 = getClientForChain(chainId);
+            console.log(
+              `Waiting for transaction receipt (EIP-7702): ${transferToEmbeddedTx}`
+            );
             const receipt = await client2.waitForTransactionReceipt({
               hash: transferToEmbeddedTx,
               timeout: 6e4,
-              pollingInterval: 5e3
+              pollingInterval: 5e3,
+              confirmations: 1
+            });
+            console.log("Transaction receipt (EIP-7702):", {
+              hash: receipt.transactionHash,
+              blockNumber: receipt.blockNumber,
+              status: receipt.status,
+              confirmations: 1
             });
             if (receipt.status !== "success") {
               throw new Error(
                 `Transfer to embedded wallet failed for ${selectedAsset.asset.symbol}`
               );
             }
-            console.log("Submitting deposit to API");
+            console.log("Calling submitSpiceDeposit (EIP-7702) with:", {
+              txHash: transferToEmbeddedTx,
+              sender: sourceAddress,
+              tokenAddress,
+              chainId,
+              amount: amount.toString(),
+              user: address
+            });
             await relayerService.submitSpiceDeposit({
               txHash: transferToEmbeddedTx,
               sender: sourceAddress,
@@ -6629,15 +6587,15 @@ const DepositModal = React.memo(
               amount: amount.toString(),
               user: address
             });
-            console.log("Deposit successfully submitted to API");
-            if (isNative) {
-              escrowCalls.push({
+            console.log(
+              `Successfully submitted deposit for txHash: ${transferToEmbeddedTx}`
+            );
+            escrowCalls.push(
+              isNative ? {
                 to: escrowAddress,
                 value: amount,
                 data: "0x"
-              });
-            } else {
-              escrowCalls.push({
+              } : {
                 to: tokenAddress,
                 value: BigInt(0),
                 data: encodeFunctionData({
@@ -6645,18 +6603,14 @@ const DepositModal = React.memo(
                   functionName: "transfer",
                   args: [escrowAddress, amount]
                 })
-              });
-            }
-            let transferData = {
+              }
+            );
+            tokenTransfers.push({
               tokenAddress,
               tokenAmount: amount,
               sender: address,
-              receiver: ""
-            };
-            if (!isNative) {
-              transferData.receiver = escrowAddress;
-            }
-            tokenTransfers.push(transferData);
+              receiver: isNative ? "" : escrowAddress
+            });
           }
           const client = getClientForChain(chainId);
           const sourceRecentBlock = await client.getBlockNumber();
@@ -6765,13 +6719,24 @@ const DepositModal = React.memo(
       return allAvailable;
     }, [supportedChains, assets, allowedTokens]);
     const secondAssetOptions = useMemo(() => {
-      if (selectedDepositAssets.length === 0 || !selectedDepositAssets[0]?.asset) {
+      if (!selectedDepositAssets[0]?.asset) {
         return [];
       }
       const firstChainId = selectedDepositAssets[0].asset.chainId;
       return depositAssets.filter((asset) => asset.chainId === firstChainId);
     }, [depositAssets, selectedDepositAssets]);
     const canDeposit = selectedDepositAssets.length > 0 && selectedDepositAssets[0]?.asset && selectedDepositAssets[0]?.amount && parseFloat(selectedDepositAssets[0].amount) > 0 && isConnected && !isExecuting;
+    const getButtonLabel = () => {
+      if (isExecuting) return "Executing Deposit...";
+      if (!isConnected) return "Wallet Not Connected";
+      if (!nonEip7702Mode) {
+        if (!ready) return "Loading...";
+        if (!authenticated) return "Authentication Required";
+      }
+      if (!selectedDepositAssets[0]?.asset) return "SELECT TOKEN";
+      if (!selectedDepositAssets[0]?.amount) return "ENTER AMOUNT";
+      return "DEPOSIT";
+    };
     if (!isOpen) return null;
     const subtitle = /* @__PURE__ */ jsxs(
       "div",
@@ -6823,7 +6788,6 @@ const DepositModal = React.memo(
         theme,
         children: /* @__PURE__ */ jsxs("div", { style: { padding: "24px 24px 5px 24px" }, children: [
           selectedDepositAssets.map((selectedAsset, index) => {
-            const assetKey = `asset-${index}`;
             const label = selectedDepositAssets.length === 1 ? "Deposit" : `Asset ${index + 1}`;
             return /* @__PURE__ */ jsxs(
               "div",
@@ -6889,7 +6853,7 @@ const DepositModal = React.memo(
                   )
                 ]
               },
-              assetKey
+              `asset-${index}`
             );
           }),
           selectedDepositAssets.length === 0 && /* @__PURE__ */ jsx("div", { style: { marginBottom: theme.spacing.md }, children: /* @__PURE__ */ jsx(
@@ -7017,7 +6981,7 @@ const DepositModal = React.memo(
                       ...styles?.button
                     }
                   },
-                  children: nonEip7702Mode ? !isConnected ? "Wallet Not Connected" : isExecuting ? "Executing Deposit..." : selectedDepositAssets.length === 0 || !selectedDepositAssets[0]?.asset ? "SELECT TOKEN" : !selectedDepositAssets[0]?.amount ? "ENTER AMOUNT" : "DEPOSIT" : !ready ? "Loading..." : !authenticated ? "Authentication Required" : !isConnected ? "Wallet Not Connected" : isExecuting ? "Executing Deposit..." : selectedDepositAssets.length === 0 || !selectedDepositAssets[0]?.asset ? "SELECT TOKEN" : !selectedDepositAssets[0]?.amount ? "ENTER AMOUNT" : "DEPOSIT"
+                  children: getButtonLabel()
                 }
               )
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spicenet-io/spiceflow-ui",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "Spiceflow UI SDK",
   "type": "module",
   "main": "dist/index.cjs.js",