Merge pull request #2075 from gnosis/claim-pending-update

Claim pending update

src/custom/pages/Claim/ClaimSummary.tsx

@@ -31,7 +31,7 @@ export default function ClaimSummary({ hasClaims, unclaimedAmount }: ClaimSummar
         <div>
           <ClaimTotal>
             <b>Total available to claim</b>
-            <p>{formatSmart(unclaimedAmount)} vCOW</p>
+            <p>{formatSmart(unclaimedAmount) ?? 0} vCOW</p>
           </ClaimTotal>
         </div>
       )}

src/custom/state/claim/hooks/index.ts

@@ -23,6 +23,7 @@ import { SupportedChainId } from 'constants/chains'
 import { registerOnWindow } from 'utils/misc'
 import mockData, { MOCK_INDICES } from './mocks/claimData'
 import { getIndexes } from './utils'
+import { useAllClaimingTransactionIndices } from 'state/enhancedTransactions/hooks'
 
 export { useUserClaimData } from '@src/state/claim/hooks'
 
@@ -194,13 +195,18 @@ export function useUserHasAvailableClaim(account: Account): boolean {
 export function useUserUnclaimedAmount(account: string | null | undefined): CurrencyAmount<Token> | undefined {
   const { chainId } = useActiveWeb3React()
   const claims = useUserAvailableClaims(account)
+  const pendingIndices = useAllClaimingTransactionIndices()
 
   const vCow = chainId ? V_COW[chainId] : undefined
   if (!vCow) return undefined
   if (!claims || claims.length === 0) {
     return CurrencyAmount.fromRawAmount(vCow, JSBI.BigInt(0))
   }
+
   const totalAmount = claims.reduce((acc, claim) => {
+    // don't add pending
+    if (pendingIndices.has(claim.index)) return acc
+
     return JSBI.add(acc, JSBI.BigInt(claim.amount))
   }, JSBI.BigInt('0'))