From 82dc863b98ad8e6feb536895d5617351c4cb64ca Mon Sep 17 00:00:00 2001 From: Anxo Rodriguez Date: Sun, 23 Jan 2022 21:28:54 +0000 Subject: [PATCH 1/3] Add link to the profile --- src/custom/pages/Claim/ClaimingStatus.tsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/custom/pages/Claim/ClaimingStatus.tsx b/src/custom/pages/Claim/ClaimingStatus.tsx index 62a5e4f59..9af515d93 100644 --- a/src/custom/pages/Claim/ClaimingStatus.tsx +++ b/src/custom/pages/Claim/ClaimingStatus.tsx @@ -8,10 +8,11 @@ import CowProtocolLogo from 'components/CowProtocolLogo' import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink' import { useAllClaimingTransactions } from 'state/enhancedTransactions/hooks' import { useMemo } from 'react' +import { Link } from 'react-router-dom' // import { formatSmartLocationAware } from 'utils/format' export default function ClaimingStatus() { - const { chainId } = useActiveWeb3React() + const { chainId, account } = useActiveWeb3React() const { activeClaimAccount, claimStatus /* , claimedAmount */ } = useClaimState() const allClaimTxs = useAllClaimingTransactions() @@ -24,8 +25,9 @@ export default function ClaimingStatus() { const isConfirmed = claimStatus === ClaimStatus.CONFIRMED const isAttempting = claimStatus === ClaimStatus.ATTEMPTING const isSubmitted = claimStatus === ClaimStatus.SUBMITTED + const isSelfClaiming = account === activeClaimAccount - if (!activeClaimAccount || claimStatus === ClaimStatus.DEFAULT) return null + if (!account || !activeClaimAccount || claimStatus === ClaimStatus.DEFAULT) return null return ( @@ -60,6 +62,11 @@ export default function ClaimingStatus() { 🐄🎉 + {isSelfClaiming && ( + + You can see your balance in the Profile + + )} )} {isAttempting && ( From b4a23f72a1bf6175f54a4cc52ac553963c2b4422 Mon Sep 17 00:00:00 2001 From: Anxo Rodriguez Date: Mon, 24 Jan 2022 19:11:52 +0000 Subject: [PATCH 2/3] Update link --- src/custom/pages/Claim/ClaimingStatus.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/custom/pages/Claim/ClaimingStatus.tsx b/src/custom/pages/Claim/ClaimingStatus.tsx index 9af515d93..4df38e067 100644 --- a/src/custom/pages/Claim/ClaimingStatus.tsx +++ b/src/custom/pages/Claim/ClaimingStatus.tsx @@ -9,6 +9,7 @@ import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink' import { useAllClaimingTransactions } from 'state/enhancedTransactions/hooks' import { useMemo } from 'react' import { Link } from 'react-router-dom' +import { ExplorerLink } from 'components/ExplorerLink' // import { formatSmartLocationAware } from 'utils/format' export default function ClaimingStatus() { @@ -62,9 +63,14 @@ export default function ClaimingStatus() { 🐄🎉 - {isSelfClaiming && ( + {isSelfClaiming ? ( - You can see your balance in the Profile + You can see your vCOW balance in the Profile + + ) : ( + + You have just claimed on behalf of{' '} + )} From 0fa78591b3f2340a24b8e1614633dcddca6a0af2 Mon Sep 17 00:00:00 2001 From: Lint Action Date: Mon, 24 Jan 2022 19:17:04 +0000 Subject: [PATCH 3/3] Fix code style issues with Prettier --- src/custom/pages/Claim/InvestmentFlow/index.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/custom/pages/Claim/InvestmentFlow/index.tsx b/src/custom/pages/Claim/InvestmentFlow/index.tsx index c24daf667..f6f5e954a 100644 --- a/src/custom/pages/Claim/InvestmentFlow/index.tsx +++ b/src/custom/pages/Claim/InvestmentFlow/index.tsx @@ -57,8 +57,8 @@ export type InvestOptionProps = { claim: EnhancedUserClaimData optionIndex: number approveData: - | { approveState: ApprovalState; approveCallback: (optionalParams?: OptionalApproveCallbackParams) => void } - | undefined + | { approveState: ApprovalState; approveCallback: (optionalParams?: OptionalApproveCallbackParams) => void } + | undefined } type InvestmentFlowProps = Pick & { @@ -198,8 +198,8 @@ export default function InvestmentFlow({ hasClaims, isAirdropOnly, ...tokenAppro {investFlowStep === 0 ? 'Claim and invest' : investFlowStep === 1 - ? 'Set allowance to Buy vCOW' - : 'Confirm transaction to claim all vCOW'} + ? 'Set allowance to Buy vCOW' + : 'Confirm transaction to claim all vCOW'} {investFlowStep === 0 && (