Merge pull request #94 from terra-money/fix/hackathon

template fixes
terra-money · Oct 3, 2023 · af7c158 · af7c158
2 parents 927fff1 + 23d2c6e
commit af7c158
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 16 deletions.
diff --git a/apps/shared/hooks/useLocalWallet.ts b/apps/shared/hooks/useLocalWallet.ts
@@ -40,5 +40,6 @@ export const useLocalWallet = (): LocalWallet => {
       walletAddress: connectedWallet ? connectedWallet.addresses[selectedChainId] : '',
       lcd,
     };
+  // }, [connectedWallet, lcdClientConfig, selectedChainId]);
   }, [connectedWallet, wallet, lcdClientConfig, lcd, selectedChain, selectedChainId]);
 };
diff --git a/apps/warp-protocol/src/pages/job-new/JobNew.tsx b/apps/warp-protocol/src/pages/job-new/JobNew.tsx
@@ -163,7 +163,7 @@ export const parseMsgs = (value: string): warp_resolver.CosmosMsgFor_Empty[] =>
   return msgs;
 };
 
-const encodeMsg = (input: warp_resolver.CosmosMsgFor_Empty): warp_resolver.CosmosMsgFor_Empty => {
+export const encodeMsg = (input: warp_resolver.CosmosMsgFor_Empty): warp_resolver.CosmosMsgFor_Empty => {
   if (!('wasm' in input)) {
     return input;
   }

diff --git a/apps/warp-protocol/src/pages/job-new/details-form/template-form/TemplateForm.tsx b/apps/warp-protocol/src/pages/job-new/details-form/template-form/TemplateForm.tsx
@@ -7,24 +7,32 @@ import { TemplatesInput } from '../templates-input/TemplatesInput';
 import { TemplateVarInput } from '../template-var-input/TemplateVarInput';
 import { findVariablePath, templateVariables } from 'utils/variable';
 import { EditorInput } from 'forms/QueryExprForm/EditorInput';
+import { decodeMsgs, encodeMsg, parseMsgs } from 'pages/job-new/JobNew';
 
 const composeMsgFromTemplate = (template: warp_templates.Template): string => {
   const vars = templateVariables(template);
-  let json = JSON.parse(template.msg);
 
-  vars.forEach((v) => {
-    try {
-      const path = findVariablePath(json, v.name);
+  let msgs = decodeMsgs(parseMsgs(template.msg));
 
-      if (path) {
-        jsonpath.value(json, path, v.value);
+  msgs = msgs.map((msg) => {
+    let json = JSON.stringify(msg);
+
+    vars.forEach((v) => {
+      try {
+        const path = findVariablePath(json, v.name);
+
+        if (path) {
+          jsonpath.value(json, path, v.value);
+        }
+      } catch (err) {
+        // consume the error
       }
-    } catch (err) {
-      // consume the error
-    }
+    });
+
+    return encodeMsg(parseMsgs(json)[0]);
   });
 
-  return JSON.stringify(json, null, 2);
+  return JSON.stringify(msgs, null, 2);
 };
 
 type TemplateFormProps = {

diff --git a/apps/warp-protocol/src/pages/template-new/TemplateNew.tsx b/apps/warp-protocol/src/pages/template-new/TemplateNew.tsx
@@ -79,7 +79,7 @@ export const TemplateNew = (props: TemplateNewProps) => {
               const msgs = parseMsgs(msg);
               const res = await createTemplateTx({
                 formatted_str: formattedStr,
-                msg,
+                msgs,
                 condition,
                 vars: extractUsedVariables(formattedStr, msgs, vars, condition),
                 name,

diff --git a/apps/warp-protocol/src/tx/useCreateTemplateTx.ts b/apps/warp-protocol/src/tx/useCreateTemplateTx.ts
@@ -1,23 +1,29 @@
 import { useTx } from '@terra-money/apps/libs/transactions';
 import { useWarpSdk } from '@terra-money/apps/hooks';
 import { TX_KEY } from './txKey';
-import { warp_templates } from '@terra-money/warp-sdk';
+import { warp_resolver } from '@terra-money/warp-sdk';
 
-export type CreateTemplateTxProps = warp_templates.SubmitTemplateMsg;
+export type CreateTemplateTxProps = {
+  condition?: warp_resolver.Condition | null;
+  formatted_str: string;
+  msgs: warp_resolver.CosmosMsgFor_Empty[];
+  name: string;
+  vars: warp_resolver.Variable[];
+};
 
 export const useCreateTemplateTx = () => {
   const sdk = useWarpSdk();
 
   return useTx<CreateTemplateTxProps>(
     async (options) => {
-      const { wallet, formatted_str, vars, name, msg, condition } = options;
+      const { wallet, formatted_str, vars, name, msgs, condition } = options;
 
       return sdk.tx.submitTemplate(wallet.walletAddress, {
         formatted_str,
         condition,
         vars,
         name,
-        msg,
+        msg: JSON.stringify(msgs),
       });
     },
     {