From c009a289d51b0f191ec10d93fa53220ce6d6c5d3 Mon Sep 17 00:00:00 2001
From: Nicolas Gotchac <ngotchac@gmail.com>
Date: Sun, 19 Mar 2017 08:52:14 +0100
Subject: [PATCH] Fix outputs in Contract Constant Queries (#4953)

---
 js/src/views/Contract/Queries/queries.js | 53 +++++++++++++++++-------
 js/src/views/Contract/contract.js        |  7 +++-
 2 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/js/src/views/Contract/Queries/queries.js b/js/src/views/Contract/Queries/queries.js
index 299d1ee84..de939a93d 100644
--- a/js/src/views/Contract/Queries/queries.js
+++ b/js/src/views/Contract/Queries/queries.js
@@ -40,7 +40,6 @@ export default class Queries extends Component {
     if (!contract) {
       return null;
     }
-
     const queries = contract.functions
       .filter((fn) => fn.constant)
       .sort(this._sortEntries);
@@ -113,7 +112,12 @@ export default class Queries extends Component {
   }
 
   renderQuery (fn) {
-    const { values } = this.props;
+    const { abi } = fn;
+    let values = this.props.values[fn.name] || [];
+
+    if (values && typeof values.slice === 'function') {
+      values = values.slice();
+    }
 
     return (
       <div className={ styles.container } key={ fn.signature }>
@@ -125,40 +129,59 @@ export default class Queries extends Component {
           <CardText
             className={ styles.methodContent }
           >
-            { this.renderValue(values[fn.name], fn.outputs[0].kind.type) }
+            {
+              abi.outputs
+                .map((output, index) => this.renderValue(values[index], output, index))
+            }
           </CardText>
         </Card>
       </div>
     );
   }
 
-  renderValue (value, type) {
-    if (typeof value === 'undefined') {
+  renderValue (tokenValue, output, key) {
+    if (typeof tokenValue === 'undefined') {
       return null;
     }
 
-    const { api } = this.context;
     const { accountsInfo } = this.props;
+    const { name, type } = output;
+    const label = `${name ? `${name}: ` : ''}${type}`;
+    const value = this.getTokenValue(tokenValue);
 
-    let valueToDisplay = value;
-
-    if (api.util.isArray(value)) {
-      valueToDisplay = api.util.bytesToHex(value);
-    } else if (typeof value === 'boolean') {
-      valueToDisplay = value ? 'true' : 'false';
-    }
     return (
       <TypedInput
         accounts={ accountsInfo }
         allowCopy
+        key={ key }
         isEth={ false }
-        param={ type }
+        label={ label }
+        param={ output.type }
         readOnly
-        value={ valueToDisplay }
+        value={ value }
       />
     );
   }
 
+  getTokenValue (token) {
+    const { api } = this.context;
+    const { type, value } = token;
+
+    if (value === null || value === undefined) {
+      return 'no data';
+    }
+
+    if (type === 'array' || type === 'fixedArray') {
+      return value.map((tok) => this.getTokenValue(tok));
+    }
+
+    if (Array.isArray(value)) {
+      return api.util.bytesToHex(value);
+    }
+
+    return value;
+  }
+
   _sortEntries (a, b) {
     return a.name.localeCompare(b.name);
   }
diff --git a/js/src/views/Contract/contract.js b/js/src/views/Contract/contract.js
index 801bd3f43..9f75bcbe8 100644
--- a/js/src/views/Contract/contract.js
+++ b/js/src/views/Contract/contract.js
@@ -363,12 +363,15 @@ class Contract extends Component {
       .filter((fn) => !fn.inputs.length);
 
     Promise
-      .all(queries.map((query) => query.call()))
+      .all(queries.map((query) => query.call({ rawTokens: true })))
       .then(results => {
         const values = queries.reduce((object, fn, idx) => {
           const key = fn.name;
 
-          object[key] = results[idx];
+          object[key] = fn.outputs.length === 1
+            ? [ results[idx] ]
+            : results[idx];
+
           return object;
         }, {});