Fix for processing json strings in non-string fields

greymass · Feb 24, 2019 · f8f43f8 · f8f43f8
1 parent 1231366
commit f8f43f8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/app/shared/components/Contract/Interface/Form/Action.js b/app/shared/components/Contract/Interface/Form/Action.js
@@ -2,6 +2,7 @@
 import React, { Component } from 'react';
 import { translate } from 'react-i18next';
 import { Button, Divider, Form, Header, Message } from 'semantic-ui-react';
+import { attempt, isError } from 'lodash';
 
 import GlobalTransactionModal from '../../../Global/Transaction/Modal';
 import GlobalFormFieldGeneric from '../../../Global/Form/Field/Generic';
@@ -35,6 +36,7 @@ class ContractInterfaceFormAction extends Component<Props> {
     if (type === 'array') {
       fieldType = 'array';
     }
+
     switch (fieldType) {
       case 'int': {
         return parseInt(value, 10);
@@ -45,7 +47,13 @@ class ContractInterfaceFormAction extends Component<Props> {
       case 'array': {
         return value;
       }
+      case 'string': {
+        return String(value);
+      }
       default: {
+        if (!isError(attempt(JSON.parse, value))) {
+          return JSON.parse(value);
+        }
         return String(value);
       }
     }

diff --git a/app/shared/utils/EOS/Contract.js b/app/shared/utils/EOS/Contract.js
@@ -74,6 +74,9 @@ export default class EOSContract {
     if (field && field.type in this.typeMap) {
       return this.typeMap[field.type];
     }
+    if (field && field.type) {
+      return field.type;
+    }
     return 'string';
   }