Update claimed status checks to compare against value 3

layerswap · Dec 2, 2024 · b99544c · b99544c
1 parent 7b84ec3
commit b99544c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/components/Swap/AtomicChat/Actions/Redeem.tsx b/components/Swap/AtomicChat/Actions/Redeem.tsx
@@ -30,7 +30,7 @@ export const RedeemAction: FC = () => {
                         contractAddress: destination_contract as `0x${string}`,
                     }) : null
                     if (data) setDestinationDetails(data)
-                    if (data?.claimed) {
+                    if (data?.claimed == 3) {
                         clearInterval(commitHandler)
                     }
                 }, 5000)
@@ -56,7 +56,7 @@ export const RedeemAction: FC = () => {
                         contractAddress: source_contract as `0x${string}`,
                     }) : null
                     if (data) setSourceDetails(data)
-                    if (data?.claimed) {
+                    if (data?.claimed == 3) {
                         clearInterval(commitHandler)
                     }
                 }, 5000)

diff --git a/components/Swap/AtomicChat/Resolver.tsx b/components/Swap/AtomicChat/Resolver.tsx
@@ -165,7 +165,7 @@ export const ResolveMessages: FC = () => {
 
     const assetsLocked = sourceDetails?.hashlock && destinationDetails?.hashlock ? true : false;
 
-    const redeemCompleted = (destinationDetails?.claimed ? true : false) || lpRedeemTransaction?.hash;
+    const redeemCompleted = (destinationDetails?.claimed == 3 ? true : false) || lpRedeemTransaction?.hash;
     const { getWithdrawalProvider } = useWallet()
     const source_provider = source_network && getWithdrawalProvider(source_network)
     const wallet = source_provider?.getConnectedWallet()
@@ -271,7 +271,7 @@ const ResolveAction: FC = () => {
     const commited = sourceDetails ? true : false;
     const lpLockDetected = destinationDetails?.hashlock ? true : false;
     const assetsLocked = sourceDetails?.hashlock && destinationDetails?.hashlock ? true : false;
-    const redeemCompleted = (destinationDetails?.claimed ? true : false) || lpRedeemTransaction?.hash;
+    const redeemCompleted = (destinationDetails?.claimed == 3 ? true : false) || lpRedeemTransaction?.hash;
 
     if (error) {
         return <div className="w-full flex flex-col gap-4">
@@ -354,7 +354,7 @@ export const ActionsWithProgressbar: FC = () => {
     }
     const lpRedeemTransaction = commitFromApi?.transactions.find(t => t.type === 'redeem' && t.network === destination_network?.name)
 
-    const allDone = ((sourceDetails?.hashlock && destinationDetails?.claimed) || lpRedeemTransaction?.hash) ? true : false
+    const allDone = ((sourceDetails?.hashlock && destinationDetails?.claimed == 3) || lpRedeemTransaction?.hash) ? true : false
     const showSteps = !allDone && !isTimelockExpired
     const timelock = sourceDetails?.timelock || sourceDetails?.timelock
 

diff --git a/components/Swap/CommitmentsHistory/index.tsx b/components/Swap/CommitmentsHistory/index.tsx
@@ -25,7 +25,7 @@ type CommitStatus = 'committed' | 'user_locked' | 'lp_locked' | 'completed' | 'r
 
 const commitStatusResolver = (commit: Commit, destination_details: Commit | undefined | null): CommitStatus => {
 
-    if (destination_details?.claimed || commit?.claimed) return 'completed'
+    if (destination_details?.claimed == 3 || commit?.claimed == 3) return 'completed'
     //TODO check&implement source lock refund
     else if (commit.claimed == 2) return 'refunded'
     else if (commit.timelock && Number(commit.timelock) * 1000 < Date.now()) return 'timelock_expired'