chore: [#3] added check against claim period for claim button

citydaoproject · May 13, 2022 · f211bb3 · f211bb3
1 parent f90d661
commit f211bb3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/components/ClaimButton.tsx b/components/ClaimButton.tsx
@@ -4,10 +4,15 @@ import DefaultButton, { DefaultButtonProps } from './common/DefaultButton';
 export interface ClaimButtonProps extends DefaultButtonProps {
   allowance: number;
   walletAlreadyClaimed: number;
+  withinClaimPeriod: boolean;
 }
 
-const ClaimButton = ({ allowance, walletAlreadyClaimed, disabled, ...rest }: ClaimButtonProps) => {
+const ClaimButton = ({ allowance, walletAlreadyClaimed, withinClaimPeriod, disabled, ...rest }: ClaimButtonProps) => {
   const getClaimButtonText = () => {
+    if (!withinClaimPeriod) {
+      return 'CLAIM PLOTS';
+    }
+
     if (allowance > 0 && allowance > walletAlreadyClaimed) {
       return `CLAIM ${allowance - walletAlreadyClaimed} PLOTS`;
     }
@@ -20,7 +25,10 @@ const ClaimButton = ({ allowance, walletAlreadyClaimed, disabled, ...rest }: Cla
   };
 
   return (
-    <DefaultButton {...rest} disabled={disabled || (walletAlreadyClaimed === 0 && allowance === 0)}>
+    <DefaultButton
+      {...rest}
+      disabled={disabled || !withinClaimPeriod || (walletAlreadyClaimed === 0 && allowance === 0)}
+    >
       {getClaimButtonText()}
     </DefaultButton>
   );

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -156,6 +156,7 @@ const Home: NextPage = () => {
             <ClaimButton
               walletAlreadyClaimed={walletAlreadyClaimed}
               allowance={allowance}
+              withinClaimPeriod={claimPeriodStart < Date.now() && claimPeriodEnd > Date.now()}
               disabled={!address}
               onClick={
                 walletAlreadyClaimed === 0 || walletAlreadyClaimed < allowance ? handleOpenClaimModal : showMintedNfts

diff --git a/yarn.lock b/yarn.lock
@@ -2737,7 +2737,7 @@
   "resolved" "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz"
   "version" "1.4.2"
   dependencies:
-    "ethereumjs-abi" "git+https://github.com/ethereumjs/ethereumjs-abi.git"
+    "ethereumjs-abi" "0.6.8"
     "ethereumjs-util" "^5.1.1"
 
 "ethereum-bloom-filters@^1.0.6":