From bb017412f7210b0ac3ff51a6fc9a851fb6037975 Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Thu, 6 Oct 2022 16:16:58 +0300
Subject: [PATCH 1/3] Check whitelist contract validity prior to collection
 creation

---
 components/ConfirmationModal.tsx              |  2 +-
 .../collections/creation/MintingDetails.tsx   |  2 +-
 pages/collections/create.tsx                  | 20 ++++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/components/ConfirmationModal.tsx b/components/ConfirmationModal.tsx
index 23928d7..c00ff66 100644
--- a/components/ConfirmationModal.tsx
+++ b/components/ConfirmationModal.tsx
@@ -6,7 +6,7 @@ export interface ConfirmationModalProps {
 export const ConfirmationModal = (props: ConfirmationModalProps) => {
   return (
     <div>
-      <input className="modal-toggle" id="my-modal-2" type="checkbox" />
+      <input className="modal-toggle" defaultChecked id="my-modal-2" type="checkbox" />
       <label className="cursor-pointer modal" htmlFor="my-modal-2">
         <label
           className="absolute top-[40%] bottom-5 left-1/3 max-w-xl max-h-40 border-2 no-scrollbar modal-box"
diff --git a/components/collections/creation/MintingDetails.tsx b/components/collections/creation/MintingDetails.tsx
index 492a9b6..6afc367 100644
--- a/components/collections/creation/MintingDetails.tsx
+++ b/components/collections/creation/MintingDetails.tsx
@@ -70,7 +70,7 @@ export const MintingDetails = ({ onChange, numberOfTokens, uploadMethod }: Minti
         />
         <NumberInput {...unitPriceState} isRequired />
         <NumberInput {...perAddressLimitState} isRequired />
-        <FormControl htmlId="timestamp" isRequired subtitle="Start time for the minting" title="Start Time">
+        <FormControl htmlId="timestamp" isRequired subtitle="Minting start time (local)" title="Start Time">
           <InputDateTime minDate={new Date()} onChange={(date) => setTimestamp(date)} value={timestamp} />
         </FormControl>
       </FormGroup>
diff --git a/pages/collections/create.tsx b/pages/collections/create.tsx
index 62ad4ea..be78f5f 100644
--- a/pages/collections/create.tsx
+++ b/pages/collections/create.tsx
@@ -71,10 +71,15 @@ const CollectionCreationPage: NextPage = () => {
       checkUploadDetails()
       checkCollectionDetails()
       checkMintingDetails()
-      checkWhitelistDetails()
       checkRoyaltyDetails()
-      setReadyToCreate(true)
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      checkWhitelistDetails()
+        .then(() => {
+          setReadyToCreate(true)
+        })
+        .catch((err) => {
+          toast.error(`Invalid whitelist contract address: ${err.message}`)
+          setReadyToCreate(false)
+        })
     } catch (error: any) {
       toast.error(error.message)
       setUploading(false)
@@ -324,10 +329,15 @@ const CollectionCreationPage: NextPage = () => {
     if (Number(mintingDetails.startTime) < new Date().getTime() * 1000000) throw new Error('Invalid start time')
   }
 
-  const checkWhitelistDetails = () => {
+  const checkWhitelistDetails = async () => {
     if (!whitelistDetails) throw new Error('Please fill out the whitelist details')
     if (whitelistDetails.whitelistType === 'existing') {
       if (whitelistDetails.contractAddress === '') throw new Error('Whitelist contract address is required')
+      else {
+        const contract = whitelistContract?.use(whitelistDetails.contractAddress)
+        //check if the address belongs to a whitelist contract (see performChecks())
+        const config = await contract?.config()
+      }
     } else if (whitelistDetails.whitelistType === 'new') {
       if (whitelistDetails.members?.length === 0) throw new Error('Whitelist member list cannot be empty')
       if (whitelistDetails.unitPrice === '') throw new Error('Whitelist unit price is required')
@@ -492,7 +502,7 @@ const CollectionCreationPage: NextPage = () => {
           <Button className="px-0 mb-6 max-h-12" isLoading={creatingCollection} onClick={performChecks} variant="solid">
             <label
               className="relative justify-end w-full h-full text-white bg-plumbus hover:bg-plumbus-light border-0 btn modal-button"
-              htmlFor="my-modal-2"
+              htmlFor="temp"
             >
               Create Collection
             </label>

From 49307afa9f14da77b9e9f82b954a41cf7108f643 Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Thu, 6 Oct 2022 16:47:01 +0300
Subject: [PATCH 2/3] Update Create Collection button

---
 pages/collections/create.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/collections/create.tsx b/pages/collections/create.tsx
index be78f5f..1a3be53 100644
--- a/pages/collections/create.tsx
+++ b/pages/collections/create.tsx
@@ -499,13 +499,13 @@ const CollectionCreationPage: NextPage = () => {
         </div>
         {readyToCreate && <ConfirmationModal confirm={createCollection} />}
         <div className="flex justify-end w-full">
-          <Button className="px-0 mb-6 max-h-12" isLoading={creatingCollection} onClick={performChecks} variant="solid">
-            <label
-              className="relative justify-end w-full h-full text-white bg-plumbus hover:bg-plumbus-light border-0 btn modal-button"
-              htmlFor="temp"
-            >
-              Create Collection
-            </label>
+          <Button
+            className="relative justify-center px-4 mb-6 max-h-12 text-white bg-plumbus hover:bg-plumbus-light border-0"
+            isLoading={creatingCollection}
+            onClick={performChecks}
+            variant="solid"
+          >
+            Create Collection
           </Button>
         </div>
       </div>

From a325c07384822446a1bc1d855991e2fdaf9d188d Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Thu, 6 Oct 2022 16:55:54 +0300
Subject: [PATCH 3/3] Update whitelist configuration error message

---
 pages/collections/create.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/collections/create.tsx b/pages/collections/create.tsx
index 1a3be53..44b7091 100644
--- a/pages/collections/create.tsx
+++ b/pages/collections/create.tsx
@@ -77,7 +77,7 @@ const CollectionCreationPage: NextPage = () => {
           setReadyToCreate(true)
         })
         .catch((err) => {
-          toast.error(`Invalid whitelist contract address: ${err.message}`)
+          toast.error(`Error in Whitelist Configuration: ${err.message}`)
           setReadyToCreate(false)
         })
     } catch (error: any) {
@@ -500,7 +500,7 @@ const CollectionCreationPage: NextPage = () => {
         {readyToCreate && <ConfirmationModal confirm={createCollection} />}
         <div className="flex justify-end w-full">
           <Button
-            className="relative justify-center px-4 mb-6 max-h-12 text-white bg-plumbus hover:bg-plumbus-light border-0"
+            className="relative justify-center p-2 mb-6 max-h-12 text-white bg-plumbus hover:bg-plumbus-light border-0"
             isLoading={creatingCollection}
             onClick={performChecks}
             variant="solid"