From 6e2f41342afd1ba82bb2f26482b8d4de848b8ce1 Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Mon, 2 Jan 2023 13:35:06 +0300
Subject: [PATCH 1/8] Updated names for 1/1 minting tabs

---
 components/collections/creation/BaseMinterDetails.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/collections/creation/BaseMinterDetails.tsx b/components/collections/creation/BaseMinterDetails.tsx
index e111577..ad41461 100644
--- a/components/collections/creation/BaseMinterDetails.tsx
+++ b/components/collections/creation/BaseMinterDetails.tsx
@@ -151,7 +151,7 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
             className="inline-block py-1 px-2 text-gray peer-checked:text-white hover:text-white peer-checked:bg-black peer-checked:border-b-2 hover:border-b-2  peer-checked:border-plumbus hover:border-plumbus cursor-pointer form-check-label"
             htmlFor="inlineRadio5"
           >
-            Create a New Base Minter Contract
+            Create a New 1/1 Collection
           </label>
         </div>
         <div className="mt-3 ml-2 font-bold form-check form-check-inline">
@@ -170,7 +170,7 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
             className="inline-block py-1 px-2 text-gray peer-checked:text-white hover:text-white peer-checked:bg-black peer-checked:border-b-2 hover:border-b-2  peer-checked:border-plumbus hover:border-plumbus cursor-pointer form-check-label"
             htmlFor="inlineRadio6"
           >
-            Use an Existing Base Minter Contract
+            Append a New Token to an Existing 1/1 Collection
           </label>
         </div>
       </div>

From 2ad0d893c685d2363d561cb40a4ee5bac384f5ba Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Thu, 5 Jan 2023 13:00:10 +0300
Subject: [PATCH 2/8] Append a new token UI update

---
 .../creation/BaseMinterDetails.tsx            | 57 ++++++++++++-------
 contracts/baseMinter/contract.ts              |  8 ++-
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/components/collections/creation/BaseMinterDetails.tsx b/components/collections/creation/BaseMinterDetails.tsx
index ad41461..54ad9e1 100644
--- a/components/collections/creation/BaseMinterDetails.tsx
+++ b/components/collections/creation/BaseMinterDetails.tsx
@@ -4,6 +4,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { toUtf8 } from '@cosmjs/encoding'
 import axios from 'axios'
+import clsx from 'clsx'
+import { Alert } from 'components/Alert'
+import { Conditional } from 'components/Conditional'
 import { useInputState } from 'components/forms/FormInput.hooks'
 import { useWallet } from 'contexts/wallet'
 import React, { useCallback, useEffect, useState } from 'react'
@@ -73,7 +76,6 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
   }
 
   const filterBaseMinterContracts = async () => {
-    setMyBaseMinterContracts([])
     await fetchMinterContracts()
       .then((minterContracts) =>
         minterContracts.map(async (minterContract: any) => {
@@ -107,18 +109,20 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
     })
   }, [debouncedMyBaseMinterContracts])
 
-  const debouncedWalletAddress = useDebounce(wallet.address, 500)
+  const debouncedWalletAddress = useDebounce(wallet.address, 300)
 
   const displayToast = async () => {
     await toast.promise(filterBaseMinterContracts(), {
-      loading: 'Fetching Base Minter contracts...',
-      success: 'Base Minter contracts retrieved.',
-      error: 'Unable to retrieve Base Minter contracts.',
+      loading: 'Retrieving previous 1/1 collections...',
+      success: 'Collection retrieval finalized.',
+      error: 'Unable to retrieve any 1/1 collections.',
     })
   }
 
   useEffect(() => {
     if (debouncedWalletAddress && baseMinterAcquisitionMethod === 'existing') {
+      setMyBaseMinterContracts([])
+      existingBaseMinterState.onChange('')
       void displayToast()
     }
   }, [debouncedWalletAddress, baseMinterAcquisitionMethod])
@@ -177,20 +181,35 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
 
       {baseMinterAcquisitionMethod === 'existing' && (
         <div>
-          <div className="grid grid-cols-2 grid-flow-col my-4 mx-10">
-            <select
-              className="mt-8 w-full max-w-lg text-sm bg-white/10 select select-bordered"
-              onChange={(e) => {
-                existingBaseMinterState.onChange(e.target.value.slice(e.target.value.indexOf('stars1')))
-                e.preventDefault()
-              }}
-            >
-              <option className="mt-2 text-lg bg-[#1A1A1A]" disabled selected>
-                Select one of your existing Base Minter contracts
-              </option>
-              {renderBaseMinterContracts()}
-            </select>
-            <TextInput defaultValue={existingBaseMinterState.value} {...existingBaseMinterState} isRequired />
+          <div className={clsx('my-4 mx-10')}>
+            <Conditional test={myBaseMinterContracts.length !== 0}>
+              <select
+                className="mt-4 w-full max-w-3xl text-sm bg-white/10 select select-bordered"
+                onChange={(e) => {
+                  existingBaseMinterState.onChange(e.target.value.slice(e.target.value.indexOf('stars1')))
+                  e.preventDefault()
+                }}
+              >
+                <option className="mt-2 text-lg bg-[#1A1A1A]" disabled selected>
+                  Select one of your existing 1/1 collections
+                </option>
+                {renderBaseMinterContracts()}
+              </select>
+            </Conditional>
+            <Conditional test={myBaseMinterContracts.length === 0}>
+              <div className="flex flex-col">
+                <Alert className="my-2 w-[90%]" type="info">
+                  No previous 1/1 collections were found. You may create a new 1/1 collection or fill in the minter
+                  contract address manually.
+                </Alert>
+                <TextInput
+                  className="w-3/5"
+                  defaultValue={existingBaseMinterState.value}
+                  {...existingBaseMinterState}
+                  isRequired
+                />
+              </div>
+            </Conditional>
           </div>
         </div>
       )}
