Merge branch 'master' of github.com:tomochain/tomomaster

BuildOnViction · Jun 26, 2019 · 1311322 · 1311322
2 parents 45459af + 1f6a5bc
commit 1311322
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 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/App.vue b/app/App.vue
@@ -172,12 +172,23 @@
                                 <div
                                     v-if="!isTomonet"
                                     class="notification_body">
+                                    <b-dropdown-text>
+                                        <div style="font-size: 13px;">
+                                            <strong>TomoMaster up to 1.5.0</strong>
+                                            <p>- Display average ROI for masternode owner and voter</p>
+                                            <p>- Display owner ROI and voter ROI in masternode detail page</p>
+                                            <p>- Add withdrawal notification</p>
+                                            <p>- Add sitemap</p>
+                                        </div>
+                                    </b-dropdown-text>
+                                    <b-dropdown-divider/>
                                     <b-dropdown-text>
                                         <div style="font-size: 13px;">
                                             <strong>TomoMaster up to 1.4.3</strong>
                                             <p>- Fix id injection issue</p>
                                         </div>
                                     </b-dropdown-text>
+                                    <b-dropdown-divider/>
                                     <b-dropdown-text>
                                         <div style="font-size: 13px;">
                                             <strong>TomoMaster up to 1.4.2</strong>

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()) || '---'
                     })
                 })

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tomomaster",
-    "version": "1.4.3",
+    "version": "1.5.0",
     "description": "TomoChain Governance DApp",
     "main": "elect.js",
     "scripts": {