From c039198f62657d7a2b283bf4c7fbd6da94ac8619 Mon Sep 17 00:00:00 2001 From: Leandro Date: Thu, 27 Jan 2022 14:21:56 -0800 Subject: [PATCH 1/3] Check pending claims for disconnected accounts --- src/custom/state/claim/updater.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/custom/state/claim/updater.tsx b/src/custom/state/claim/updater.tsx index bb4eff9fe..dfa298c29 100644 --- a/src/custom/state/claim/updater.tsx +++ b/src/custom/state/claim/updater.tsx @@ -1,14 +1,15 @@ import { useEffect } from 'react' import { SupportedChainId } from 'constants/chains' import { useActiveWeb3React } from 'hooks/web3' -import { useClaimDispatchers, useUserAvailableClaims } from './hooks' +import { useClaimDispatchers, useClaimState, useUserAvailableClaims } from './hooks' export default function Updater() { const { account } = useActiveWeb3React() + const { activeClaimAccount } = useClaimState() const { setHasClaimsOnOtherChains } = useClaimDispatchers() - const mainnetAvailable = useUserAvailableClaims(account, SupportedChainId.MAINNET) - const gnosisAvailable = useUserAvailableClaims(account, SupportedChainId.XDAI) + const mainnetAvailable = useUserAvailableClaims(activeClaimAccount || account, SupportedChainId.MAINNET) + const gnosisAvailable = useUserAvailableClaims(activeClaimAccount || account, SupportedChainId.XDAI) useEffect(() => { setHasClaimsOnOtherChains({ chain: SupportedChainId.MAINNET, hasClaims: mainnetAvailable.length > 0 }) From 876860ac55a1748e74391026dd17c61f3cf940fc Mon Sep 17 00:00:00 2001 From: Leandro Date: Fri, 28 Jan 2022 08:21:53 -0800 Subject: [PATCH 2/3] Updated claims available banner message to indicate it's the checked account --- src/custom/pages/Claim/ClaimsOnOtherChainsBanner.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/custom/pages/Claim/ClaimsOnOtherChainsBanner.tsx b/src/custom/pages/Claim/ClaimsOnOtherChainsBanner.tsx index 40b4cd44e..4de6f9aa8 100644 --- a/src/custom/pages/Claim/ClaimsOnOtherChainsBanner.tsx +++ b/src/custom/pages/Claim/ClaimsOnOtherChainsBanner.tsx @@ -72,7 +72,7 @@ function ClaimsOnOtherChainsBanner({ className }: { className?: string }) { -
You have other available claims on
+
This account has available claims on
{chainsWithClaims.map((chainId, index, array) => { const changeNetworksCallback = () => callback(chainId) From e1e1a0633f7b1842443c7fced601fb8f8e947407 Mon Sep 17 00:00:00 2001 From: Leandro Date: Fri, 28 Jan 2022 08:22:23 -0800 Subject: [PATCH 3/3] Checking only the active claim address for other chains --- src/custom/state/claim/updater.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/custom/state/claim/updater.tsx b/src/custom/state/claim/updater.tsx index dfa298c29..0aa1b7289 100644 --- a/src/custom/state/claim/updater.tsx +++ b/src/custom/state/claim/updater.tsx @@ -1,15 +1,13 @@ import { useEffect } from 'react' import { SupportedChainId } from 'constants/chains' -import { useActiveWeb3React } from 'hooks/web3' import { useClaimDispatchers, useClaimState, useUserAvailableClaims } from './hooks' export default function Updater() { - const { account } = useActiveWeb3React() const { activeClaimAccount } = useClaimState() const { setHasClaimsOnOtherChains } = useClaimDispatchers() - const mainnetAvailable = useUserAvailableClaims(activeClaimAccount || account, SupportedChainId.MAINNET) - const gnosisAvailable = useUserAvailableClaims(activeClaimAccount || account, SupportedChainId.XDAI) + const mainnetAvailable = useUserAvailableClaims(activeClaimAccount, SupportedChainId.MAINNET) + const gnosisAvailable = useUserAvailableClaims(activeClaimAccount, SupportedChainId.XDAI) useEffect(() => { setHasClaimsOnOtherChains({ chain: SupportedChainId.MAINNET, hasClaims: mainnetAvailable.length > 0 })