Merge pull request #219 from MickWang/master

update vote records weight
ontio · Jan 21, 2020 · 741aece · 741aece
2 parents dce3d7c + 537dcdb
commit 741aece
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/renderer/components/Node/Vote/Detail.vue b/src/renderer/components/Node/Vote/Detail.vue
@@ -23,7 +23,7 @@
 						v-if="!isVoter">
 						<a-icon type="caret-down"
 							class="icon-reject" />
-						<span class="total-voted">{{vote.approves}}</span>
+						<span class="total-voted">{{vote.rejects}}</span>
 						<span class="text-smal">votes</span>
 					</div>
 

diff --git a/src/renderer/store/modules/Vote.js b/src/renderer/store/modules/Vote.js
@@ -379,7 +379,7 @@ const actions = {
         return;
     },
 
-    async getVotedRecords({ commit, state }, { hash }) {
+    async getVotedRecords({ commit, dispatch, state }, { hash }) {
         const net = localStorage.getItem('net');
         const client = getRestClient()
         const contract = new Crypto.Address(utils.reverseHex(contract_hash[net]))
@@ -397,10 +397,12 @@ const actions = {
                     isApproval: formatNumber(i[1]) === 1 ? true : false
                 }
             })
+            const voters = await dispatch('getVoters', {hash})
             for (let item of records) {
-                for (let voter of state.all_voters) {
+                for (let voter of voters) {
                     if (voter.address === item.address) {
-                        item.name = voter.name
+                        const voter_with_name = state.all_voters.find(item => item.address === voter.address)
+                        item.name = voter_with_name ? voter_with_name.name : ''
                         item.weight = voter.weight
                     }
                 }