diff --git a/contracts/baseMinter/contract.ts b/contracts/baseMinter/contract.ts
index 7ebfcd4..ac5d3c6 100644
--- a/contracts/baseMinter/contract.ts
+++ b/contracts/baseMinter/contract.ts
@@ -141,8 +141,12 @@ export const baseMinter = (client: SigningCosmWasmClient, txSigner: string): Bas
       })
       console.log(factoryParameters.params.mint_fee_bps)
 
-      const price = (await getConfig()).config.mint_price.amount
-      console.log(price)
+      const price = (await getConfig()).config?.mint_price.amount
+      if (!price) {
+        throw new Error(
+          'Unable to retrieve a valid mint price. It may be that the given contract address does not belong to a Base Minter contract.',
+        )
+      }
       console.log((Number(price) * Number(factoryParameters.params.mint_fee_bps)) / 100)
       const res = await client.execute(
         senderAddress,

From 950d5d46c81ce74bc5de2c79c5a6c4d144f65566 Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Thu, 5 Jan 2023 13:31:48 +0300
Subject: [PATCH 3/8] Add wallet connection check for collection retrieval

---
 .../creation/BaseMinterDetails.tsx            | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/components/collections/creation/BaseMinterDetails.tsx b/components/collections/creation/BaseMinterDetails.tsx
index 54ad9e1..71d163e 100644
--- a/components/collections/creation/BaseMinterDetails.tsx
+++ b/components/collections/creation/BaseMinterDetails.tsx
@@ -124,6 +124,9 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
       setMyBaseMinterContracts([])
       existingBaseMinterState.onChange('')
       void displayToast()
+    } else if (baseMinterAcquisitionMethod === 'new' || !wallet.initialized) {
+      setMyBaseMinterContracts([])
+      existingBaseMinterState.onChange('')
     }
   }, [debouncedWalletAddress, baseMinterAcquisitionMethod])
 
