Fix minor bugs

tact-lang · Oct 24, 2023 · ca95cc2 · ca95cc2
1 parent 8a56763
commit ca95cc2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/src/components/workspace/ABIUi/ABIUi.tsx b/src/components/workspace/ABIUi/ABIUi.tsx
@@ -61,6 +61,7 @@ const ABIUi: FC<Props> = ({
         abi.name,
         contract as any,
         language,
+        abi?.kind,
         stack as any,
         network
       );
@@ -109,7 +110,7 @@ const ABIUi: FC<Props> = ({
               className={s.formItemABI}
               rules={[{ required: true, message: 'Please input value' }]}
             >
-              <Input placeholder={`${item.name}:${item.type}`} />
+              <Input placeholder={`${item.name}: ${item.type}`} />
             </Form.Item>
           </div>
         ))}

diff --git a/src/hooks/contract.hooks.ts b/src/hooks/contract.hooks.ts
@@ -195,6 +195,7 @@ export function useContractAction() {
     methodName: string,
     contract: SandboxContract<UserContract> | null = null,
     language: ContractLanguage,
+    kind?: string,
     stack?: TupleItem[],
     network?: Network | Partial<NetworkEnvironment>
   ) {
@@ -203,9 +204,12 @@ export function useContractAction() {
 
       const sender = sandboxWallet!!.getSender();
 
-      let messageParams = {
+      let messageParams: any = {
         $$type: methodName,
       };
+      if (kind === 'text') {
+        messageParams = methodName;
+      }
       stack?.forEach((item: any) => {
         messageParams = {
           ...messageParams,
@@ -231,6 +235,7 @@ export function useContractAction() {
     methodName: string,
     contract: SandboxContract<UserContract> | null = null,
     language: ContractLanguage,
+    kind?: string,
     stack?: TupleItem[],
     network?: Network | Partial<NetworkEnvironment>
   ) {

diff --git a/src/hooks/project.hooks.ts b/src/hooks/project.hooks.ts
@@ -224,7 +224,15 @@ export function useProjectActions() {
       if (item.message.type === 'Deploy') {
         return;
       }
-      if (item.message.type) {
+      if (item.message.kind) {
+        if (item.message.kind !== 'typed') {
+          setters.push({
+            name: item.message.text,
+            parameters: [],
+            kind: item.message.kind,
+          });
+          return;
+        }
         const singleItem = (output.abi as any).types.find(
           (type: any) => type.name === item.message.type
         );
@@ -236,6 +244,7 @@ export function useProjectActions() {
               type: parameter.type.type,
               format: parameter.type.format,
               optional: parameter.type.optional,
+              kind: item.message.kind,
             };
           }),
         };

diff --git a/src/interfaces/workspace.interface.ts b/src/interfaces/workspace.interface.ts
@@ -59,6 +59,7 @@ export interface ABIParameter {
 
 export interface ABIField {
   name: string;
+  kind: string;
   parameters: ABIParameter[];
   arguments: ABIParameter[];
   returnTypes: ABIParameter;