Merge pull request #169 from MickWang/master

fix search my stake records error display issue
ontio · Jun 26, 2019 · 7663494 · 7663494
2 parents 84b9b0c + 74efae4
commit 7663494
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/renderer/store/modules/NodeAuthorization.js b/src/renderer/store/modules/NodeAuthorization.js
@@ -35,13 +35,17 @@ async function matchNodeName(list) {
     }
     for(const item of list) {
         for (const cnode of nodes) {
-            if (!cnode || !cnode.PublicKey) {
-                 item.name = 'Node_' + (item.address.toBase58 ? item.address.toBase58().substr(0, 6) : item.address.substr(0, 6));
-            }
-            else if (cnode.PublicKey === item.pk || cnode.PublicKey  === item.peerPubkey) {
+            if (cnode.PublicKey === item.pk || cnode.PublicKey  === item.peerPubkey) {
                 item.name = cnode.Name
                 break;
             }
+            else if (!cnode || !cnode.PublicKey) {
+                if (item.address) {
+                    item.name = 'Node_' + (item.address.toBase58 ? item.address.toBase58().substr(0, 6) : item.address.substr(0, 6));
+                } else {
+                    item.name = 'Node_' + item.pk.substr(0, 6)
+                }
+            }
         }
     } 
 }