Merge pull request #46 from St3C/master

fixed the 'address array not showed' bug.
trufflesuite · Feb 19, 2019 · 8ee80c7 · 8ee80c7
2 parents 3d3e22f + 96e50f8
commit 8ee80c7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/ContractData.js b/src/ContractData.js
@@ -77,12 +77,14 @@ class ContractData extends Component {
     }
 
     // If return value is an array
-    if (typeof displayData === "array") {
+    if (Array.isArray(displayData)) {
       const displayListItems = displayData.map((datum, index) => {
-        <li key={index}>
-          {`${datum}`}
-          {pendingSpinner}
-        </li>;
+        return (
+          <li key={index}>
+            {`${datum}`}
+            {pendingSpinner}
+          </li>
+        );
       });
 
       return <ul>{displayListItems}</ul>;

diff --git a/src/new-context-api/ContractData.js b/src/new-context-api/ContractData.js
@@ -17,7 +17,7 @@ class ContractData extends Component {
   }
 
   // TODO refactor this
-  componentWillReceiveProps(nextProps) {
+  UNSAFE_componentWillReceiveProps(nextProps) {
     const { methodArgs, contract, method } = this.props;
 
     const didContractChange = contract !== nextProps.contract;
@@ -78,12 +78,14 @@ class ContractData extends Component {
     }
 
     // If return value is an array
-    if (typeof displayData === "array") {
+    if (Array.isArray(displayData)) {
       const displayListItems = displayData.map((datum, index) => {
-        <li key={index}>
-          {`${datum}`}
-          {pendingSpinner}
-        </li>;
+        return (
+          <li key={index}>
+            {`${datum}`}
+            {pendingSpinner}
+          </li>
+        );
       });
 
       return <ul>{displayListItems}</ul>;