fix(rwa): return loading state of the create contract, when there was…

… an issue (#2774)
kadena-community · Jan 7, 2025 · 1d28f41 · 1d28f41
1 parent 2c9828f
commit 1d28f41
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/.changeset/sweet-taxis-try.md b/.changeset/sweet-taxis-try.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/apps/rwa-demo/src/components/AssetForm/AddExistingAssetForm.tsx b/packages/apps/rwa-demo/src/components/AssetForm/AddExistingAssetForm.tsx
@@ -1,6 +1,5 @@
 import { useAsset } from '@/hooks/asset';
 import { Button, Stack, TextField } from '@kadena/kode-ui';
-import { useRouter } from 'next/navigation';
 import type { FC } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 
@@ -12,8 +11,7 @@ interface IAddExistingAssetProps {
 }
 
 export const AddExistingAssetForm: FC<IProps> = ({ handleDone }) => {
-  const router = useRouter();
-  const { addExistingAsset } = useAsset();
+  const { setAsset, addExistingAsset } = useAsset();
   const {
     handleSubmit,
     control,
@@ -28,7 +26,9 @@ export const AddExistingAssetForm: FC<IProps> = ({ handleDone }) => {
     const asset = addExistingAsset(data.name);
     if (!asset) return;
 
-    router.refresh();
+    setAsset(asset);
+    window.location.href = '/';
+
     if (handleDone) handleDone();
   };
 

diff --git a/packages/apps/rwa-demo/src/components/AssetForm/AssetStepperForm.tsx b/packages/apps/rwa-demo/src/components/AssetForm/AssetStepperForm.tsx
@@ -61,14 +61,14 @@ export const AssetStepperForm: FC<IProps> = ({ handleDone }) => {
     setError('');
     if (!data.namespace) {
       setError('there was an issue creating the namespace');
+      setIsLoading(false);
       return;
     }
 
     setIsLoading(true);
     const tx = await submitContract(data);
     if (tx?.result?.status === 'success') {
       setStep(STEPS.DONE);
-      setIsLoading(false);
       const asset = addAsset({
         contractName: data.contractName,
         namespace: data.namespace,
@@ -77,6 +77,7 @@ export const AssetStepperForm: FC<IProps> = ({ handleDone }) => {
       setAsset(asset);
       window.location.href = '/';
     }
+    setIsLoading(false);
   };
 
   return (
@@ -123,7 +124,9 @@ export const AssetStepperForm: FC<IProps> = ({ handleDone }) => {
             <Controller
               name="namespace"
               control={control}
-              rules={{ required: true }}
+              rules={{
+                required: true,
+              }}
               render={({ field }) => (
                 <TextField label="Namespace" isDisabled {...field} />
               )}
@@ -132,7 +135,13 @@ export const AssetStepperForm: FC<IProps> = ({ handleDone }) => {
             <Controller
               name="contractName"
               control={control}
-              rules={{ required: true }}
+              rules={{
+                required: true,
+                pattern: {
+                  value: /^\S*$/gi,
+                  message: 'no spaces allowed',
+                },
+              }}
               render={({ field }) => (
                 <TextField label="Contract Name" {...field} />
               )}

diff --git a/packages/apps/rwa-demo/src/components/TransactionsProvider/TransactionsProvider.tsx b/packages/apps/rwa-demo/src/components/TransactionsProvider/TransactionsProvider.tsx
@@ -91,6 +91,9 @@ const interpretMessage = (str: string, data?: ITransaction): string => {
   if (str?.includes('exceeds max investor')) {
     return `The maximum amount of investors has been reached`;
   }
+  if (str?.includes('PactDuplicateTableError')) {
+    return `This already exists`;
+  }
 
   return `${data?.type}: ${str}`;
 };