Update XDR validation + show error message on View XDR page (#877)

* Update XDR validation + show error message on View XDR page * Update XDR validation + show error message on View XDR page
stellar · Jun 14, 2024 · ae1c715 · ae1c715
1 parent 80691ee
commit ae1c715
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/src/app/(sidebar)/transaction/sign/components/Import.tsx b/src/app/(sidebar)/transaction/sign/components/Import.tsx
@@ -30,10 +30,12 @@ export const Import = () => {
     if (value.length > 0) {
       const validatedXDR = validate.xdr(value);
 
-      if (validatedXDR.result === "success") {
-        setTxSuccessMsg(validatedXDR.message);
-      } else {
-        setTxErrMsg(validatedXDR.message);
+      if (validatedXDR?.result && validatedXDR.message) {
+        if (validatedXDR.result === "success") {
+          setTxSuccessMsg(validatedXDR.message);
+        } else {
+          setTxErrMsg(validatedXDR.message);
+        }
       }
     }
   };

diff --git a/src/app/(sidebar)/xdr/view/page.tsx b/src/app/(sidebar)/xdr/view/page.tsx
@@ -74,7 +74,7 @@ export default function ViewXdr() {
     } catch (e) {
       return {
         jsonString: "",
-        error: `Unable to decode input as ${xdr.type}`,
+        error: `Unable to decode input as ${xdr.type}: ${e}`,
       };
     }
   };

diff --git a/src/components/formComponentTemplateEndpoints.tsx b/src/components/formComponentTemplateEndpoints.tsx
@@ -54,6 +54,15 @@ type TemplateRenderIncludeFailedProps = {
   isRequired?: boolean;
 };
 
+type TemplateRenderTxProps = {
+  value: string | undefined;
+  error:
+    | { result: string; message: "string"; originalError?: string }
+    | undefined;
+  onChange: (val: any) => void;
+  isRequired?: boolean;
+};
+
 type FormComponentTemplateEndpointsProps = {
   render: (...args: any[]) => JSX.Element;
   validate: ((...args: any[]) => any) | null;
@@ -656,14 +665,14 @@ export const formComponentTemplateEndpoints = (
       };
     case "tx":
       return {
-        render: (templ: TemplateRenderProps) => (
+        render: (templ: TemplateRenderTxProps) => (
           <XdrPicker
             key={id}
             id={id}
             label="Transaction Envelope XDR"
             labelSuffix={!templ.isRequired ? "optional" : undefined}
             value={templ.value || ""}
-            error={templ.error}
+            error={templ.error?.result === "error" ? templ.error?.message : ""}
             onChange={templ.onChange}
           />
         ),

diff --git a/src/validate/methods/xdr.ts b/src/validate/methods/xdr.ts
@@ -13,6 +13,10 @@ const validateBase64 = (value: string) => {
 };
 
 export const xdr = (value: string) => {
+  if (!value) {
+    return undefined;
+  }
+
   const sanitizedXdr = trim(value);
   const base64Validation = validateBase64(sanitizedXdr);