From 8fd6969aa0095a5d6818003c69d9c3de24eb958c Mon Sep 17 00:00:00 2001
From: Anxo Rodriguez
Date: Wed, 19 Jan 2022 19:08:38 +0000
Subject: [PATCH 1/2] Add claiming status
---
src/custom/pages/Claim/ClaimingStatus.tsx | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/custom/pages/Claim/ClaimingStatus.tsx b/src/custom/pages/Claim/ClaimingStatus.tsx
index 830812939..dec592fb5 100644
--- a/src/custom/pages/Claim/ClaimingStatus.tsx
+++ b/src/custom/pages/Claim/ClaimingStatus.tsx
@@ -6,12 +6,21 @@ import { useClaimState } from 'state/claim/hooks'
import { useActiveWeb3React } from 'hooks/web3'
import CowProtocolLogo from 'components/CowProtocolLogo'
import Circle from 'assets/images/blue-loader.svg'
+import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
+import { useAllClaimingTransactions } from '@src/custom/state/enhancedTransactions/hooks'
+import { useMemo } from 'react'
// import { formatSmart } from 'utils/format'
export default function ClaimingStatus() {
const { chainId } = useActiveWeb3React()
const { activeClaimAccount, claimStatus /* , claimedAmount */ } = useClaimState()
+ const allClaimTxs = useAllClaimingTransactions()
+ const lastClaimTx = useMemo(() => {
+ const numClaims = allClaimTxs.length
+ return numClaims > 0 ? allClaimTxs[numClaims - 1] : undefined
+ }, [allClaimTxs])
+
// claim status
const isConfirmed = claimStatus === ClaimStatus.CONFIRMED
const isAttempting = claimStatus === ClaimStatus.ATTEMPTING
@@ -55,11 +64,9 @@ export default function ClaimingStatus() {
)}
- {isSubmitted && chainId && (
- // && claimTxn?.hash
+ {isSubmitted && chainId && lastClaimTx?.hash && (
View transaction on Explorer
From 8efe19e75192e0c862699508f0a4ed9e5e25f069 Mon Sep 17 00:00:00 2001
From: Anxo Rodriguez
Date: Thu, 20 Jan 2022 12:32:28 +0100
Subject: [PATCH 2/2] Update src/custom/pages/Claim/ClaimingStatus.tsx
Co-authored-by: Leandro Boscariol
---
src/custom/pages/Claim/ClaimingStatus.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/custom/pages/Claim/ClaimingStatus.tsx b/src/custom/pages/Claim/ClaimingStatus.tsx
index dec592fb5..2cd08a145 100644
--- a/src/custom/pages/Claim/ClaimingStatus.tsx
+++ b/src/custom/pages/Claim/ClaimingStatus.tsx
@@ -7,7 +7,7 @@ import { useActiveWeb3React } from 'hooks/web3'
import CowProtocolLogo from 'components/CowProtocolLogo'
import Circle from 'assets/images/blue-loader.svg'
import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
-import { useAllClaimingTransactions } from '@src/custom/state/enhancedTransactions/hooks'
+import { useAllClaimingTransactions } from 'state/enhancedTransactions/hooks'
import { useMemo } from 'react'
// import { formatSmart } from 'utils/format'