From 6fc5c0f4b10df25af2431bbbc859861d40c5bf01 Mon Sep 17 00:00:00 2001
From: dmkirshon <kirshon.david@gmail.com>
Date: Tue, 23 Jan 2024 16:03:23 +0200
Subject: [PATCH 1/2] fix: Validate wallet and profile only in mint form

---
 apps/studio/src/pages/home/library/MintSong.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/studio/src/pages/home/library/MintSong.tsx b/apps/studio/src/pages/home/library/MintSong.tsx
index be684080b..3cf27d3f9 100644
--- a/apps/studio/src/pages/home/library/MintSong.tsx
+++ b/apps/studio/src/pages/home/library/MintSong.tsx
@@ -347,7 +347,7 @@ const MintSong = () => {
                       </Box>
                     ) }
 
-                    { values.isMinting && !isVerified && (
+                    { !isMintingInitiated && values.isMinting && !isVerified && (
                       <Alert
                         action={
                           <Button
@@ -376,7 +376,7 @@ const MintSong = () => {
                       </Alert>
                     ) }
 
-                    { values.isMinting && !wallet && (
+                    { !isMintingInitiated && values.isMinting && !wallet && (
                       <Alert
                         action={
                           <Button
@@ -424,7 +424,9 @@ const MintSong = () => {
 
                     { isStepOneButtonVisible && (
                       <Button
-                        disabled={ !isVerified || !wallet }
+                        disabled={
+                          !isMintingInitiated && (!isVerified || !wallet)
+                        }
                         isLoading={ isLoading }
                         width={
                           windowWidth &&

From 2b7c4ecfa4721f0be8db93cd0cfd33a90cde1daa Mon Sep 17 00:00:00 2001
From: dmkirshon <kirshon.david@gmail.com>
Date: Wed, 24 Jan 2024 16:22:23 +0200
Subject: [PATCH 2/2] refactor: Update conditional reference for clarity

---
 apps/studio/src/pages/home/library/MintSong.tsx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/studio/src/pages/home/library/MintSong.tsx b/apps/studio/src/pages/home/library/MintSong.tsx
index 3cf27d3f9..d9bf91feb 100644
--- a/apps/studio/src/pages/home/library/MintSong.tsx
+++ b/apps/studio/src/pages/home/library/MintSong.tsx
@@ -281,6 +281,12 @@ const MintSong = () => {
             ? dirty
             : values.isMinting;
 
+          // if minting has been toggled but mint hasn't been initiated
+          const isMintingFormVisible = !isMintingInitiated && values.isMinting;
+
+          const isStepOneButtonDisabled =
+            isMintingFormVisible && (!isVerified || !wallet);
+
           const handleChangeOwners = (values: ReadonlyArray<Owner>) => {
             setFieldValue("owners", values);
           };
@@ -347,7 +353,7 @@ const MintSong = () => {
                       </Box>
                     ) }
 
-                    { !isMintingInitiated && values.isMinting && !isVerified && (
+                    { isMintingFormVisible && !isVerified && (
                       <Alert
                         action={
                           <Button
@@ -376,7 +382,7 @@ const MintSong = () => {
                       </Alert>
                     ) }
 
-                    { !isMintingInitiated && values.isMinting && !wallet && (
+                    { isMintingFormVisible && !wallet && (
                       <Alert
                         action={
                           <Button
@@ -424,9 +430,7 @@ const MintSong = () => {
 
                     { isStepOneButtonVisible && (
                       <Button
-                        disabled={
-                          !isMintingInitiated && (!isVerified || !wallet)
-                        }
+                        disabled={ isStepOneButtonDisabled }
                         isLoading={ isLoading }
                         width={
                           windowWidth &&