0xtrails 0.8.0 → 0.8.2

package/src/widget/components/AccountIntentTransactionHistory.tsx

@@ -14,9 +14,8 @@ import { useConnections, useAccount, useWalletClient } from "wagmi"
 import { ChevronDown } from "lucide-react"
 import { getExplorerUrl } from "../../explorer.js"
 import { ErrorDisplay } from "./ErrorDisplay.js"
-import { attemptSwitchChain } from "../../chainSwitch.js"
 import { logger } from "../../logger.js"
-import { useTrailsRefund } from "../../refund.js"
+import { useIntentRecover } from "../../recover.js"
 
 interface AccountIntentTransactionHistoryProps {
   accountAddress?: string
@@ -71,27 +70,18 @@ const TransactionItem: React.FC<{
   // Track refund transaction hash per intent
   const [refundTxHash, setRefundTxHash] = useState<`0x${string}` | null>(null)
 
-  // Check if intent is not completed
-  const isCompleted =
-    transaction.executionStatus === "executed" ||
-    transaction.executionStatus === "completed" ||
-    transaction.executionStatus === "succeeded"
-
-  // Hook for refunding intents (recover) - call early to get hasIntentBalance
+  // Hook for recovering intents - call early to get hasIntentBalance
+  // Always check balances regardless of execution status, but skip if already refunded
   const {
-    signPayload,
-    getRefundTx,
+    recover,
     isLoadingIntent,
     isLoadingBalances,
     intentError,
     balancesError,
     hasIntentBalance,
     refetchIntent,
-  } = useTrailsRefund({
-    intentId:
-      !isCompleted && transaction.intentId && !refundTxHash
-        ? transaction.intentId
-        : "",
+  } = useIntentRecover({
+    intentId: transaction.intentId && !refundTxHash ? transaction.intentId : "",
     walletClient: walletClient || undefined,
   })
 
@@ -102,24 +92,15 @@ const TransactionItem: React.FC<{
     return () => {
       onRefetch()
       // Refetch intent data and balances to update recover button state
-      if (!isCompleted && transaction.intentId && !refundTxHash) {
+      if (transaction.intentId && !refundTxHash) {
         refetchIntent()
       }
     }
-  }, [
-    onRefetch,
-    isCompleted,
-    transaction.intentId,
-    refundTxHash,
-    refetchIntent,
-  ])
+  }, [onRefetch, transaction.intentId, refundTxHash, refetchIntent])
 
+  // Allow recovery for any intent with balances, regardless of execution status
   const canRecover =
-    !isCompleted &&
-    transaction.intentId &&
-    walletClient &&
-    !refundTxHash &&
-    hasIntentBalance
+    transaction.intentId && walletClient && !refundTxHash && hasIntentBalance
 
   const [isRecovering, setIsRecovering] = useState(false)
   const [recoverError, setRecoverError] = useState<string | null>(null)
@@ -136,36 +117,16 @@ const TransactionItem: React.FC<{
       setIsRecovering(true)
       setRecoverError(null)
 
-      // Sign the payload
-      const { signature, payload } = await signPayload()
-
-      // Get the refund transaction
-      const refundTx = await getRefundTx({
-        signedHash: signature,
-        payload,
-      })
-
-      // Ensure we're on the correct chain before sending
-      // attemptSwitchChain already checks if we're on the correct chain
-      await attemptSwitchChain({
-        walletClient,
-        desiredChainId: refundTx.chainId,
-      })
-
-      // Send the refund transaction with explicit chain
-      const hash = await walletClient.sendTransaction({
-        to: refundTx.to,
-        data: refundTx.data,
-        chain: refundTx.chain,
-      })
+      // Use the recover method which handles everything automatically
+      const { txHash } = await recover()
 
       logger.console.log(
-        "[AccountIntentTransactionHistory] Refund transaction sent",
-        { intentId: transaction.intentId, hash },
+        "[AccountIntentTransactionHistory] Recover transaction sent",
+        { intentId: transaction.intentId, txHash },
       )
 
       // Store the transaction hash to show explorer link
-      setRefundTxHash(hash)
+      setRefundTxHash(txHash)
       setRecoverError(null)
 
       // Refetch history after recovery

package/dist/refund.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"refund.d.ts","sourceRoot":"","sources":["../src/refund.ts"],"names":[],"mappings":"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"}