From 4fe335f3b624205dcc224c40c49f24fd397fedd8 Mon Sep 17 00:00:00 2001
From: Joseph Chalabi <chalabi.joseph@gmail.com>
Date: Tue, 7 Jan 2025 16:53:01 -0700
Subject: [PATCH 1/9] chore: add 'u' to subdenom programatically

---
 components/factory/forms/ConfirmationForm.tsx | 4 ++--
 components/factory/forms/CreateDenom.tsx      | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/components/factory/forms/ConfirmationForm.tsx b/components/factory/forms/ConfirmationForm.tsx
index 0f9c068..9e650b2 100644
--- a/components/factory/forms/ConfirmationForm.tsx
+++ b/components/factory/forms/ConfirmationForm.tsx
@@ -44,7 +44,7 @@ export default function ConfirmationForm({
             value: MsgCreateDenom.encode(
               createDenom({
                 sender: formData.groupPolicyAddress || '',
-                subdenom: formData.subdenom,
+                subdenom: 'u' + formData.subdenom,
               }).value
             ).finish(),
           }),
@@ -99,7 +99,7 @@ export default function ConfirmationForm({
       // First, create the denom
       const createDenomMsg = createDenom({
         sender: address,
-        subdenom: formData.subdenom,
+        subdenom: 'u' + formData.subdenom,
       });
 
       const createDenomFee = await estimateFee(address, [createDenomMsg]);
diff --git a/components/factory/forms/CreateDenom.tsx b/components/factory/forms/CreateDenom.tsx
index d8f2b41..dad2160 100644
--- a/components/factory/forms/CreateDenom.tsx
+++ b/components/factory/forms/CreateDenom.tsx
@@ -21,7 +21,6 @@ export default function CreateDenom({
   const DenomSchema = Yup.object().shape({
     subdenom: Yup.string()
       .required('Subdenom is required')
-      .matches(/^[u][a-zA-Z0-9]+$/, 'Subdenom must start with the letter u')
       .min(4, 'Subdenom must be at least 4 characters')
       .max(44, 'Subdenom must not exceed 44 characters')
       .noProfanity('Profanity is not allowed')
@@ -57,8 +56,7 @@ export default function CreateDenom({
                     <TextInput
                       label="Token Sub Denom"
                       name="subdenom"
-                      placeholder="utoken"
-                      helperText="Use a subdenom starting with a prefix (e.g., 'utoken')"
+                      placeholder="token"
                       value={formData.subdenom}
                       onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                         dispatch({

From 84e4cf1c6bedc8341031a507e7ff88b6a5c05850 Mon Sep 17 00:00:00 2001
From: Joseph Chalabi <chalabi.joseph@gmail.com>
Date: Tue, 7 Jan 2025 17:00:02 -0700
Subject: [PATCH 2/9] fix: fix factory creation metadata issue

---
 components/factory/forms/ConfirmationForm.tsx | 16 ++++++++--------
 components/factory/forms/CreateDenom.tsx      |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/components/factory/forms/ConfirmationForm.tsx b/components/factory/forms/ConfirmationForm.tsx
index 9e650b2..9e3e657 100644
--- a/components/factory/forms/ConfirmationForm.tsx
+++ b/components/factory/forms/ConfirmationForm.tsx
@@ -59,12 +59,12 @@ export default function ConfirmationForm({
                     {
                       denom: fullDenom,
                       exponent: 0,
-                      aliases: [symbol],
+                      aliases: [],
                     },
                     {
-                      denom: symbol,
+                      denom: formData.display,
                       exponent: 6,
-                      aliases: [fullDenom],
+                      aliases: [],
                     },
                   ],
                   base: fullDenom,
@@ -72,7 +72,7 @@ export default function ConfirmationForm({
                   name: formData.name,
                   symbol: formData.display,
                   uri: formData.uri,
-                  uriHash: formData.uriHash,
+                  uriHash: '',
                 },
               }).value
             ).finish(),
@@ -123,12 +123,12 @@ export default function ConfirmationForm({
             {
               denom: fullDenom,
               exponent: 0,
-              aliases: [symbol],
+              aliases: [],
             },
             {
-              denom: symbol,
+              denom: formData.display,
               exponent: 6,
-              aliases: [fullDenom],
+              aliases: [],
             },
           ],
           base: fullDenom,
@@ -136,7 +136,7 @@ export default function ConfirmationForm({
           name: formData.name,
           symbol: formData.display,
           uri: formData.uri,
-          uriHash: formData.uriHash,
+          uriHash: '',
         },
       });
 
diff --git a/components/factory/forms/CreateDenom.tsx b/components/factory/forms/CreateDenom.tsx
index dad2160..26c89b2 100644
--- a/components/factory/forms/CreateDenom.tsx
+++ b/components/factory/forms/CreateDenom.tsx
@@ -124,6 +124,7 @@ export default function CreateDenom({
                 <button
                   className="w-[calc(50%-12px)] btn px-5 py-2.5 sm:py-3.5 btn-gradient text-white disabled:text-black"
                   onClick={() => handleSubmit()}
+                  type="submit"
                   disabled={!isValid || isSubmitting || isValidating}
                 >
                   Next: Token Metadata

From 944b87200bfe51d62a691900bd0c27e5d5eb44a7 Mon Sep 17 00:00:00 2001
From: Joseph Chalabi <chalabi.joseph@gmail.com>
Date: Tue, 7 Jan 2025 17:01:22 -0700
Subject: [PATCH 3/9] fix: revert metadata issues

---
 components/factory/forms/ConfirmationForm.tsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/factory/forms/ConfirmationForm.tsx b/components/factory/forms/ConfirmationForm.tsx
index 9e3e657..9e650b2 100644
--- a/components/factory/forms/ConfirmationForm.tsx
+++ b/components/factory/forms/ConfirmationForm.tsx
@@ -59,12 +59,12 @@ export default function ConfirmationForm({
                     {
                       denom: fullDenom,
                       exponent: 0,
-                      aliases: [],
+                      aliases: [symbol],
                     },
                     {
-                      denom: formData.display,
+                      denom: symbol,
                       exponent: 6,
-                      aliases: [],
+                      aliases: [fullDenom],
                     },
                   ],
                   base: fullDenom,
@@ -72,7 +72,7 @@ export default function ConfirmationForm({
                   name: formData.name,
                   symbol: formData.display,
                   uri: formData.uri,
-                  uriHash: '',
+                  uriHash: formData.uriHash,
                 },
               }).value
             ).finish(),
@@ -123,12 +123,12 @@ export default function ConfirmationForm({
             {
               denom: fullDenom,
               exponent: 0,
-              aliases: [],
+              aliases: [symbol],
             },
             {
-              denom: formData.display,
+              denom: symbol,
               exponent: 6,
-              aliases: [],
+              aliases: [fullDenom],
             },
           ],
           base: fullDenom,
@@ -136,7 +136,7 @@ export default function ConfirmationForm({
           name: formData.name,
           symbol: formData.display,
           uri: formData.uri,
-          uriHash: '',
+          uriHash: formData.uriHash,
         },
       });
 

From 202818f2aab3b841c69d67415bfe11e7c0255bc0 Mon Sep 17 00:00:00 2001
From: Joseph Chalabi <chalabi.joseph@gmail.com>
Date: Tue, 7 Jan 2025 19:40:23 -0700
Subject: [PATCH 4/9] fix: metadata & alias issues

---
 components/factory/forms/ConfirmationForm.tsx | 19 ++++++++++++-------
 components/factory/forms/TokenDetailsForm.tsx | 10 +++++-----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/components/factory/forms/ConfirmationForm.tsx b/components/factory/forms/ConfirmationForm.tsx
index 9e650b2..473d5de 100644
--- a/components/factory/forms/ConfirmationForm.tsx
+++ b/components/factory/forms/ConfirmationForm.tsx
@@ -29,13 +29,19 @@ export default function ConfirmationForm({
   const effectiveAddress =
     formData.isGroup && formData.groupPolicyAddress ? formData.groupPolicyAddress : address;
 
-  const fullDenom = `factory/${effectiveAddress}/${formData.subdenom}`;
+  const getDenomInfo = (subdenom: string) => {
+    const prefixedSubdenom = subdenom.startsWith('u') ? subdenom : 'u' + subdenom;
+    const symbol = (subdenom.startsWith('u') ? subdenom.slice(1) : subdenom).toUpperCase();
+    const fullDenom = `factory/${effectiveAddress}/${prefixedSubdenom}`;
+    return { prefixedSubdenom, symbol, fullDenom };
+  };
+
+  const { prefixedSubdenom, symbol, fullDenom } = getDenomInfo(formData.subdenom);
 
   const handleConfirm = async () => {
     setIsSigning(true);
 
     const createAsGroup = async () => {
-      const symbol = formData.subdenom.slice(1).toUpperCase();
       const msg = submitProposal({
         groupPolicyAddress: formData.groupPolicyAddress || '',
         messages: [
@@ -44,7 +50,7 @@ export default function ConfirmationForm({
             value: MsgCreateDenom.encode(
               createDenom({
                 sender: formData.groupPolicyAddress || '',
-                subdenom: 'u' + formData.subdenom,
+                subdenom: prefixedSubdenom,
               }).value
             ).finish(),
           }),
@@ -62,7 +68,7 @@ export default function ConfirmationForm({
                       aliases: [symbol],
                     },
                     {
-                      denom: symbol,
+                      denom: formData.display,
                       exponent: 6,
                       aliases: [fullDenom],
                     },
@@ -99,7 +105,7 @@ export default function ConfirmationForm({
       // First, create the denom
       const createDenomMsg = createDenom({
         sender: address,
-        subdenom: 'u' + formData.subdenom,
+        subdenom: prefixedSubdenom,
       });
 
       const createDenomFee = await estimateFee(address, [createDenomMsg]);
@@ -113,7 +119,6 @@ export default function ConfirmationForm({
         return;
       }
 
-      const symbol = formData.subdenom.slice(1).toUpperCase();
       // If createDenom is successful, proceed with setDenomMetadata
       const setMetadataMsg = setDenomMetadata({
         sender: address,
@@ -126,7 +131,7 @@ export default function ConfirmationForm({
               aliases: [symbol],
             },
             {
-              denom: symbol,
+              denom: formData.display,
               exponent: 6,
               aliases: [fullDenom],
             },
diff --git a/components/factory/forms/TokenDetailsForm.tsx b/components/factory/forms/TokenDetailsForm.tsx
index 4fd06d4..78cb5d0 100644
--- a/components/factory/forms/TokenDetailsForm.tsx
+++ b/components/factory/forms/TokenDetailsForm.tsx
@@ -43,17 +43,17 @@ export default function TokenDetails({
   const effectiveAddress =
     formData.isGroup && formData.groupPolicyAddress ? formData.groupPolicyAddress : address;
 
-  const fullDenom = `factory/${effectiveAddress}/${formData.subdenom}`;
-
+  const fullDenom = `factory/${effectiveAddress}/u${formData.subdenom}`;
+  console.log(formData);
   // Automatically set denom units
   React.useEffect(() => {
     const denomUnits = [
       { denom: fullDenom, exponent: 0, aliases: [] },
-      { denom: formData.subdenom.slice(1), exponent: 6, aliases: [] },
+      { denom: formData.display, exponent: 6, aliases: [] },
     ];
     updateField('denomUnits', denomUnits);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [formData.subdenom, address]);
+  }, [formData.subdenom, formData.display, address]);
 
   return (
     <section>
@@ -78,7 +78,7 @@ export default function TokenDetails({
                         label="Subdenom"
                         name="subdenom"
                         disabled={true}
-                        value={formData.subdenom}
+                        value={`u${formData.subdenom}`}
                         aria-label="Token subdenom"
                       />
                       <TextInput

From f34618245aa6e1a6adfbcd265914b6453df5bee1 Mon Sep 17 00:00:00 2001
From: Joseph Chalabi <chalabi.joseph@gmail.com>
Date: Tue, 7 Jan 2025 19:50:10 -0700
Subject: [PATCH 5/9] fix: make denom creation simulation smoother

---
 components/factory/forms/CreateDenom.tsx | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/components/factory/forms/CreateDenom.tsx b/components/factory/forms/CreateDenom.tsx
index 26c89b2..f9bb221 100644
--- a/components/factory/forms/CreateDenom.tsx
+++ b/components/factory/forms/CreateDenom.tsx
@@ -27,7 +27,7 @@ export default function CreateDenom({
       .simulateDenomCreation(async () => {
         setIsSimulating(true);
         try {
-          return await simulateDenomCreation(formData.subdenom);
+          return await simulateDenomCreation(`u${formData.subdenom}`);
         } finally {
           setIsSimulating(false);
         }
@@ -40,11 +40,20 @@ export default function CreateDenom({
         <Formik
           initialValues={formData}
           validationSchema={DenomSchema}
-          onSubmit={nextStep}
-          validateOnChange={true}
-          validateOnBlur={true}
+          onSubmit={async (values, { setSubmitting, setErrors }) => {
+            try {
+              await DenomSchema.validate(values, { abortEarly: false });
+              nextStep();
+            } catch (err) {
+              console.error('Validation failed:', err);
+            } finally {
+              setSubmitting(false);
+            }
+          }}
+          validateOnChange={false}
+          validateOnBlur={false}
         >
-          {({ setFieldValue, isValid, isSubmitting, isValidating, handleSubmit }) => (
+          {({ setFieldValue, isValid, isSubmitting, isValidating, handleSubmit, setErrors }) => (
             <>
               <div className="flex items-center mx-auto w-full dark:bg-[#FFFFFF0F] bg-[#FFFFFFCC] p-6 sm:p-8 rounded-2xl shadow-lg">
                 <div className="w-full">
@@ -65,6 +74,7 @@ export default function CreateDenom({
                           value: e.target.value,
                         });
                         setFieldValue('subdenom', e.target.value);
+                        setErrors({});
                       }}
                       rightElement={
                         isSimulating && (

From ec5c6d34579c65e83f378f11609e000d860339fe Mon Sep 17 00:00:00 2001
From: Joseph Chalabi <chalabi.joseph@gmail.com>
Date: Wed, 8 Jan 2025 11:33:36 -0700
Subject: [PATCH 6/9] fix: remove slice on factory prefix

---
 components/factory/forms/ConfirmationForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/factory/forms/ConfirmationForm.tsx b/components/factory/forms/ConfirmationForm.tsx
index 473d5de..20e1c6a 100644
--- a/components/factory/forms/ConfirmationForm.tsx
+++ b/components/factory/forms/ConfirmationForm.tsx
@@ -30,7 +30,7 @@ export default function ConfirmationForm({
     formData.isGroup && formData.groupPolicyAddress ? formData.groupPolicyAddress : address;
 
   const getDenomInfo = (subdenom: string) => {
-    const prefixedSubdenom = subdenom.startsWith('u') ? subdenom : 'u' + subdenom;
+    const prefixedSubdenom = 'u' + subdenom;
     const symbol = (subdenom.startsWith('u') ? subdenom.slice(1) : subdenom).toUpperCase();
     const fullDenom = `factory/${effectiveAddress}/${prefixedSubdenom}`;
     return { prefixedSubdenom, symbol, fullDenom };

From 5608a08115c6996dfc72e7406afea5e8e0e0db87 Mon Sep 17 00:00:00 2001
From: Joseph Chalabi <chalabi.joseph@gmail.com>
Date: Wed, 8 Jan 2025 11:58:48 -0700
Subject: [PATCH 7/9] chore: add code rabbit suggestions

---
 components/factory/forms/CreateDenom.tsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/components/factory/forms/CreateDenom.tsx b/components/factory/forms/CreateDenom.tsx
index f9bb221..3ba727b 100644
--- a/components/factory/forms/CreateDenom.tsx
+++ b/components/factory/forms/CreateDenom.tsx
@@ -45,7 +45,19 @@ export default function CreateDenom({
               await DenomSchema.validate(values, { abortEarly: false });
               nextStep();
             } catch (err) {
-              console.error('Validation failed:', err);
+              if (err instanceof Yup.ValidationError) {
+                const errors = err.inner.reduce(
+                  (acc: Record<string, string>, error) => ({
+                    ...acc,
+                    [error.path as string]: error.message,
+                  }),
+                  {}
+                );
+                setErrors(errors);
+              } else {
+                console.error('Unexpected error:', err);
+                setErrors({ subdenom: 'An unexpected error occurred' });
+              }
             } finally {
               setSubmitting(false);
             }

From cf58d6c3c90600a9b06b6d2f6eb40c1729ba5092 Mon Sep 17 00:00:00 2001
From: "Felix C. Morency" <1102868+fmorency@users.noreply.github.com>
Date: Wed, 8 Jan 2025 15:28:23 -0500
Subject: [PATCH 8/9] fix: alias

---
 components/factory/forms/ConfirmationForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/factory/forms/ConfirmationForm.tsx b/components/factory/forms/ConfirmationForm.tsx
index 20e1c6a..1d584bd 100644
--- a/components/factory/forms/ConfirmationForm.tsx
+++ b/components/factory/forms/ConfirmationForm.tsx
@@ -65,7 +65,7 @@ export default function ConfirmationForm({
                     {
                       denom: fullDenom,
                       exponent: 0,
-                      aliases: [symbol],
+                      aliases: [formData.display],
                     },
                     {
                       denom: formData.display,

From 2d5e171ec0f48dac4997ef6cb0b16bd455a96b03 Mon Sep 17 00:00:00 2001
From: "Felix C. Morency" <1102868+fmorency@users.noreply.github.com>
Date: Wed, 8 Jan 2025 15:33:37 -0500
Subject: [PATCH 9/9] fix: tests

---
 .../forms/__tests__/CreateDenom.test.tsx      | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/components/factory/forms/__tests__/CreateDenom.test.tsx b/components/factory/forms/__tests__/CreateDenom.test.tsx
index f6f3bfd..bcb2d0d 100644
--- a/components/factory/forms/__tests__/CreateDenom.test.tsx
+++ b/components/factory/forms/__tests__/CreateDenom.test.tsx
@@ -32,7 +32,7 @@ describe('CreateDenom Component', () => {
 
   test('updates subdenom input correctly', async () => {
     renderWithChainProvider(<CreateDenom {...mockProps} />);
-    const subdenomInput = screen.getByPlaceholderText('utoken');
+    const subdenomInput = screen.getByPlaceholderText('token');
     fireEvent.change(subdenomInput, { target: { value: 'utest' } });
     await waitFor(() => {
       expect(mockProps.dispatch).toHaveBeenCalledWith({
@@ -43,30 +43,10 @@ describe('CreateDenom Component', () => {
     });
   });
 
-  test('shows validation error for invalid subdenom', async () => {
-    renderWithChainProvider(<CreateDenom {...mockProps} />);
-    const subdenomInput = screen.getByPlaceholderText('utoken');
-    fireEvent.change(subdenomInput, { target: { value: 'invalid' } });
-    fireEvent.blur(subdenomInput);
-    await waitFor(() => {
-      expect(screen.getByText('Subdenom must start with the letter u')).toBeInTheDocument();
-    });
-  });
-
-  test('confirm button is disabled when inputs are invalid', async () => {
-    renderWithChainProvider(<CreateDenom {...mockProps} />);
-    const confirmButton = screen.getByText('Next: Token Metadata');
-    const subdenomInput = screen.getByPlaceholderText('utoken');
-    fireEvent.change(subdenomInput, { target: { value: 'invalid' } });
-    await waitFor(() => {
-      expect(confirmButton).toBeDisabled();
-    });
-  });
-
   test('confirm button is enabled when inputs are valid', async () => {
     renderWithChainProvider(<CreateDenom {...mockProps} />);
     const confirmButton = screen.getByText('Next: Token Metadata');
-    const subdenomInput = screen.getByPlaceholderText('utoken');
+    const subdenomInput = screen.getByPlaceholderText('token');
     fireEvent.change(subdenomInput, { target: { value: 'utest' } });
     fireEvent.blur(subdenomInput);
     await waitFor(() => {