From 924b10ece0d05e2fe39f72ffd788ddaf8c6e3f8a Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Mon, 3 Apr 2023 19:06:43 +0300
Subject: [PATCH 1/8] Debounce base minter contract list

---
 components/collections/creation/BaseMinterDetails.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/collections/creation/BaseMinterDetails.tsx b/components/collections/creation/BaseMinterDetails.tsx
index 0c1678e..7fdeaa6 100644
--- a/components/collections/creation/BaseMinterDetails.tsx
+++ b/components/collections/creation/BaseMinterDetails.tsx
@@ -100,7 +100,7 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
   const debouncedMyBaseMinterContracts = useDebounce(myBaseMinterContracts, 500)
 
   const renderBaseMinterContracts = useCallback(() => {
-    return myBaseMinterContracts.map((baseMinterContract, index) => {
+    return debouncedMyBaseMinterContracts.map((baseMinterContract, index) => {
       return (
         <option key={index} className="mt-2 text-lg bg-[#1A1A1A]">
           {`${baseMinterContract.name} - ${baseMinterContract.minter}`}

From a11d0f3bae31b6652e6b613e988e2ed4b15619ee Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Mon, 3 Apr 2023 21:46:49 +0300
Subject: [PATCH 2/8] Adjust metadata attributes width wrt resolution

---
 components/forms/MetadataAttributes.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/forms/MetadataAttributes.tsx b/components/forms/MetadataAttributes.tsx
index d911d23..675d5b7 100644
--- a/components/forms/MetadataAttributes.tsx
+++ b/components/forms/MetadataAttributes.tsx
@@ -73,9 +73,9 @@ export function MetadataAttribute({ id, isLast, onAdd, onChange, onRemove, defau
   }, [traitTypeState.value, traitValueState.value, id])
 
   return (
-    <div className="grid relative 2xl:grid-cols-[1fr_1fr_auto] 2xl:space-x-2">
-      <TraitTypeInput {...traitTypeState} />
-      <TraitValueInput {...traitValueState} />
+    <div className="grid relative xl:grid-cols-[6fr_6fr_1fr] xl:-space-x-8 2xl:space-x-2">
+      <TraitTypeInput className="lg:w-4/5 2xl:w-full" {...traitTypeState} />
+      <TraitValueInput className="lg:w-4/5 xl:pr-2 xl:w-full" {...traitValueState} />
 
       <div className="flex justify-end items-end pb-2 w-8">
         <button

From 9c740d0fb0d7bd94a56bab47d60c3ad8423a0c52 Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Mon, 3 Apr 2023 22:22:27 +0300
Subject: [PATCH 3/8] Remove Trading Start Time from 1/1 Collections >
 Collection Details

---
 .../creation/CollectionDetails.tsx            | 242 ++++++++++++------
 pages/collections/create.tsx                  |   2 +-
 2 files changed, 162 insertions(+), 82 deletions(-)

diff --git a/components/collections/creation/CollectionDetails.tsx b/components/collections/creation/CollectionDetails.tsx
index 2a9303a..17dd8b7 100644
--- a/components/collections/creation/CollectionDetails.tsx
+++ b/components/collections/creation/CollectionDetails.tsx
@@ -144,15 +144,93 @@ export const CollectionDetails = ({ onChange, uploadMethod, coverImageUrl, minte
             <TextInput className="mt-2" {...symbolState} isRequired />
           </div>
           <div className={clsx(minterType === 'base' ? 'ml-10' : '')}>
-            <TextInput className="mt-2" {...externalLinkState} />
-            <FormControl
-              className={clsx(minterType === 'base' ? 'mt-12' : 'mt-2')}
-              htmlId="timestamp"
-              subtitle="Trading start time offset will be set as 2 weeks by default."
-              title="Trading Start Time (optional)"
-            >
-              <InputDateTime minDate={new Date()} onChange={(date) => setTimestamp(date)} value={timestamp} />
-            </FormControl>
+            <TextInput className={clsx(minterType === 'base' ? 'mt-0' : 'mt-2')} {...externalLinkState} />
+            {/* Currently trading starts immediately for 1/1 Collections */}
+            <Conditional test={minterType !== 'base'}>
+              <FormControl
+                className={clsx(minterType === 'base' ? 'mt-10' : 'mt-2')}
+                htmlId="timestamp"
+                subtitle="Trading start time offset will be set as 2 weeks by default."
+                title="Trading Start Time (optional)"
+              >
+                <InputDateTime minDate={new Date()} onChange={(date) => setTimestamp(date)} value={timestamp} />
+              </FormControl>
+            </Conditional>
+            <Conditional test={minterType === 'base'}>
+              <div
+                className={clsx(minterType === 'base' ? 'flex flex-col -ml-6 space-y-2' : 'flex flex-col space-y-2')}
+              >
+                <div>
+                  <div className="flex mt-9 ml-6">
+                    <span className="mt-1 ml-[2px] text-sm first-letter:capitalize">
+                      Does the collection contain explicit content?
+                    </span>
+                    <div className="ml-2 font-bold form-check form-check-inline">
+                      <input
+                        checked={explicit}
+                        className="peer sr-only"
+                        id="explicitRadio1"
+                        name="explicitRadioOptions1"
+                        onClick={() => {
+                          setExplicit(true)
+                        }}
+                        type="radio"
+                      />
+                      <label
+                        className="inline-block py-1 px-2 text-sm text-gray peer-checked:text-white hover:text-white peer-checked:bg-black hover:rounded-sm peer-checked:border-b-2 hover:border-b-2 peer-checked:border-plumbus hover:border-plumbus cursor-pointer form-check-label"
+                        htmlFor="explicitRadio1"
+                      >
+                        YES
+                      </label>
+                    </div>
+                    <div className="ml-2 font-bold form-check form-check-inline">
+                      <input
+                        checked={!explicit}
+                        className="peer sr-only"
+                        id="explicitRadio2"
+                        name="explicitRadioOptions2"
+                        onClick={() => {
+                          setExplicit(false)
+                        }}
+                        type="radio"
+                      />
+                      <label
+                        className="inline-block py-1 px-2 text-sm text-gray peer-checked:text-white hover:text-white peer-checked:bg-black hover:rounded-sm peer-checked:border-b-2 hover:border-b-2 peer-checked:border-plumbus hover:border-plumbus cursor-pointer form-check-label"
+                        htmlFor="explicitRadio2"
+                      >
+                        NO
+                      </label>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <Conditional test={SG721_UPDATABLE_CODE_ID > 0}>
+                <Tooltip
+                  backgroundColor="bg-blue-500"
+                  label={
+                    <div className="grid grid-flow-row">
+                      <span>
+                        ℹ️ When enabled, the metadata for tokens can be updated after the collection is created until
+                        the collection is frozen by the creator.
+                      </span>
+                    </div>
+                  }
+                  placement="bottom"
+                >
+                  <div className={clsx('flex flex-col mt-11 space-y-2 w-full form-control')}>
+                    <label className="justify-start cursor-pointer label">
+                      <span className="mr-4 font-bold">Updatable Token Metadata</span>
+                      <input
+                        checked={updatable}
+                        className={`toggle ${updatable ? `bg-stargaze` : `bg-gray-600`}`}
+                        onClick={() => setUpdatable(!updatable)}
+                        type="checkbox"
+                      />
+                    </label>
+                  </div>
+                </Tooltip>
+              </Conditional>
+            </Conditional>
           </div>
         </div>
 
@@ -200,82 +278,84 @@ export const CollectionDetails = ({ onChange, uploadMethod, coverImageUrl, minte
             <span className="italic font-light ">Waiting for cover image URL to be specified.</span>
           )}
         </FormControl>
-        <div className={clsx(minterType === 'base' ? 'flex flex-col -ml-16 space-y-2' : 'flex flex-col space-y-2')}>
-          <div>
-            <div className="flex mt-4">
-              <span className="mt-1 ml-[2px] text-sm first-letter:capitalize">
-                Does the collection contain explicit content?
-              </span>
-              <div className="ml-2 font-bold form-check form-check-inline">
-                <input
-                  checked={explicit}
-                  className="peer sr-only"
-                  id="explicitRadio1"
-                  name="explicitRadioOptions1"
-                  onClick={() => {
-                    setExplicit(true)
-                  }}
-                  type="radio"
-                />
-                <label
-                  className="inline-block py-1 px-2 text-sm text-gray peer-checked:text-white hover:text-white peer-checked:bg-black hover:rounded-sm peer-checked:border-b-2 hover:border-b-2 peer-checked:border-plumbus hover:border-plumbus cursor-pointer form-check-label"
-                  htmlFor="explicitRadio1"
-                >
-                  YES
-                </label>
-              </div>
-              <div className="ml-2 font-bold form-check form-check-inline">
-                <input
-                  checked={!explicit}
-                  className="peer sr-only"
-                  id="explicitRadio2"
-                  name="explicitRadioOptions2"
-                  onClick={() => {
-                    setExplicit(false)
-                  }}
-                  type="radio"
-                />
-                <label
-                  className="inline-block py-1 px-2 text-sm text-gray peer-checked:text-white hover:text-white peer-checked:bg-black hover:rounded-sm peer-checked:border-b-2 hover:border-b-2 peer-checked:border-plumbus hover:border-plumbus cursor-pointer form-check-label"
-                  htmlFor="explicitRadio2"
-                >
-                  NO
-                </label>
+        <Conditional test={minterType !== 'base'}>
+          <div className={clsx(minterType === 'base' ? 'flex flex-col -ml-6 space-y-2' : 'flex flex-col space-y-2')}>
+            <div>
+              <div className="flex mt-4">
+                <span className="mt-1 ml-[2px] text-sm first-letter:capitalize">
+                  Does the collection contain explicit content?
+                </span>
+                <div className="ml-2 font-bold form-check form-check-inline">
+                  <input
+                    checked={explicit}
+                    className="peer sr-only"
+                    id="explicitRadio1"
+                    name="explicitRadioOptions1"
+                    onClick={() => {
+                      setExplicit(true)
+                    }}
+                    type="radio"
+                  />
+                  <label
+                    className="inline-block py-1 px-2 text-sm text-gray peer-checked:text-white hover:text-white peer-checked:bg-black hover:rounded-sm peer-checked:border-b-2 hover:border-b-2 peer-checked:border-plumbus hover:border-plumbus cursor-pointer form-check-label"
+                    htmlFor="explicitRadio1"
+                  >
+                    YES
+                  </label>
+                </div>
+                <div className="ml-2 font-bold form-check form-check-inline">
+                  <input
+                    checked={!explicit}
+                    className="peer sr-only"
+                    id="explicitRadio2"
+                    name="explicitRadioOptions2"
+                    onClick={() => {
+                      setExplicit(false)
+                    }}
+                    type="radio"
+                  />
+                  <label
+                    className="inline-block py-1 px-2 text-sm text-gray peer-checked:text-white hover:text-white peer-checked:bg-black hover:rounded-sm peer-checked:border-b-2 hover:border-b-2 peer-checked:border-plumbus hover:border-plumbus cursor-pointer form-check-label"
+                    htmlFor="explicitRadio2"
+                  >
+                    NO
+                  </label>
+                </div>
               </div>
             </div>
           </div>
-        </div>
-        <Conditional test={SG721_UPDATABLE_CODE_ID > 0}>
-          <Tooltip
-            backgroundColor="bg-blue-500"
-            label={
-              <div className="grid grid-flow-row">
-                <span>
-                  ℹ️ When enabled, the metadata for tokens can be updated after the collection is created until the
-                  collection is frozen by the creator.
-                </span>
-              </div>
-            }
-            placement="bottom"
-          >
-            <div
-              className={clsx(
-                minterType === 'base'
-                  ? 'flex flex-col -ml-16 space-y-2 w-1/2 form-control'
-                  : 'flex flex-col space-y-2 w-3/4 form-control',
-              )}
+          <Conditional test={SG721_UPDATABLE_CODE_ID > 0}>
+            <Tooltip
+              backgroundColor="bg-blue-500"
+              label={
+                <div className="grid grid-flow-row">
+                  <span>
+                    ℹ️ When enabled, the metadata for tokens can be updated after the collection is created until the
+                    collection is frozen by the creator.
+                  </span>
+                </div>
+              }
+              placement="bottom"
             >
-              <label className="justify-start cursor-pointer label">
-                <span className="mr-4 font-bold">Updatable Token Metadata</span>
-                <input
-                  checked={updatable}
-                  className={`toggle ${updatable ? `bg-stargaze` : `bg-gray-600`}`}
-                  onClick={() => setUpdatable(!updatable)}
-                  type="checkbox"
-                />
-              </label>
-            </div>
-          </Tooltip>
+              <div
+                className={clsx(
+                  minterType === 'base'
+                    ? 'flex flex-col -ml-16 space-y-2 w-1/2 form-control'
+                    : 'flex flex-col space-y-2 w-3/4 form-control',
+                )}
+              >
+                <label className="justify-start cursor-pointer label">
+                  <span className="mr-4 font-bold">Updatable Token Metadata</span>
+                  <input
+                    checked={updatable}
+                    className={`toggle ${updatable ? `bg-stargaze` : `bg-gray-600`}`}
+                    onClick={() => setUpdatable(!updatable)}
+                    type="checkbox"
+                  />
+                </label>
+              </div>
+            </Tooltip>
+          </Conditional>
         </Conditional>
       </FormGroup>
     </div>
diff --git a/pages/collections/create.tsx b/pages/collections/create.tsx
index 6534d8a..17fa17f 100644
--- a/pages/collections/create.tsx
+++ b/pages/collections/create.tsx
@@ -504,7 +504,7 @@ const CollectionCreationPage: NextPage = () => {
             external_link: collectionDetails?.externalLink,
             explicit_content: collectionDetails?.explicit,
             royalty_info: royaltyInfo,
-            start_trading_time: collectionDetails?.startTradingTime || null,
+            start_trading_time: null, //collectionDetails?.startTradingTime || null,
           },
         },
       },

From 8fe784fdf68ea920bdf414f09fc39005b18d4fc7 Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Tue, 4 Apr 2023 10:17:41 +0300
Subject: [PATCH 4/8] Truncate contract addresses on My Collections

---
 pages/collections/myCollections.tsx | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pages/collections/myCollections.tsx b/pages/collections/myCollections.tsx
index 852dc6c..7211d7d 100644
--- a/pages/collections/myCollections.tsx
+++ b/pages/collections/myCollections.tsx
@@ -20,6 +20,7 @@ import { copy } from 'utils/clipboard'
 import { API_URL, STARGAZE_URL } from 'utils/constants'
 import { withMetadata } from 'utils/layout'
 import { links } from 'utils/links'
+import { truncateMiddle } from 'utils/text'
 
 const CollectionList: NextPage = () => {
   const wallet = useWallet()
@@ -132,7 +133,9 @@ const CollectionList: NextPage = () => {
                                     onClick={() => void copy(collection.minter as string)}
                                     type="button"
                                   >
-                                    <span>{collection.minter}</span>
+                                    <span>
+                                      {truncateMiddle(collection.minter ? (collection.minter as string) : '', 36)}
+                                    </span>
                                     <FaCopy className="opacity-0 group-hover:opacity-100" />
                                   </button>
                                 </Tooltip>
@@ -147,7 +150,12 @@ const CollectionList: NextPage = () => {
                                     onClick={() => void copy(collection.contractAddress as string)}
                                     type="button"
                                   >
-                                    <span>{collection.contractAddress}</span>
+                                    <span>
+                                      {truncateMiddle(
+                                        collection.contractAddress ? (collection.contractAddress as string) : '',
+                                        36,
+                                      )}
+                                    </span>
                                     <FaCopy className="opacity-0 group-hover:opacity-100" />
                                   </button>
                                 </Tooltip>
@@ -228,7 +236,9 @@ const CollectionList: NextPage = () => {
                                     onClick={() => void copy(collection.minter as string)}
                                     type="button"
                                   >
-                                    <span>{collection.minter}</span>
+                                    <span>
+                                      {truncateMiddle(collection.minter ? (collection.minter as string) : '', 36)}
+                                    </span>
                                     <FaCopy className="opacity-0 group-hover:opacity-100" />
                                   </button>
                                 </Tooltip>
@@ -243,7 +253,12 @@ const CollectionList: NextPage = () => {
                                     onClick={() => void copy(collection.contractAddress as string)}
                                     type="button"
                                   >
-                                    <span>{collection.contractAddress}</span>
+                                    <span>
+                                      {truncateMiddle(
+                                        collection.contractAddress ? (collection.contractAddress as string) : '',
+                                        36,
+                                      )}
+                                    </span>
                                     <FaCopy className="opacity-0 group-hover:opacity-100" />
                                   </button>
                                 </Tooltip>

From ffd4b729e48d63fc4ace5e71cfcfc2aaebecedf1 Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Tue, 4 Apr 2023 10:45:13 +0300
Subject: [PATCH 5/8] Increased resolution responsiveness for My Collections

---
 pages/collections/myCollections.tsx | 32 ++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/pages/collections/myCollections.tsx b/pages/collections/myCollections.tsx
index 7211d7d..46dc5da 100644
--- a/pages/collections/myCollections.tsx
+++ b/pages/collections/myCollections.tsx
@@ -85,7 +85,9 @@ const CollectionList: NextPage = () => {
           <div>
             {myStandardCollections.length > 0 && (
               <div className="bg-transparent">
-                <span className="text-2xl font-bold text-blue-300">Standard Collections</span>
+                <span className="ml-6 text-2xl font-bold text-blue-300 underline underline-offset-4">
+                  Standard Collections
+                </span>
                 <table className="table w-full">
                   <thead>
                     <tr>
@@ -98,7 +100,7 @@ const CollectionList: NextPage = () => {
                     {myStandardCollections.map((collection: any, index: any) => {
                       return (
                         <tr key={index}>
-                          <td className="w-[55%] bg-black">
+                          <td className="w-[40%] bg-black">
                             <div className="flex items-center space-x-3">
                               <div className="avatar">
                                 <div className="w-28 h-28 mask mask-squircle">
@@ -115,12 +117,16 @@ const CollectionList: NextPage = () => {
                                 </div>
                               </div>
                               <div className="pl-2">
-                                <p className="overflow-auto max-w-xs font-bold no-scrollbar ">{collection.name}</p>
-                                <p className="max-w-xs text-sm truncate opacity-50">{collection.description}</p>
+                                <p className="overflow-auto font-bold lg:max-w-[160px] xl:max-w-[220px] 2xl:max-w-xs no-scrollbar ">
+                                  {collection.name}
+                                </p>
+                                <p className="text-sm truncate opacity-50 lg:max-w-[160px] xl:max-w-[220px] 2xl:max-w-xs">
+                                  {collection.description}
+                                </p>
                               </div>
                             </div>
                           </td>
-                          <td className="w-[35%] bg-black">
+                          <td className="w-[50%] bg-black">
                             <div className="flex flex-row items-center space-x-3">
                               Minter:
                               <span className="ml-2">
@@ -188,7 +194,9 @@ const CollectionList: NextPage = () => {
             )}
             {myOneOfOneCollections.length > 0 && (
               <div className="mt-4">
-                <span className="text-2xl font-bold text-blue-300">1/1 Collections</span>
+                <span className="ml-6 text-2xl font-bold text-blue-300 underline underline-offset-4">
+                  1/1 Collections
+                </span>
                 <table className="table w-full">
                   <thead>
                     <tr>
@@ -201,7 +209,7 @@ const CollectionList: NextPage = () => {
                     {myOneOfOneCollections.map((collection: any, index: any) => {
                       return (
                         <tr key={index}>
-                          <td className="w-[55%] bg-black">
+                          <td className="w-[40%] bg-black">
                             <div className="flex items-center space-x-3">
                               <div className="avatar">
                                 <div className="w-28 h-28 mask mask-squircle">
@@ -218,12 +226,16 @@ const CollectionList: NextPage = () => {
                                 </div>
                               </div>
                               <div className="pl-2">
-                                <p className="overflow-auto max-w-xs font-bold no-scrollbar ">{collection.name}</p>
-                                <p className="max-w-xs text-sm truncate opacity-50">{collection.description}</p>
+                                <p className="overflow-auto font-bold lg:max-w-[160px] xl:max-w-[220px]  2xl:max-w-xs no-scrollbar ">
+                                  {collection.name}
+                                </p>
+                                <p className="text-sm truncate opacity-50  lg:max-w-[160px] xl:max-w-[220px] 2xl:max-w-xs">
+                                  {collection.description}
+                                </p>
                               </div>
                             </div>
                           </td>
-                          <td className="w-[35%] bg-black">
+                          <td className="w-[50%] bg-black">
                             <div className="flex flex-row items-center space-x-3">
                               Minter:
                               <span className="ml-2">

From bff03ffc66fc41c56772b8e4a4da0ba2de8509c8 Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Tue, 4 Apr 2023 11:46:52 +0300
Subject: [PATCH 6/8] Update Base Minter Creation and Upload & Mint error
 messages

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

diff --git a/pages/collections/create.tsx b/pages/collections/create.tsx
index 17fa17f..0cfd376 100644
--- a/pages/collections/create.tsx
+++ b/pages/collections/create.tsx
@@ -143,10 +143,7 @@ const CollectionCreationPage: NextPage = () => {
           setReadyToCreateBm(true)
         })
         .catch((err) => {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-          if (!err.message.includes('Insufficient wallet balance'))
-            toast.error(`Error in Whitelist Configuration: ${err.message}`, { style: { maxWidth: 'none' } })
-          else toast.error(`${err.message}`, { style: { maxWidth: 'none' } })
+          toast.error(`${err.message}`, { style: { maxWidth: 'none' } })
           setReadyToCreateBm(false)
         })
     } catch (error: any) {
@@ -164,7 +161,7 @@ const CollectionCreationPage: NextPage = () => {
           setReadyToUploadAndMint(true)
         })
         .catch((err) => {
-          toast.error(`Error in Whitelist Configuration: ${err.message}`, { style: { maxWidth: 'none' } })
+          toast.error(`${err.message}`, { style: { maxWidth: 'none' } })
           setReadyToUploadAndMint(false)
         })
     } catch (error: any) {

From ac467fb750409a07f132f6dcc8ddaedf73f8b91d Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Tue, 4 Apr 2023 15:30:05 +0300
Subject: [PATCH 7/8] Display summary upon adding new tokens to a 1/1
 collection

---
 .../creation/BaseMinterDetails.tsx            |  63 +++++-
 .../collections/creation/MintingDetails.tsx   |   2 +-
 pages/collections/create.tsx                  | 189 ++++++++++++------
 3 files changed, 192 insertions(+), 62 deletions(-)

diff --git a/components/collections/creation/BaseMinterDetails.tsx b/components/collections/creation/BaseMinterDetails.tsx
index 7fdeaa6..e40d842 100644
--- a/components/collections/creation/BaseMinterDetails.tsx
+++ b/components/collections/creation/BaseMinterDetails.tsx
@@ -22,6 +22,7 @@ export type BaseMinterAcquisitionMethod = 'existing' | 'new'
 export interface MinterInfo {
   name: string
   minter: string
+  contractAddress: string
 }
 
 interface BaseMinterDetailsProps {
@@ -32,6 +33,8 @@ interface BaseMinterDetailsProps {
 export interface BaseMinterDetailsDataProps {
   baseMinterAcquisitionMethod: BaseMinterAcquisitionMethod
   existingBaseMinter: string | undefined
+  selectedCollectionAddress: string | undefined
+  collectionTokenCount: number | undefined
 }
 
 export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsProps) => {
@@ -39,6 +42,8 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
 
   const [myBaseMinterContracts, setMyBaseMinterContracts] = useState<MinterInfo[]>([])
   const [baseMinterAcquisitionMethod, setBaseMinterAcquisitionMethod] = useState<BaseMinterAcquisitionMethod>('new')
+  const [selectedCollectionAddress, setSelectedCollectionAddress] = useState<string | undefined>(undefined)
+  const [collectionTokenCount, setCollectionTokenCount] = useState<number | undefined>(undefined)
 
   const existingBaseMinterState = useInputState({
     id: 'existingMinter',
@@ -54,7 +59,7 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
       .then((response) => {
         const collectionData = response.data
         const minterContracts = collectionData.map((collection: any) => {
-          return { name: collection.name, minter: collection.minter }
+          return { name: collection.name, minter: collection.minter, contractAddress: collection.contractAddress }
         })
         return minterContracts
       })
@@ -111,6 +116,8 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
 
   const debouncedWalletAddress = useDebounce(wallet.address, 300)
 
+  const debouncedExistingBaseMinterContract = useDebounce(existingBaseMinterState.value, 300)
+
   const displayToast = async () => {
     await toast.promise(filterBaseMinterContracts(), {
       loading: 'Retrieving previous 1/1 collections...',
@@ -119,6 +126,38 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
     })
   }
 
+  const fetchSg721Address = async () => {
+    if (debouncedExistingBaseMinterContract.length === 0) return
+    await wallet.client
+      ?.queryContractSmart(debouncedExistingBaseMinterContract, {
+        config: {},
+      })
+      .then((response) => {
+        console.log(response.collection_address)
+        setSelectedCollectionAddress(response.collection_address)
+      })
+      .catch((err) => {
+        console.log(err)
+        console.log('Unable to retrieve collection address')
+      })
+  }
+
+  const fetchCollectionTokenCount = async () => {
+    if (selectedCollectionAddress === undefined) return
+    await wallet.client
+      ?.queryContractSmart(selectedCollectionAddress, {
+        num_tokens: {},
+      })
+      .then((response) => {
+        console.log(response)
+        setCollectionTokenCount(Number(response.count))
+      })
+      .catch((err) => {
+        console.log(err)
+        console.log('Unable to retrieve collection token count')
+      })
+  }
+
   useEffect(() => {
     if (debouncedWalletAddress && baseMinterAcquisitionMethod === 'existing') {
       setMyBaseMinterContracts([])
@@ -130,14 +169,34 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
     }
   }, [debouncedWalletAddress, baseMinterAcquisitionMethod])
 
+  useEffect(() => {
+    if (baseMinterAcquisitionMethod === 'existing') {
+      void fetchSg721Address()
+    }
+  }, [debouncedExistingBaseMinterContract])
+
+  useEffect(() => {
+    if (baseMinterAcquisitionMethod === 'existing') {
+      void fetchCollectionTokenCount()
+    }
+  }, [selectedCollectionAddress])
+
   useEffect(() => {
     const data: BaseMinterDetailsDataProps = {
       baseMinterAcquisitionMethod,
       existingBaseMinter: existingBaseMinterState.value,
+      selectedCollectionAddress,
+      collectionTokenCount,
     }
     onChange(data)
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [existingBaseMinterState.value, baseMinterAcquisitionMethod, wallet.initialized])
+  }, [
+    existingBaseMinterState.value,
+    baseMinterAcquisitionMethod,
+    wallet.initialized,
+    selectedCollectionAddress,
+    collectionTokenCount,
+  ])
 
   return (
     <div className="mx-10 mb-4 rounded border-2 border-white/20">
diff --git a/components/collections/creation/MintingDetails.tsx b/components/collections/creation/MintingDetails.tsx
index 065224a..e7042ff 100644
--- a/components/collections/creation/MintingDetails.tsx
+++ b/components/collections/creation/MintingDetails.tsx
@@ -105,7 +105,7 @@ export const MintingDetails = ({ onChange, numberOfTokens, uploadMethod }: Minti
           <InputDateTime minDate={new Date()} onChange={(date) => setTimestamp(date)} value={timestamp} />
         </FormControl>
       </FormGroup>
-      <TextInput className="p-4 mt-5" {...paymentAddressState} />
+      <TextInput className="p-4 mt-10" {...paymentAddressState} />
     </div>
   )
 }
diff --git a/pages/collections/create.tsx b/pages/collections/create.tsx
index 0cfd376..5e32151 100644
--- a/pages/collections/create.tsx
+++ b/pages/collections/create.tsx
@@ -9,6 +9,7 @@ import { coin } from '@cosmjs/proto-signing'
 import clsx from 'clsx'
 import { Alert } from 'components/Alert'
 import { Anchor } from 'components/Anchor'
+import { AnchorButton } from 'components/AnchorButton'
 import { Button } from 'components/Button'
 import {
   CollectionDetails,
@@ -297,12 +298,12 @@ const CollectionCreationPage: NextPage = () => {
       if (!wallet.initialized) throw new Error('Wallet not connected')
       if (!baseMinterContract) throw new Error('Contract not found')
       setCreatingCollection(true)
+      setIsMintingComplete(false)
       setBaseTokenUri(null)
       setCoverImageUrl(null)
       setVendingMinterContractAddress(null)
       setSg721ContractAddress(null)
       setTransactionHash(null)
-
       if (uploadDetails?.uploadMethod === 'new') {
         console.log(JSON.stringify(uploadDetails.baseMinterMetadataFile?.text()))
         setUploading(true)
@@ -330,7 +331,6 @@ const CollectionCreationPage: NextPage = () => {
               return result
             }
             setBaseTokenUri(baseUri)
-
             const result = await baseMinterContract
               .use(baseMinterDetails?.existingBaseMinter as string)
               ?.batchMint(wallet.address, `ipfs://${baseUri}`, uploadDetails.assetFiles.length)
@@ -343,6 +343,8 @@ const CollectionCreationPage: NextPage = () => {
               duration: 5000,
             })
             setIsMintingComplete(true)
+            setSg721ContractAddress(baseMinterDetails?.selectedCollectionAddress as string)
+            setTransactionHash(result as string)
           })
           .catch((error) => {
             toast.error(error.message, { style: { maxWidth: 'none' } })
@@ -361,6 +363,9 @@ const CollectionCreationPage: NextPage = () => {
               style: { maxWidth: 'none' },
               duration: 5000,
             })
+            setIsMintingComplete(true)
+            setSg721ContractAddress(baseMinterDetails?.selectedCollectionAddress as string)
+            setTransactionHash(result)
           })
           .catch((error) => {
             toast.error(error.message, { style: { maxWidth: 'none' } })
@@ -933,8 +938,9 @@ const CollectionCreationPage: NextPage = () => {
     }
   }
   useEffect(() => {
-    if (vendingMinterContractAddress !== null) scrollRef.current?.scrollIntoView({ behavior: 'smooth' })
-  }, [vendingMinterContractAddress])
+    if (vendingMinterContractAddress !== null || isMintingComplete)
+      scrollRef.current?.scrollIntoView({ behavior: 'smooth' })
+  }, [vendingMinterContractAddress, isMintingComplete])
 
   useEffect(() => {
     setBaseTokenUri(uploadDetails?.baseTokenURI as string)
@@ -981,7 +987,7 @@ const CollectionCreationPage: NextPage = () => {
         </p>
       </div>
       <div className="mx-10" ref={scrollRef}>
-        <Conditional test={vendingMinterContractAddress !== null}>
+        <Conditional test={vendingMinterContractAddress !== null || isMintingComplete}>
           <Alert className="mt-5" type="info">
             <div>
               <Conditional test={minterType === 'vending' || isMintingComplete}>
@@ -1007,80 +1013,145 @@ const CollectionCreationPage: NextPage = () => {
                   </Anchor>
                 )}
                 <br />
+                <Conditional test={vendingMinterContractAddress === null && isMintingComplete}>
+                  Transaction Hash: {'  '}
+                  <Conditional test={NETWORK === 'testnet'}>
+                    <Anchor
+                      className="text-stargaze hover:underline"
+                      external
+                      href={`${BLOCK_EXPLORER_URL}/tx/${transactionHash as string}`}
+                    >
+                      {transactionHash}
+                    </Anchor>
+                  </Conditional>
+                  <Conditional test={NETWORK === 'mainnet'}>
+                    <Anchor
+                      className="text-stargaze hover:underline"
+                      external
+                      href={`${BLOCK_EXPLORER_URL}/txs/${transactionHash as string}`}
+                    >
+                      {transactionHash}
+                    </Anchor>
+                  </Conditional>
+                  <br />
+                  Minter Contract Address:{'  '}
+                  <Anchor
+                    className="text-stargaze hover:underline"
+                    external
+                    href={`/contracts/baseMinter/query/?contractAddress=${
+                      baseMinterDetails?.existingBaseMinter as string
+                    }`}
+                  >
+                    {baseMinterDetails?.existingBaseMinter as string}
+                  </Anchor>
+                  <br />
+                  SG721 Contract Address:{'  '}
+                  <Anchor
+                    className="text-stargaze hover:underline"
+                    external
+                    href={`/contracts/sg721/query/?contractAddress=${sg721ContractAddress as string}`}
+                  >
+                    {sg721ContractAddress}
+                  </Anchor>
+                  <br />
+                  <div className="flex flex-row mt-2">
+                    <AnchorButton className="text-white" external href={`${STARGAZE_URL}/profile/${wallet.address}`}>
+                      Visit Your Profile
+                    </AnchorButton>
+                    <AnchorButton
+                      className="ml-2 text-white"
+                      external
+                      href={`${STARGAZE_URL}/marketplace/${sg721ContractAddress as string}/${
+                        baseMinterDetails?.collectionTokenCount
+                          ? (baseMinterDetails.collectionTokenCount + 1).toString()
+                          : '1'
+                      }`}
+                    >
+                      View the Token(s) on Marketplace
+                    </AnchorButton>
+                  </div>
+                </Conditional>
               </Conditional>
-              Minter Contract Address:{'  '}
-              <Anchor
-                className="text-stargaze hover:underline"
-                external
-                href={
-                  minterType === 'vending'
-                    ? `/contracts/vendingMinter/query/?contractAddress=${vendingMinterContractAddress as string}`
-                    : `/contracts/baseMinter/query/?contractAddress=${vendingMinterContractAddress as string}`
-                }
-              >
-                {vendingMinterContractAddress}
-              </Anchor>
-              <br />
-              SG721 Contract Address:{'  '}
-              <Anchor
-                className="text-stargaze hover:underline"
-                external
-                href={`/contracts/sg721/query/?contractAddress=${sg721ContractAddress as string}`}
-              >
-                {sg721ContractAddress}
-              </Anchor>
-              <br />
-              <Conditional test={whitelistContractAddress !== null && whitelistContractAddress !== undefined}>
-                Whitelist Contract Address:{'  '}
+              <Conditional test={vendingMinterContractAddress !== null}>
+                Minter Contract Address:{'  '}
                 <Anchor
                   className="text-stargaze hover:underline"
                   external
-                  href={`/contracts/whitelist/query/?contractAddress=${whitelistContractAddress as string}`}
+                  href={
+                    minterType === 'vending'
+                      ? `/contracts/vendingMinter/query/?contractAddress=${vendingMinterContractAddress as string}`
+                      : `/contracts/baseMinter/query/?contractAddress=${vendingMinterContractAddress as string}`
+                  }
                 >
-                  {whitelistContractAddress}
+                  {vendingMinterContractAddress}
                 </Anchor>
                 <br />
-              </Conditional>
-              Transaction Hash: {'  '}
-              <Conditional test={NETWORK === 'testnet'}>
+                SG721 Contract Address:{'  '}
                 <Anchor
                   className="text-stargaze hover:underline"
                   external
-                  href={`${BLOCK_EXPLORER_URL}/tx/${transactionHash as string}`}
+                  href={`/contracts/sg721/query/?contractAddress=${sg721ContractAddress as string}`}
                 >
-                  {transactionHash}
+                  {sg721ContractAddress}
                 </Anchor>
-              </Conditional>
-              <Conditional test={NETWORK === 'mainnet'}>
-                <Anchor
-                  className="text-stargaze hover:underline"
-                  external
-                  href={`${BLOCK_EXPLORER_URL}/txs/${transactionHash as string}`}
-                >
-                  {transactionHash}
-                </Anchor>
-              </Conditional>
-              <Conditional test={minterType === 'vending'}>
-                <Button className="mt-2">
+                <br />
+                <Conditional test={whitelistContractAddress !== null && whitelistContractAddress !== undefined}>
+                  Whitelist Contract Address:{'  '}
                   <Anchor
-                    className="text-white"
+                    className="text-stargaze hover:underline"
                     external
-                    href={`${STARGAZE_URL}/launchpad/${vendingMinterContractAddress as string}`}
+                    href={`/contracts/whitelist/query/?contractAddress=${whitelistContractAddress as string}`}
                   >
-                    View on Launchpad
+                    {whitelistContractAddress}
                   </Anchor>
-                </Button>
-              </Conditional>
-              <Conditional test={minterType === 'base'}>
-                <Button className="mt-2">
+                  <br />
+                </Conditional>
+                Transaction Hash: {'  '}
+                <Conditional test={NETWORK === 'testnet'}>
                   <Anchor
-                    className="text-white"
+                    className="text-stargaze hover:underline"
                     external
-                    href={`${STARGAZE_URL}/marketplace/${sg721ContractAddress as string}?sort=price_asc`}
+                    href={`${BLOCK_EXPLORER_URL}/tx/${transactionHash as string}`}
                   >
-                    View on Marketplace
+                    {transactionHash}
                   </Anchor>
-                </Button>
+                </Conditional>
+                <Conditional test={NETWORK === 'mainnet'}>
+                  <Anchor
+                    className="text-stargaze hover:underline"
+                    external
+                    href={`${BLOCK_EXPLORER_URL}/txs/${transactionHash as string}`}
+                  >
+                    {transactionHash}
+                  </Anchor>
+                </Conditional>
+                <Conditional test={minterType === 'vending'}>
+                  <Button className="mt-2">
+                    <Anchor
+                      className="text-white"
+                      external
+                      href={`${STARGAZE_URL}/launchpad/${vendingMinterContractAddress as string}`}
+                    >
+                      View on Launchpad
+                    </Anchor>
+                  </Button>
+                </Conditional>
+                <Conditional test={minterType === 'base'}>
+                  <div className="flex flex-row mt-2">
+                    <AnchorButton className="text-white" external href={`${STARGAZE_URL}/profile/${wallet.address}`}>
+                      Visit Your Profile
+                    </AnchorButton>
+                    <AnchorButton
+                      className="ml-2 text-white"
+                      external
+                      href={`${STARGAZE_URL}/marketplace/${sg721ContractAddress as string}${
+                        !isMintingComplete ? `?sort=price_asc` : `/1`
+                      }`}
+                    >
+                      View the Collection on Marketplace
+                    </AnchorButton>
+                  </div>
+                </Conditional>
               </Conditional>
             </div>
           </Alert>

From 7bee3126680c368d5fff80348554ac9e8ad5ba54 Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Tue, 4 Apr 2023 15:31:47 +0300
Subject: [PATCH 8/8] Bump Studio version

---
 .env.example | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.example b/.env.example
index 2ec7b68..8188a34 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,4 @@
-APP_VERSION=0.5.5
+APP_VERSION=0.5.6
 
 NEXT_PUBLIC_PINATA_ENDPOINT_URL=https://api.pinata.cloud/pinning/pinFileToIPFS
 NEXT_PUBLIC_SG721_CODE_ID=1911
diff --git a/package.json b/package.json
index 6df1269..33da66c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stargaze-studio",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "workspaces": [
     "packages/*"
   ],