diff --git a/packages/page-parachains/src/Crowdloan/Fund.tsx b/packages/page-parachains/src/Crowdloan/Fund.tsx index 1e423be42c..fedbe9fef2 100644 --- a/packages/page-parachains/src/Crowdloan/Fund.tsx +++ b/packages/page-parachains/src/Crowdloan/Fund.tsx @@ -3,7 +3,7 @@ import type BN from 'bn.js'; import type { EventRecord, ParaId } from '@polkadot/types/interfaces'; -import type { Campaign } from '../types'; +import type { Campaign, LeasePeriod } from '../types'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; @@ -20,6 +20,7 @@ interface Props { bestNumber?: BN; className?: string; isOngoing?: boolean; + leasePeriod?: LeasePeriod; value: Campaign; } @@ -28,7 +29,7 @@ interface Contributions { myAccounts?: string[]; } -function Fund ({ bestNumber, className, isOngoing, value: { childKey, info: { cap, depositor, end, firstSlot, lastSlot, raised, retiring }, isCapped, isEnded, isRetired, isWinner, paraId, retireEnd } }: Props): React.ReactElement { +function Fund ({ bestNumber, className, isOngoing, leasePeriod, value: { childKey, info: { cap, depositor, end, firstSlot, lastSlot, raised, retiring }, isCapped, isEnded, isRetired, isWinner, paraId, retireEnd } }: Props): React.ReactElement { const { t } = useTranslation(); const { api } = useApi(); const { allAccounts } = useAccounts(); @@ -87,7 +88,7 @@ function Fund ({ bestNumber, className, isOngoing, value: { childKey, info: { ca ); const canContribute = isOngoing && blocksLeft && !isCapped && !isWinner && retiring.isFalse; - const canDissolve = raised.isZero() || isRetired; + const canDissolve = raised.isZero() || (isRetired && (!isWinner || !leasePeriod || lastSlot.lt(leasePeriod.currentPeriod))); return ( diff --git a/packages/page-parachains/src/Crowdloan/Funds.tsx b/packages/page-parachains/src/Crowdloan/Funds.tsx index 4357b04e13..df4f94bea5 100644 --- a/packages/page-parachains/src/Crowdloan/Funds.tsx +++ b/packages/page-parachains/src/Crowdloan/Funds.tsx @@ -87,6 +87,7 @@ function Funds ({ bestNumber, className, leasePeriod, value }: Props): React.Rea ))}