From 6fa91ef5903d00ff4d4a7877cd3cb2382d71ff64 Mon Sep 17 00:00:00 2001
From: tunght91 <hoangtungutc@gmail.com>
Date: Tue, 19 Dec 2017 16:32:12 +0700
Subject: [PATCH 1/4] fix round coin number

---
 app/App.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/App.vue b/app/App.vue
index 7419625..355a4bc 100644
--- a/app/App.vue
+++ b/app/App.vue
@@ -61,10 +61,10 @@
         <div class="sumaryCoin">
           <h3>You have total:</h3>
           <h1>
-            <strong>{{(Math.floor((tmcSidechain + tmcMainchain)*100)/100).toFixed(2)}}</strong>
+            <strong>{{(tmcSidechain + tmcMainchain).toFixed(2)}}</strong>
             <small>TMC</small>
             <span v-if="expandSumaryCoin">
-              = {{tmcSidechain}} <small>TMC in Tomochain</small> + {{tmcMainchain}} <small>TMC in Ethereum</small>
+              = {{tmcSidechain.toFixed(2)}} <small>TMC in Tomochain</small> + {{tmcMainchain.toFixed(2)}} <small>TMC in Ethereum</small>
             </span>
             <md-button class="md-icon-button" @click="toggleExpandSumaryCoin">
               <md-icon v-if="expandSumaryCoin">keyboard_arrow_left</md-icon>
@@ -142,7 +142,7 @@
           <md-table md-card>
             <md-table-row>
               <md-table-head style="width: 230px">Time</md-table-head>
-              <md-table-head>Type</md-table-head>
+              <md-table-head style="width: 150px">Type</md-table-head>
               <md-table-head>Detail</md-table-head>
               <md-table-head md-numeric>TMC in Tomochain</md-table-head>
               <md-table-head md-numeric>TMC in Ethereum</md-table-head>
@@ -163,15 +163,15 @@
               <md-table-cell>{{e.msg}}</md-table-cell>
               <md-table-cell md-numeric>
                 <span class="color-side-chain">
-                  {{e.tmcSidechain}}
+                  {{(e.tmcSidechain || tmcSidechain) .toFixed(2)}}
                 </span>
               </md-table-cell>
               <md-table-cell md-numeric>
                 <span class="color-main-chain">
-                  {{e.tmcMainchain}}
+                  {{(e.tmcMainchain || tmcMainchain).toFixed(2)}}
                 </span>
               </md-table-cell>
-              <md-table-cell md-numeric>{{e.total}}</md-table-cell>
+              <md-table-cell md-numeric>{{(e.total || (tmcSidechain + tmcMainchain)).toFixed(2)}}</md-table-cell>
             </md-table-row>
           </md-table>
         </div>

From 68e9f0f7dd2521c426a836ff5a6f69f0e6f74c6f Mon Sep 17 00:00:00 2001
From: tunght91 <hoangtungutc@gmail.com>
Date: Tue, 19 Dec 2017 16:36:11 +0700
Subject: [PATCH 2/4] fix bug mine first coin

---
 app/App.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/App.vue b/app/App.vue
index 355a4bc..c171ea0 100644
--- a/app/App.vue
+++ b/app/App.vue
@@ -76,7 +76,7 @@
       </md-toolbar>
 
 
-      <md-empty-state v-if="hasCoin"
+      <md-empty-state v-if="!hasCoin"
         md-icon="devices_other"
         md-label="Get your first Tomocoins"
         md-description="Hello friends, click MINE TomoCoin to receive your first Tomocoins from Tomo Reward Engine">
@@ -142,7 +142,7 @@
           <md-table md-card>
             <md-table-row>
               <md-table-head style="width: 230px">Time</md-table-head>
-              <md-table-head style="width: 150px">Type</md-table-head>
+              <md-table-head style="width: 160px">Type</md-table-head>
               <md-table-head>Detail</md-table-head>
               <md-table-head md-numeric>TMC in Tomochain</md-table-head>
               <md-table-head md-numeric>TMC in Ethereum</md-table-head>

From b93d6cf1f4f35e65e9420ff448da3023c9a0fb19 Mon Sep 17 00:00:00 2001
From: Thanh Son <thanhson1085@gmail.com>
Date: Tue, 19 Dec 2017 15:52:36 +0000
Subject: [PATCH 3/4] remove nodiscover params

---
 tomochain/entrypoint.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tomochain/entrypoint.sh b/tomochain/entrypoint.sh
index 25f3bec..936617f 100644
--- a/tomochain/entrypoint.sh
+++ b/tomochain/entrypoint.sh
@@ -4,9 +4,9 @@ if [ ! -d /build/tomochain/geth/chaindata ]
 then
   wallet=$(geth account new --password /build/.pwd --datadir /build/tomochain | awk -v FS="({|})" '{print $2}')
   sed -i "s/:wallet:/${wallet}/g" /build/tomochain.json
-  geth --nodiscover --datadir /build/tomochain init tomochain.json
-  geth --nodiscover --datadir /build/tomochain --rpc --rpcaddr 0.0.0.0 --rpcport 8545 --unlock "${wallet}" --password /build/.pwd --mine
+  geth --datadir /build/tomochain init tomochain.json
+  geth --datadir /build/tomochain --rpc --rpcaddr 0.0.0.0 --rpcport 8545 --unlock "${wallet}" --password /build/.pwd --mine
 else
   wallet=$(geth account list --datadir /build/tomochain| head -n 1 | awk -v FS="({|})" '{print $2}')
-  geth --nodiscover --datadir /build/tomochain --rpc --rpcaddr 0.0.0.0 --rpcport 8545 --unlock "${wallet}" --password /build/.pwd --mine
+  geth --datadir /build/tomochain --rpc --rpcaddr 0.0.0.0 --rpcport 8545 --unlock "${wallet}" --password /build/.pwd --mine
 fi

From 5f5f37599bb82e7576162a7534ef483adb8315e5 Mon Sep 17 00:00:00 2001
From: Thanh Son <thanhson1085@gmail.com>
Date: Tue, 19 Dec 2017 17:54:50 +0000
Subject: [PATCH 4/4] swap nginx config

---
 nginx/app.template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nginx/app.template b/nginx/app.template
index 8102675..52cd30f 100644
--- a/nginx/app.template
+++ b/nginx/app.template
@@ -7,8 +7,8 @@ upstream be_stats {
 }
 
 server {
-    listen 80 default_server;
-    listen [::]:80 default_server ipv6only=on;
+    listen 80;
+    server_name testnet.tomocoin.io;
 
     location / {
         proxy_set_header Upgrade $http_upgrade;
@@ -21,8 +21,8 @@ server {
 }
 
 server {
-    listen 80;
-    server_name stats.tomocoin.io;
+    listen 80 default_server;
+    listen [::]:80 default_server ipv6only=on;
 
     location / {
         proxy_set_header Upgrade $http_upgrade;