Merge pull request #672 from pqv199x/withdraw-name

remove candidate name if tx is withdraw
BuildOnViction · Jun 14, 2019 · 1f6a5bc · 1f6a5bc
2 parents 4386bbb + d353c80
commit 1f6a5bc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/apis/transactions.js b/apis/transactions.js
@@ -60,7 +60,10 @@ router.get('/voter/:voter', [
                 smartContractAddress: config.get('blockchain.validatorAddress'),
                 candidate: t.candidate
             }) || {}
-            c.name = b.name || 'Anonymous'
+
+            if (t.event === 'Withdraw') {
+                c.name = ''
+            } else { c.name = b.name || 'Anonymous' }
             return c
         }))
         return res.json({

diff --git a/app/assets/scss/components/_navbar.scss b/app/assets/scss/components/_navbar.scss
@@ -135,6 +135,7 @@
     a {
         text-align: center;
         text-decoration: none;
+        white-space: pre-wrap;
         cursor: pointer;
 
         &:hover {

diff --git a/app/components/voters/View.vue b/app/components/voters/View.vue
@@ -507,7 +507,7 @@ export default {
                         event: tx.event,
                         cap: new BigNumber(tx.capacity).div(10 ** 18).toNumber(),
                         createdAt: moment(tx.createdAt).fromNow(),
-                        name: tx.name,
+                        name: tx.name || '---',
                         candidateCap: (new BigNumber(tx.currentCandidateCap).div(10 ** 18).toNumber()) || '---'
                     })
                 })