sync with master

BuildOnViction · Feb 27, 2019 · 23dff52 · 23dff52
2 parents c3789e1 + eaf2f7b
commit 23dff52
Show file tree

Hide file tree

Showing 15 changed files with 690 additions and 574 deletions.
diff --git a/client/assets/scss/trumps/_custom.scss b/client/assets/scss/trumps/_custom.scss
@@ -128,3 +128,12 @@
     margin: 1em;
   }
 }
+.token-transfer {
+  .hash-tag {
+    max-width: 135px !important;
+    display: inline-block !important;
+  }
+  .internal-color {
+    color: $color-text-2;
+  }
+}
diff --git a/client/components/TableTokenHolder.vue b/client/components/TableTokenHolder.vue
@@ -30,7 +30,10 @@
 
             <template
                 slot="quantity"
-                slot-scope="props">{{ toTomo(convertHexToFloat(props.item.quantity, 16)) }}</template>
+                slot-scope="props">
+                {{ formatUnit(toTokenQuantity(props.item.quantity, props.item.tokenObj.decimals),
+                              props.item.tokenObj.symbol) }}
+            </template>
         </table-base>
 
         <b-pagination-nav

diff --git a/client/components/TableTokensByAccount.vue b/client/components/TableTokensByAccount.vue
@@ -32,8 +32,8 @@
             <template
                 slot="quantity"
                 slot-scope="props">
-                {{ formatUnit(toTomo(convertHexToFloat(props.item.quantity, 16)), props.item.tokenObj ?
-                props.item.tokenObj.symbol : '') }}
+                {{ formatUnit(toTokenQuantity(props.item.quantity, props.item.tokenObj.decimals),
+                              props.item.tokenObj.symbol) }}
             </template>
 
         </table-base>

diff --git a/client/pages/txs/_slug.vue b/client/pages/txs/_slug.vue
@@ -161,12 +161,24 @@
                                         <tr v-if="tx.tokenTxs && tx.tokenTxs.length">
                                             <td>Token Transfer</td>
                                             <td>
-                                                <ul class="list-unstyled">
-                                                    <li
+                                                <span class="token-transfer">
+                                                    <p
                                                         v-for="(tokenTx, index) in tx.tokenTxs"
                                                         :key="index"
                                                         class="mb-3">
-                                                        <span>{{ toTomo(tokenTx.value) }}</span>
+                                                        <span class="text-secondary">From </span>
+                                                        <nuxt-link
+                                                            :to="{name: 'address-slug', params: {slug: tokenTx.from}}"
+                                                            class="hash-tag text-truncate">
+                                                            {{ tokenTx.from }}</nuxt-link>
+                                                        <span class="text-secondary"> To </span>
+                                                        <nuxt-link
+                                                            :to="{name: 'address-slug', params: {slug: tokenTx.to}}"
+                                                            class="hash-tag text-truncate">
+                                                            {{ tokenTx.to }}</nuxt-link>
+                                                        <span class="text-secondary"> For </span>
+                                                        <span class="internal-color">{{
+                                                        toTokenQuantity(tokenTx.value, tokenTx.decimals) }}</span>
                                                         <nuxt-link
                                                             :to="{
                                                                 name: 'tokens-slug',
@@ -176,16 +188,8 @@
                                                                 v-if="tokenTx.symbol"
                                                                 v-html="'TRC20 (' + tokenTx.symbol + ')'"/>
                                                         </nuxt-link>
-                                                        <span>&nbsp;from&nbsp;</span>
-                                                        <nuxt-link
-                                                            :to="{name: 'address-slug', params: {slug: tokenTx.from}}"
-                                                            class="text-truncate">{{ tokenTx.from }}</nuxt-link>
-                                                        <i class="fa fa-arrow-right ml-1 mr-2 text-success"/>
-                                                        <nuxt-link
-                                                            :to="{name: 'address-slug', params: {slug: tokenTx.to}}"
-                                                            class="text-truncate">{{ tokenTx.to }}</nuxt-link>
-                                                    </li>
-                                                </ul>
+                                                    </p>
+                                                </span>
                                             </td>
                                         </tr>
                                         <tr>

diff --git a/client/plugins/mixin.js b/client/plugins/mixin.js
@@ -89,6 +89,26 @@ const mixin = {
             return mixin.methods.formatNumber(weiNumber, limitComma)
         },
 
+        toTokenQuantity: (wei, decimal) => {
+            if (isNaN(wei)) {
+                return '0'
+            }
+
+            if (typeof (wei) !== 'string') {
+                wei = wei.toString()
+            }
+
+            // Set bignumber config.
+            BigNumber.config({ EXPONENTIAL_AT: [-100, 100] })
+
+            let weiNumber = new BigNumber(wei)
+            let divided = 10 ** decimal
+
+            weiNumber = weiNumber.dividedBy(divided).toString()
+
+            return mixin.methods.formatNumber(weiNumber, decimal)
+        },
+
         toEtherNumber: (wei) => web3.utils.fromWei(wei, 'ether'),
 
         unformatAddress: (address) => address.replace(