From 288c6d2f5df805cb4ec85846a707e0251c9f12d2 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sun, 11 Apr 2021 12:41:05 +0300
Subject: [PATCH] Re-allow cancel when no funds raised (#5051)

* Re-allow cancel when no funds raised

* Remove unused check

* Update packages/page-parachains/src/Overview/Parachains.tsx
---
 .../page-parachains/src/Auctions/Summary.tsx  |  2 +-
 .../page-parachains/src/Crowdloan/Fund.tsx    |  4 ++--
 .../src/Overview/Parachains.tsx               |  4 ++--
 .../src/Parathreads/Actions.tsx               | 21 +++++++------------
 .../src/Parathreads/Parathread.tsx            |  2 +-
 packages/page-parachains/src/index.tsx        |  2 +-
 .../page-parachains/src/useAuctionInfo.tsx    |  4 ++--
 packages/page-parachains/src/useFunds.ts      |  4 ++--
 packages/page-parachains/src/useHrmp.ts       |  6 +++---
 packages/page-parachains/src/useOwnedIds.ts   |  4 ++--
 packages/page-parachains/src/useRanges.ts     |  2 +-
 .../page-parachains/src/useUpcomingIds.ts     |  2 +-
 .../page-parachains/src/useWinningData.ts     |  6 +++---
 13 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/packages/page-parachains/src/Auctions/Summary.tsx b/packages/page-parachains/src/Auctions/Summary.tsx
index ce4662d854..d55cd2dcfc 100644
--- a/packages/page-parachains/src/Auctions/Summary.tsx
+++ b/packages/page-parachains/src/Auctions/Summary.tsx
@@ -23,7 +23,7 @@ function Summary ({ auctionInfo, className, lastWinners }: Props): React.ReactEl
   const { t } = useTranslation();
   const { api } = useApi();
   const bestNumber = useBestNumber();
-  const totalIssuance = useCall<Balance>(api.query.balances?.totalIssuance);
+  const totalIssuance = useCall<Balance>(api.query.balances.totalIssuance);
 
   return (
     <SummaryBox className={className}>
diff --git a/packages/page-parachains/src/Crowdloan/Fund.tsx b/packages/page-parachains/src/Crowdloan/Fund.tsx
index 044c4fcac4..17865cf16c 100644
--- a/packages/page-parachains/src/Crowdloan/Fund.tsx
+++ b/packages/page-parachains/src/Crowdloan/Fund.tsx
@@ -48,7 +48,7 @@ function Fund ({ bestNumber, className, isOngoing, leasePeriod, value: { childKe
   const { api } = useApi();
   const { allAccounts, isAccount } = useAccounts();
   const [{ myAccounts, uniqueKeys }, setContributors] = useState<Contributions>(NO_CONTRIB);
-  const trigger = useEventTrigger([api.events.crowdloan?.Contributed, api.events.crowdloan?.Withdrew, api.events.crowdloan?.AllRefunded, api.events.crowdloan?.PartiallyRefunded], useCallback(
+  const trigger = useEventTrigger([api.events.crowdloan.Contributed, api.events.crowdloan.Withdrew, api.events.crowdloan.AllRefunded, api.events.crowdloan.PartiallyRefunded], useCallback(
     ({ event: { data } }: EventRecord) =>
       ((data.length === 1
         ? data[0] // AllRefunded, PartiallyRefunded [ParaId]
@@ -92,7 +92,7 @@ function Fund ({ bestNumber, className, isOngoing, leasePeriod, value: { childKe
       : leasePeriod.currentPeriod.gt(firstSlot)
   );
   const canContribute = isOngoing && !isCapped && !isWinner && !!blocksLeft;
-  const canDissolve = raised.isZero() && hasEnded;
+  const canDissolve = raised.isZero();
   const canWithdraw = !raised.isZero() && hasEnded;
 
   return (
diff --git a/packages/page-parachains/src/Overview/Parachains.tsx b/packages/page-parachains/src/Overview/Parachains.tsx
index 704134b14b..c8e2961bb0 100644
--- a/packages/page-parachains/src/Overview/Parachains.tsx
+++ b/packages/page-parachains/src/Overview/Parachains.tsx
@@ -150,9 +150,9 @@ function Parachains ({ actionsQueue, ids, leasePeriod, scheduled }: Props): Reac
   const lastBlock = useCall<SignedBlockExtended>(api.derive.chain.subscribeNewBlocks);
   const [{ lastBacked, lastIncluded, lastTimeout }, setLastEvents] = useState<LastEvents>(EMPTY_EVENTS);
   const [validators, validatorGroups, activeIndices] = useCallMulti<MultiResult>([
-    api.query.session?.validators,
+    api.query.session.validators,
     api.query.paraScheduler?.validatorGroups || api.query.scheduler?.validatorGroups,
-    api.query.shared?.activeValidatorIndices
+    api.query.shared.activeValidatorIndices
   ], optionsMulti);
   const hrmp = useHrmp();
   const hasLinksMap = useIsParasLinked(ids);
diff --git a/packages/page-parachains/src/Parathreads/Actions.tsx b/packages/page-parachains/src/Parathreads/Actions.tsx
index 2129ccc591..c900bb85c1 100644
--- a/packages/page-parachains/src/Parathreads/Actions.tsx
+++ b/packages/page-parachains/src/Parathreads/Actions.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 
 import { Button } from '@polkadot/react-components';
-import { useApi, useToggle } from '@polkadot/react-hooks';
+import { useToggle } from '@polkadot/react-hooks';
 
 import { useTranslation } from '../translate';
 import RegisterThread from './RegisterThread';
@@ -15,22 +15,17 @@ interface Props {
 
 function Actions ({ className }: Props): React.ReactElement<Props> {
   const { t } = useTranslation();
-  const { api } = useApi();
   const [isRegisterOpen, toggleRegisterOpen] = useToggle();
 
   return (
     <Button.Group className={className}>
-      {api.tx.registrar?.register && (
-        <>
-          <Button
-            icon='plus'
-            label={t<string>('Register')}
-            onClick={toggleRegisterOpen}
-          />
-          {isRegisterOpen && (
-            <RegisterThread onClose={toggleRegisterOpen} />
-          )}
-        </>
+      <Button
+        icon='plus'
+        label={t<string>('Register')}
+        onClick={toggleRegisterOpen}
+      />
+      {isRegisterOpen && (
+        <RegisterThread onClose={toggleRegisterOpen} />
       )}
     </Button.Group>
   );
diff --git a/packages/page-parachains/src/Parathreads/Parathread.tsx b/packages/page-parachains/src/Parathreads/Parathread.tsx
index 884f8d0739..db85276825 100644
--- a/packages/page-parachains/src/Parathreads/Parathread.tsx
+++ b/packages/page-parachains/src/Parathreads/Parathread.tsx
@@ -56,7 +56,7 @@ function Upcoming ({ id, leasePeriod, leases, nextAction }: Props): React.ReactE
     [api.query.paras.heads, id],
     [api.query.paras.upcomingParasGenesis, id],
     [api.query.paras.paraLifecycles, id],
-    [api.query.registrar?.paras, id]
+    [api.query.registrar.paras, id]
   ], optMulti);
 
   const periods = useMemo(
diff --git a/packages/page-parachains/src/index.tsx b/packages/page-parachains/src/index.tsx
index b93abbea63..1f49340be1 100644
--- a/packages/page-parachains/src/index.tsx
+++ b/packages/page-parachains/src/index.tsx
@@ -43,7 +43,7 @@ function ParachainsApp ({ basePath, className }: Props): React.ReactElement<Prop
   const proposals = useProposals();
   const actionsQueue = useActionsQueue();
   const upcomingIds = useUpcomingIds();
-  const paraIds = useCall<ParaId[]>(api.query.paras?.parachains);
+  const paraIds = useCall<ParaId[]>(api.query.paras.parachains);
 
   const items = useRef([
     {
diff --git a/packages/page-parachains/src/useAuctionInfo.tsx b/packages/page-parachains/src/useAuctionInfo.tsx
index 29b99c9480..7b2df236dc 100644
--- a/packages/page-parachains/src/useAuctionInfo.tsx
+++ b/packages/page-parachains/src/useAuctionInfo.tsx
@@ -24,7 +24,7 @@ export default function useAuctionInfo (): AuctionInfo | undefined {
   const { api } = useApi();
 
   return useCallMulti<AuctionInfo>([
-    api.query.auctions?.auctionCounter,
-    api.query.auctions?.auctionInfo
+    api.query.auctions.auctionCounter,
+    api.query.auctions.auctionInfo
   ], optionsMulti);
 }
diff --git a/packages/page-parachains/src/useFunds.ts b/packages/page-parachains/src/useFunds.ts
index 0c57cf365d..2f4b7d977e 100644
--- a/packages/page-parachains/src/useFunds.ts
+++ b/packages/page-parachains/src/useFunds.ts
@@ -161,8 +161,8 @@ export default function useFunds (): Campaigns {
   const { api } = useApi();
   const bestNumber = useBestNumber();
   const [paraIds, setParaIds] = useState<ParaId[]>([]);
-  const trigger = useEventTrigger([api.events.crowdloan?.Created]);
-  const campaigns = useCall<Campaign[]>(api.query.crowdloan?.funds.multi, [paraIds], optFundMulti);
+  const trigger = useEventTrigger([api.events.crowdloan.Created]);
+  const campaigns = useCall<Campaign[]>(api.query.crowdloan.funds.multi, [paraIds], optFundMulti);
   const leases = useCall<ParaId[]>(api.query.slots.leases.multi, [paraIds], optLeaseMulti);
   const [result, setResult] = useState<Campaigns>(EMPTY);
 
diff --git a/packages/page-parachains/src/useHrmp.ts b/packages/page-parachains/src/useHrmp.ts
index 06071f8d9f..8876c8bbbd 100644
--- a/packages/page-parachains/src/useHrmp.ts
+++ b/packages/page-parachains/src/useHrmp.ts
@@ -30,12 +30,12 @@ const optChannels = {
 export default function useHrmp (): AllChannels | undefined {
   const { api } = useApi();
   const [channelIds, setChannelIds] = useState<HrmpChannelId[] | null>(null);
-  const trigger = useEventTrigger([api.events.hrmp?.OpenChannelAccepted, api.events.hrmp?.ChannelClosed]);
-  const allChannels = useCall<AllChannels>(channelIds && api.query.hrmp?.hrmpChannels.multi, [channelIds], optChannels);
+  const trigger = useEventTrigger([api.events.hrmp.OpenChannelAccepted, api.events.hrmp.ChannelClosed]);
+  const allChannels = useCall<AllChannels>(channelIds && api.query.hrmp.hrmpChannels.multi, [channelIds], optChannels);
 
   useEffect((): void => {
     trigger &&
-      api.query.hrmp?.hrmpChannels
+      api.query.hrmp.hrmpChannels
         .keys<[HrmpChannelId]>()
         .then((keys) => setChannelIds(keys.map(({ args: [id] }) => id)))
         .catch(console.error);
diff --git a/packages/page-parachains/src/useOwnedIds.ts b/packages/page-parachains/src/useOwnedIds.ts
index e803876056..debbf8e01f 100644
--- a/packages/page-parachains/src/useOwnedIds.ts
+++ b/packages/page-parachains/src/useOwnedIds.ts
@@ -12,12 +12,12 @@ import { useAccounts, useApi, useEventTrigger } from '@polkadot/react-hooks';
 export default function useOwnedIds (): OwnedId[] {
   const { api } = useApi();
   const { allAccounts } = useAccounts();
-  const trigger = useEventTrigger([api.events.registrar?.Registered]);
+  const trigger = useEventTrigger([api.events.registrar.Registered]);
   const [state, setState] = useState<OwnedId[]>([]);
 
   useEffect((): void => {
     allAccounts && trigger &&
-      api.query.registrar?.paras
+      api.query.registrar.paras
         .entries<Option<ParaInfo>, [ParaId]>()
         .then((entries) => setState(() =>
           entries
diff --git a/packages/page-parachains/src/useRanges.ts b/packages/page-parachains/src/useRanges.ts
index 74c905bda1..869838089a 100644
--- a/packages/page-parachains/src/useRanges.ts
+++ b/packages/page-parachains/src/useRanges.ts
@@ -23,7 +23,7 @@ export default function useRanges (): [number, number][] {
 
   return useMemo(
     (): [number, number][] => {
-      if (isU32(api.consts.auctions?.leasePeriodsPerSlot)) {
+      if (isU32(api.consts.auctions.leasePeriodsPerSlot)) {
         const ranges: [number, number][] = [];
 
         for (let i = 0; api.consts.auctions.leasePeriodsPerSlot.gtn(i); i++) {
diff --git a/packages/page-parachains/src/useUpcomingIds.ts b/packages/page-parachains/src/useUpcomingIds.ts
index 4a1e610d37..08b3cf0ce1 100644
--- a/packages/page-parachains/src/useUpcomingIds.ts
+++ b/packages/page-parachains/src/useUpcomingIds.ts
@@ -10,7 +10,7 @@ import { useApi, useEventTrigger } from '@polkadot/react-hooks';
 
 export default function useUpomingIds (): ParaId[] | undefined {
   const { api } = useApi();
-  const trigger = useEventTrigger([api.events.session.NewSession, api.events.registrar?.Registered]);
+  const trigger = useEventTrigger([api.events.session.NewSession, api.events.registrar.Registered]);
   const [result, setResult] = useState<ParaId[] | undefined>();
 
   useEffect((): void => {
diff --git a/packages/page-parachains/src/useWinningData.ts b/packages/page-parachains/src/useWinningData.ts
index 3cd773d80d..5561dfac6a 100644
--- a/packages/page-parachains/src/useWinningData.ts
+++ b/packages/page-parachains/src/useWinningData.ts
@@ -126,10 +126,10 @@ export default function useWinningData (auctionInfo?: AuctionInfo): Winning[] |
   const ranges = useRanges();
   const [result, setResult] = useState<Winning[] | undefined>();
   const bestNumber = useBestNumber();
-  const trigger = useEventTrigger([api.events.auctions?.BidAccepted]);
+  const trigger = useEventTrigger([api.events.auctions.BidAccepted]);
   const triggerRef = useRef(trigger);
-  const initialEntries = useCall<[StorageKey<[BlockNumber]>, Option<WinningData>][]>(api.query.auctions?.winning.entries);
-  const optFirstData = useCall<Option<WinningData>>(api.query.auctions?.winning, FIRST_PARAM);
+  const initialEntries = useCall<[StorageKey<[BlockNumber]>, Option<WinningData>][]>(api.query.auctions.winning.entries);
+  const optFirstData = useCall<Option<WinningData>>(api.query.auctions.winning, FIRST_PARAM);
 
   // should be fired once, all entries as an initial round
   useEffect((): void => {