0xtrails 0.6.4 → 0.6.6

package/src/widget/components/Fund.tsx

@@ -142,7 +142,6 @@ export const Fund: React.FC<FundProps> = ({
     setSelectedDestinationChain,
     quoteError,
     quoteErrorPrettified,
-    isSameTokenWithoutCustomCalldata,
     destinationTokenAddress,
     isValidCustomToken,
     isSenderContractOnOrigin,
@@ -829,40 +828,43 @@ export const Fund: React.FC<FundProps> = ({
             </div>
 
             {/* Origin Token Balance and Percentage Buttons */}
-            {originToken && balanceFormatted && (
-              <div className="flex items-center space-x-2">
-                <button
-                  type="button"
-                  className="text-xs text-gray-500 dark:text-gray-400 cursor-pointer hover:text-gray-700 dark:hover:text-gray-200 transition-colors bg-transparent border-none p-0"
-                  onClick={() => handlePercentageClick(100)}
-                  onKeyDown={(e) => {
-                    if (e.key === "Enter" || e.key === " ") {
-                      e.preventDefault()
-                      handlePercentageClick(100)
-                    }
-                  }}
-                  title="Click to use full balance"
-                >
-                  Balance:{" "}
-                  {isBalanceVisible ? balanceFormatted || "0.00" : "••••••"}
-                </button>
-
-                {/* Percentage Buttons */}
-                <PercentageMaxButtons
-                  userBalance={balanceFormatted}
-                  isNativeToken={originToken.contractAddress === zeroAddress}
-                  gasCostFormatted={prepareSendQuote?.gasCostFormatted}
-                  chainId={originToken.chainId}
-                  onAmountSelect={(amount) => {
-                    setTokenAmountForBackend(amount)
-                    setSendFormAmount(amount)
-                    setGlobalAmount(amount)
-                    setInputDisplayValue(amount)
-                  }}
-                  className="opacity-100"
-                />
-              </div>
-            )}
+            {originToken &&
+              balanceFormatted &&
+              fundMethod !== "qr-code" &&
+              fundMethod !== "exchange" && (
+                <div className="flex items-center space-x-2">
+                  <button
+                    type="button"
+                    className="text-xs text-gray-500 dark:text-gray-400 cursor-pointer hover:text-gray-700 dark:hover:text-gray-200 transition-colors bg-transparent border-none p-0"
+                    onClick={() => handlePercentageClick(100)}
+                    onKeyDown={(e) => {
+                      if (e.key === "Enter" || e.key === " ") {
+                        e.preventDefault()
+                        handlePercentageClick(100)
+                      }
+                    }}
+                    title="Click to use full balance"
+                  >
+                    Balance:{" "}
+                    {isBalanceVisible ? balanceFormatted || "0.00" : "••••••"}
+                  </button>
+
+                  {/* Percentage Buttons */}
+                  <PercentageMaxButtons
+                    userBalance={balanceFormatted}
+                    isNativeToken={originToken.contractAddress === zeroAddress}
+                    gasCostFormatted={prepareSendQuote?.gasCostFormatted}
+                    chainId={originToken.chainId}
+                    onAmountSelect={(amount) => {
+                      setTokenAmountForBackend(amount)
+                      setSendFormAmount(amount)
+                      setGlobalAmount(amount)
+                      setInputDisplayValue(amount)
+                    }}
+                    className="opacity-100"
+                  />
+                </div>
+              )}
           </div>
         </div>
 
@@ -1149,7 +1151,6 @@ export const Fund: React.FC<FundProps> = ({
             !destinationTokenAddress ||
             !isValidCustomToken ||
             prepareSendQuote?.noSufficientBalance ||
-            isSameTokenWithoutCustomCalldata ||
             !prepareSendQuote
           }
           className="w-full font-semibold py-4 px-4 trails-border-radius-button transition-colors bg-blue-500 hover:bg-blue-600 disabled:bg-gray-300 text-white disabled:text-gray-500 disabled:cursor-not-allowed cursor-pointer relative"
@@ -1159,8 +1160,6 @@ export const Fund: React.FC<FundProps> = ({
               <Loader2 className="w-5 h-5 animate-spin mr-2" />
               <span>{buttonText}</span>
             </div>
-          ) : isSameTokenWithoutCustomCalldata ? (
-            "Select Different Tokens"
           ) : prepareSendQuote?.noSufficientBalance ? (
             "Insufficient Balance"
           ) : !selectedRecipient ? (

package/src/widget/components/Pay.tsx

@@ -736,24 +736,15 @@ export const Pay: React.FC<PayProps> = ({
                 </div>
 
                 {/* Origin Token Balance and Percentage Buttons */}
-                {originToken && originTokenBalance?.balanceFormatted && (
-                  <div className="flex items-center space-x-2">
-                    <button
-                      type="button"
-                      className="text-xs text-gray-500 dark:text-gray-400 cursor-pointer hover:text-gray-700 dark:hover:text-gray-200 transition-colors bg-transparent border-none p-0"
-                      onClick={() => {
-                        if (originTokenBalance.balanceFormatted) {
-                          const balance = parseFloat(
-                            originTokenBalance.balanceFormatted,
-                          )
-                          if (!Number.isNaN(balance)) {
-                            setTokenAmountForBackend(balance.toFixed(6))
-                          }
-                        }
-                      }}
-                      onKeyDown={(e) => {
-                        if (e.key === "Enter" || e.key === " ") {
-                          e.preventDefault()
+                {originToken &&
+                  originTokenBalance?.balanceFormatted &&
+                  fundMethod !== "qr-code" &&
+                  fundMethod !== "exchange" && (
+                    <div className="flex items-center space-x-2">
+                      <button
+                        type="button"
+                        className="text-xs text-gray-500 dark:text-gray-400 cursor-pointer hover:text-gray-700 dark:hover:text-gray-200 transition-colors bg-transparent border-none p-0"
+                        onClick={() => {
                           if (originTokenBalance.balanceFormatted) {
                             const balance = parseFloat(
                               originTokenBalance.balanceFormatted,
@@ -762,31 +753,43 @@ export const Pay: React.FC<PayProps> = ({
                               setTokenAmountForBackend(balance.toFixed(6))
                             }
                           }
-                        }
-                      }}
-                      title="Click to use full balance"
-                    >
-                      Balance: {originTokenBalance.balanceFormatted}
-                    </button>
-
-                    {/* Percentage Buttons - Only show if toAmount is not set */}
-                    {!toAmount && (
-                      <PercentageMaxButtons
-                        userBalance={originTokenBalance.balanceFormatted}
-                        isNativeToken={
-                          originToken.contractAddress === zeroAddress ||
-                          originToken.contractAddress === undefined
-                        }
-                        gasCostFormatted={prepareSendQuote?.gasCostFormatted}
-                        chainId={originToken.chainId}
-                        onAmountSelect={(amount) => {
-                          setTokenAmountForBackend(amount)
                         }}
-                        className="opacity-100"
-                      />
-                    )}
-                  </div>
-                )}
+                        onKeyDown={(e) => {
+                          if (e.key === "Enter" || e.key === " ") {
+                            e.preventDefault()
+                            if (originTokenBalance.balanceFormatted) {
+                              const balance = parseFloat(
+                                originTokenBalance.balanceFormatted,
+                              )
+                              if (!Number.isNaN(balance)) {
+                                setTokenAmountForBackend(balance.toFixed(6))
+                              }
+                            }
+                          }
+                        }}
+                        title="Click to use full balance"
+                      >
+                        Balance: {originTokenBalance.balanceFormatted}
+                      </button>
+
+                      {/* Percentage Buttons - Only show if toAmount is not set */}
+                      {!toAmount && (
+                        <PercentageMaxButtons
+                          userBalance={originTokenBalance.balanceFormatted}
+                          isNativeToken={
+                            originToken.contractAddress === zeroAddress ||
+                            originToken.contractAddress === undefined
+                          }
+                          gasCostFormatted={prepareSendQuote?.gasCostFormatted}
+                          chainId={originToken.chainId}
+                          onAmountSelect={(amount) => {
+                            setTokenAmountForBackend(amount)
+                          }}
+                          className="opacity-100"
+                        />
+                      )}
+                    </div>
+                  )}
               </div>
             </div>
           </div>

package/src/widget/components/PoolDeposit.tsx

@@ -396,35 +396,38 @@ export const PoolDeposit: React.FC<PoolDepositProps> = ({
           )}
 
           {/* Origin Token Balance and Percentage Buttons */}
-          {originToken && balanceFormatted && (
-            <div className="flex items-center space-x-2">
-              <button
-                type="button"
-                className="text-xs text-gray-500 dark:text-gray-400 cursor-pointer hover:text-gray-700 dark:hover:text-gray-200 transition-colors bg-transparent border-none p-0"
-                onClick={() => handleAmountSelect(balanceFormatted || "0")}
-                onKeyDown={(e) => {
-                  if (e.key === "Enter" || e.key === " ") {
-                    e.preventDefault()
-                    handleAmountSelect(balanceFormatted || "0")
-                  }
-                }}
-                title="Click to use full balance"
-              >
-                Balance:{" "}
-                {isBalanceVisible ? balanceFormatted || "0.00" : "••••••"}
-              </button>
-
-              {/* Percentage Buttons */}
-              <PercentageMaxButtons
-                userBalance={balanceFormatted}
-                isNativeToken={originToken.contractAddress === zeroAddress}
-                gasCostFormatted={prepareSendQuote?.gasCostFormatted}
-                chainId={originToken.chainId}
-                onAmountSelect={handleAmountSelect}
-                className="opacity-100"
-              />
-            </div>
-          )}
+          {originToken &&
+            balanceFormatted &&
+            fundMethod !== "qr-code" &&
+            fundMethod !== "exchange" && (
+              <div className="flex items-center space-x-2">
+                <button
+                  type="button"
+                  className="text-xs text-gray-500 dark:text-gray-400 cursor-pointer hover:text-gray-700 dark:hover:text-gray-200 transition-colors bg-transparent border-none p-0"
+                  onClick={() => handleAmountSelect(balanceFormatted || "0")}
+                  onKeyDown={(e) => {
+                    if (e.key === "Enter" || e.key === " ") {
+                      e.preventDefault()
+                      handleAmountSelect(balanceFormatted || "0")
+                    }
+                  }}
+                  title="Click to use full balance"
+                >
+                  Balance:{" "}
+                  {isBalanceVisible ? balanceFormatted || "0.00" : "••••••"}
+                </button>
+
+                {/* Percentage Buttons */}
+                <PercentageMaxButtons
+                  userBalance={balanceFormatted}
+                  isNativeToken={originToken.contractAddress === zeroAddress}
+                  gasCostFormatted={prepareSendQuote?.gasCostFormatted}
+                  chainId={originToken.chainId}
+                  onAmountSelect={handleAmountSelect}
+                  className="opacity-100"
+                />
+              </div>
+            )}
         </div>
       </div>
 

package/src/widget/hooks/useSendForm.ts

@@ -171,7 +171,6 @@ export type UseSendReturn = {
   toAmountDisplay: string
   quoteError: string | null
   quoteErrorPrettified: string | null
-  isSameTokenWithoutCustomCalldata: boolean
   isRecipientContract: boolean
   isSenderContractOnOrigin: boolean
   isSenderContractOnDestination: boolean
@@ -746,7 +745,76 @@ export function useSendForm({
 
   // Get quote automatically when inputs change
   const getQuote = useCallback(async () => {
+    // Debug log: comprehensive state check
+    const debugState = {
+      account: account ? { address: account.address } : null,
+      amount,
+      amountRaw,
+      destinationTokenAddress,
+      destinationTokenAddressFromTokenSymbol,
+      isValidRecipient,
+      selectedDestToken: selectedDestToken
+        ? {
+            symbol: selectedDestToken.symbol,
+            name: selectedDestToken.name,
+            decimals: selectedDestToken.decimals,
+          }
+        : null,
+      selectedDestinationChain: selectedDestinationChain
+        ? {
+            id: selectedDestinationChain.id,
+            name: selectedDestinationChain.name,
+          }
+        : null,
+      selectedToken: selectedToken
+        ? {
+            symbol: selectedToken.symbol,
+            contractAddress: selectedToken.contractAddress,
+            chainId: selectedToken.chainId,
+            contractInfo: selectedToken.contractInfo,
+          }
+        : null,
+      isCustomToken,
+      toToken,
+      recipient,
+      conditions: {
+        hasAccount: !!account,
+        hasAmount: !!amount,
+        hasAmountRaw: !!amountRaw,
+        amountNotZero: amount !== "0",
+        amountRawNotZero: amountRaw !== "0",
+        hasDestinationTokenAddress: !!destinationTokenAddress,
+        hasDestinationTokenAddressFromSymbol:
+          !!destinationTokenAddressFromTokenSymbol,
+        isValidRecipientValue: isValidRecipient,
+        hasSelectedDestToken: !!selectedDestToken,
+        hasSelectedDestinationChain: !!selectedDestinationChain,
+        hasSelectedToken: !!selectedToken,
+      },
+      allConditionsMet:
+        !!account &&
+        !!amount &&
+        !!destinationTokenAddress &&
+        isValidRecipient &&
+        !!selectedDestToken &&
+        !!selectedDestinationChain &&
+        amount !== "0" &&
+        !!amountRaw &&
+        amountRaw !== "0" &&
+        !!selectedToken,
+    }
+
+    logger.console.log("[trails-sdk] [DEBUG] getQuote state check", debugState)
+
     // Only get quote if all required inputs are present
+    // Skip quote if origin and destination tokens are the same
+    const isSameToken =
+      selectedToken?.chainId === selectedDestinationChain?.id &&
+      selectedToken?.contractAddress?.toLowerCase() ===
+        destinationTokenAddress?.toLowerCase()
+    const isSenderSameAsRecipient =
+      account?.address?.toLowerCase() === recipient?.toLowerCase()
+
     if (
       !account ||
       !amount ||
@@ -757,10 +825,13 @@ export function useSendForm({
       amount === "0" ||
       !amountRaw ||
       amountRaw === "0" ||
-      !selectedToken
+      !selectedToken ||
+      (isSameToken &&
+        isSenderSameAsRecipient &&
+        (mode === "swap" || mode === "fund"))
     ) {
       logger.console.log(
-        "[trails-sdk] Skipping quote because of missing inputs",
+        "[trails-sdk] Skipping quote because of missing inputs or same token",
         {
           amount,
           destinationTokenAddress,
@@ -769,6 +840,8 @@ export function useSendForm({
           selectedDestinationChain,
           amountRaw,
           selectedToken,
+          isSameToken,
+          debugState,
         },
       )
       setQuoteError(null)
@@ -987,6 +1060,9 @@ export function useSendForm({
     selectedDestToken?.decimals,
     recipient,
     destinationTokenAddress,
+    destinationTokenAddressFromTokenSymbol,
+    isCustomToken,
+    toToken,
     sequenceIndexerUrl,
     selectedDestToken?.symbol,
     selectedDestinationChain?.id,
@@ -1022,6 +1098,15 @@ export function useSendForm({
   useEffect(() => {
     // Only trigger if we have the essential inputs
     // Block empty string or exactly "0"
+    // Skip quote if origin and destination tokens are the same
+    const isSameToken =
+      selectedToken?.chainId === selectedDestinationChain?.id &&
+      selectedToken?.contractAddress?.toLowerCase() ===
+        destinationTokenAddress?.toLowerCase()
+
+    const isSenderSameAsRecipient =
+      account?.address?.toLowerCase() === recipient?.toLowerCase()
+
     if (
       !amount ||
       amount === "0" ||
@@ -1029,7 +1114,10 @@ export function useSendForm({
       !isValidRecipient ||
       !selectedDestToken?.symbol ||
       !selectedDestinationChain?.id ||
-      !selectedToken
+      !selectedToken ||
+      (isSameToken &&
+        isSenderSameAsRecipient &&
+        (mode === "swap" || mode === "fund"))
     ) {
       setPrepareSendResult(null)
       latestResolvedIntentIdRef.current = null
@@ -1438,40 +1526,6 @@ export function useSendForm({
     }
   }, [quoteError])
 
-  // Check if origin and destination tokens are the same (same contract address on same chain)
-  // Only block same-token transactions when there's no custom calldata AND recipient is the same as sender
-  const isSameTokenWithoutCustomCalldata = useMemo(() => {
-    if (
-      !selectedToken ||
-      !selectedToken.contractAddress ||
-      !destinationTokenAddress ||
-      !selectedToken?.chainId ||
-      !selectedDestinationChain?.id
-    ) {
-      return false
-    }
-    const isSameChainAndToken =
-      selectedToken.contractAddress.toLowerCase() ===
-        destinationTokenAddress.toLowerCase() &&
-      selectedToken.chainId === selectedDestinationChain?.id
-
-    // Allow same-token transactions if:
-    // 1. There's custom calldata (e.g., NFT minting)
-    // 2. Recipient is different from sender (simple transfer to another address)
-    const recipientIsSameAsSender =
-      recipient?.toLowerCase() === account?.address?.toLowerCase()
-
-    return isSameChainAndToken && !toCalldata && recipientIsSameAsSender
-  }, [
-    selectedToken,
-    destinationTokenAddress,
-    selectedDestinationChain,
-    toCalldata,
-    selectedToken?.chainId,
-    recipient,
-    account?.address,
-  ])
-
   return {
     amount,
     amountRaw,
@@ -1517,7 +1571,6 @@ export function useSendForm({
     prepareSendQuote: prepareSendResult?.quote ?? null,
     quoteError,
     quoteErrorPrettified,
-    isSameTokenWithoutCustomCalldata,
     isRecipientContract,
     isSenderContractOnOrigin,
     isSenderContractOnDestination,