@@ -134,7 +137,7 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
     }
     onChange(data)
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [existingBaseMinterState.value, baseMinterAcquisitionMethod])
+  }, [existingBaseMinterState.value, baseMinterAcquisitionMethod, wallet.initialized])
 
   return (
     <div className="mx-10 mb-4 rounded border-2 border-white/20">
@@ -184,7 +187,7 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
           <div className={clsx('my-4 mx-10')}>
             <Conditional test={myBaseMinterContracts.length !== 0}>
               <select
-                className="mt-4 w-full max-w-3xl text-sm bg-white/10 select select-bordered"
+                className="mt-4 w-full max-w-3xl text-base bg-white/10 select select-bordered"
                 onChange={(e) => {
                   existingBaseMinterState.onChange(e.target.value.slice(e.target.value.indexOf('stars1')))
                   e.preventDefault()
@@ -198,16 +201,23 @@ export const BaseMinterDetails = ({ onChange, minterType }: BaseMinterDetailsPro
             </Conditional>
             <Conditional test={myBaseMinterContracts.length === 0}>
               <div className="flex flex-col">
-                <Alert className="my-2 w-[90%]" type="info">
-                  No previous 1/1 collections were found. You may create a new 1/1 collection or fill in the minter
-                  contract address manually.
-                </Alert>
-                <TextInput
-                  className="w-3/5"
-                  defaultValue={existingBaseMinterState.value}
-                  {...existingBaseMinterState}
-                  isRequired
-                />
+                <Conditional test={wallet.initialized}>
+                  <Alert className="my-2 w-[90%]" type="info">
+                    No previous 1/1 collections were found. You may create a new 1/1 collection or fill in the minter
+                    contract address manually.
+                  </Alert>
+                  <TextInput
+                    className="w-3/5"
+                    defaultValue={existingBaseMinterState.value}
+                    {...existingBaseMinterState}
+                    isRequired
+                  />
+                </Conditional>
+                <Conditional test={!wallet.initialized}>
+                  <Alert className="my-2 w-[90%]" type="warning">
+                    Please connect your wallet first.
+                  </Alert>
+                </Conditional>
               </div>
             </Conditional>
           </div>

From 67d414a55f848e47a4989604e64212f908a213b3 Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Thu, 5 Jan 2023 14:09:57 +0300
Subject: [PATCH 4/8] Update 1/1 Collection tab name and description

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

diff --git a/pages/collections/create.tsx b/pages/collections/create.tsx
index f6336e6..e99b3ed 100644
--- a/pages/collections/create.tsx
+++ b/pages/collections/create.tsx
@@ -935,7 +935,7 @@ const CollectionCreationPage: NextPage = () => {
                 }}
                 type="button"
               >
-                <h4 className="font-bold">Vending Minter</h4>
+                <h4 className="font-bold">Vending Machine Collection</h4>
                 <span className="text-sm text-white/80 line-clamp-2">
                   Vending Minter contract facilitates primary market vending machine style minting
                 </span>
@@ -957,8 +957,10 @@ const CollectionCreationPage: NextPage = () => {
                 }}
                 type="button"
               >
-                <h4 className="font-bold">Base Minter</h4>
-                <span className="text-sm text-white/80 line-clamp-2">Base Minter contract enables 1/1 minting</span>
+                <h4 className="font-bold">1/1 Collection</h4>
+                <span className="text-sm text-white/80 line-clamp-2">
+                  An appendable collection that allows for direct secondary market listing of tokens
+                </span>
               </button>
             </div>
           </div>

From fa326496331fe40132ea12c8715e7f24a339bba0 Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Thu, 5 Jan 2023 14:14:42 +0300
Subject: [PATCH 5/8] Update Mint Token URI name & description on Collection
 Actions

---
 components/collections/actions/actions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/collections/actions/actions.ts b/components/collections/actions/actions.ts
index 35d45df..482be14 100644
--- a/components/collections/actions/actions.ts
+++ b/components/collections/actions/actions.ts
@@ -42,8 +42,8 @@ export interface ActionListItem {
 export const BASE_ACTION_LIST: ActionListItem[] = [
   {
     id: 'mint_token_uri',
-    name: 'Mint Token URI',
-    description: `Mint a token with the given token URI`,
+    name: 'Append New Token',
+    description: `Append a new token to the collection`,
   },
   {
     id: 'update_start_trading_time',

From c7b26d133d112d70834ceb352be46d1d37f89cf8 Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Thu, 5 Jan 2023 14:17:46 +0300
Subject: [PATCH 6/8] Update Append New Token description on Collection Actions

---
 components/collections/actions/actions.ts | 2 +-
 pages/collections/actions.tsx             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/collections/actions/actions.ts b/components/collections/actions/actions.ts
index 482be14..fa65b27 100644
--- a/components/collections/actions/actions.ts
+++ b/components/collections/actions/actions.ts
@@ -43,7 +43,7 @@ export const BASE_ACTION_LIST: ActionListItem[] = [
   {
     id: 'mint_token_uri',
     name: 'Append New Token',
-    description: `Append a new token to the collection`,
+    description: `Mint a new token and append it to the collection`,
   },
   {
     id: 'update_start_trading_time',
diff --git a/pages/collections/actions.tsx b/pages/collections/actions.tsx
index cf529bf..5c50eda 100644
--- a/pages/collections/actions.tsx
+++ b/pages/collections/actions.tsx
@@ -88,7 +88,7 @@ const CollectionActionsPage: NextPage = () => {
             toUtf8(Buffer.from(Buffer.from('contract_info').toString('hex'), 'hex').toString()),
           ),
           {
-            loading: 'Retrieving Minter type...',
+            loading: 'Retrieving minter type...',
             error: 'Minter type retrieval failed.',
             success: 'Minter type retrieved.',
           },

From 0def7e0aad8c5fbcaa86290eac9f098e965b3eab Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Thu, 5 Jan 2023 14:38:01 +0300
Subject: [PATCH 7/8] Update Vending Minter tab name & description

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

diff --git a/pages/collections/create.tsx b/pages/collections/create.tsx
index e99b3ed..20bf22f 100644
--- a/pages/collections/create.tsx
+++ b/pages/collections/create.tsx
@@ -935,9 +935,9 @@ const CollectionCreationPage: NextPage = () => {
                 }}
                 type="button"
               >
-                <h4 className="font-bold">Vending Machine Collection</h4>
+                <h4 className="font-bold">Standard Collection</h4>
                 <span className="text-sm text-white/80 line-clamp-2">
-                  Vending Minter contract facilitates primary market vending machine style minting
+                  A non-appendable collection that facilitates primary market vending machine style minting
                 </span>
               </button>
             </div>
@@ -959,7 +959,7 @@ const CollectionCreationPage: NextPage = () => {
               >
                 <h4 className="font-bold">1/1 Collection</h4>
                 <span className="text-sm text-white/80 line-clamp-2">
-                  An appendable collection that allows for direct secondary market listing of tokens
+                  An appendable collection that only allows for direct secondary market listing of tokens
                 </span>
               </button>
             </div>

From 29e3c31864f8c71d2ecbae40630a622ec1be7cf7 Mon Sep 17 00:00:00 2001
From: Serkan Reis <serkanreis@gmail.com>
Date: Thu, 5 Jan 2023 14:40:11 +0300
Subject: [PATCH 8/8] Bump Studio version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index efd16a6..d2c8451 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stargaze-studio",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "workspaces": [
     "packages/*"
   ],