From fdf75dd2be0d70584ba48a70c7c47aa46b01780f Mon Sep 17 00:00:00 2001
From: Angelia <angelia@Angelia-MacBook-Pro.local>
Date: Wed, 15 Jul 2020 12:53:05 +0800
Subject: [PATCH 1/3] feat: when value is 0, display 0

---
 src/lang/zh.js     | 3 +--
 src/utils/index.js | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lang/zh.js b/src/lang/zh.js
index 0ec9c98..d2c9125 100755
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -246,8 +246,7 @@ export default {
   'app.common.abi': 'ABI',
   'app.common.officialSite': '官方网站',
   'app.common.contract': '合约',
-  'app.pages.index.testnet.notice1':
-    '1. 当前网络为 Conflux Testnet，Conflux-Rust 版本号：v0.6.0-rc-1，所有数据均为 Conflux 测试网数据。',
+  'app.pages.index.testnet.notice1': '1. 当前网络为 Conflux Testnet，Conflux-Rust 版本号：v0.6.0-rc-1，所有数据均为 Conflux 测试网数据。',
   'app.pages.index.testnet.notice2': '2. Conflux 主网第一阶段 Conflux Pontus 已于 2020.4.27 上线，欢迎体验。',
   'app.pages.index.mainnet.notice1': '当前网络为 Conflux 主网第一阶段 Conflux Pontus，Conflux-Rust 版本号：v0.5.2',
 
diff --git a/src/utils/index.js b/src/utils/index.js
index 1cd68cd..f9e3d10 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -18,6 +18,7 @@ let source = null;
 
 export const convertToValueorFee = (bigNumber) => {
   const result = new BigNumber(bigNumber).dividedBy(10 ** 18);
+  if (result.toNumber() === 0) return '0';
   if (result.toNumber() < 0.00001) return `< 0.00001`;
   return `${result.toString(10)}`;
 };

From 16550af3d84fd086bc0d7130bd54a97d62b368ae Mon Sep 17 00:00:00 2001
From: Angelia <angelia@Angelia-MacBook-Pro.local>
Date: Wed, 15 Jul 2020 13:07:04 +0800
Subject: [PATCH 2/3] fix: dev proxy address

---
 webpack.dev.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webpack.dev.config.js b/webpack.dev.config.js
index 93bc47e..af7071e 100755
--- a/webpack.dev.config.js
+++ b/webpack.dev.config.js
@@ -21,7 +21,7 @@ module.exports = merge(commom, {
     proxy: {
       // '/proxy': 'http://127.0.0.1:3000',
       '/api': {
-        target: 'http://13.75.69.106:8885',
+        target: 'http://47.95.128.92:8885',
         // target: 'http://13.75.69.106',
         // pathRewrite: { '^/api': '' },
       },
@@ -32,7 +32,7 @@ module.exports = merge(commom, {
         target: 'http://wallet-mainnet-jsonrpc.conflux-chain.org:12537',
       },
       '/contract-manager': {
-        target: 'http://13.75.69.106:8886',
+        target: 'http://182.92.71.168:8886',
         pathRewrite: { '^/contract-manager': '' },
       },
       // for developing dag locally

From 545c49c7d11bdb8ffd757e7ca03ccf78d92f3906 Mon Sep 17 00:00:00 2001
From: Angelia <angelia@Angelia-MacBook-Pro.local>
Date: Wed, 15 Jul 2020 15:15:09 +0800
Subject: [PATCH 3/3] feat: change notice first time

---
 src/lang/en.js          | 8 +++++---
 src/lang/zh.js          | 6 ++++--
 src/pages/Home/index.js | 1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index 3614dea..ecdbd0d 100755
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -168,10 +168,12 @@ export default {
   'app.common.officialSite': 'Official Site',
   'app.common.contract': 'Contract',
   'app.pages.index.testnet.notice1':
-    '1. ConfluxScan is currently on the testnet network, Conflux-Rust version: v0.6.0-rc-1, all data shown are from the testnet.',
+    '1. ConfluxScan is currently on the testnet network, Conflux-Rust version: v0.6.0-rc-3, all data shown are from the testnet.',
   'app.pages.index.testnet.notice2': '2. Conflux Pontus is now live.',
-  'app.pages.index.mainnet.notice1': 'ConfluxScan is currently on the Mainnet Phase I - Pontus, Conflux-Rust version: v0.5.2',
-
+  'app.pages.index.mainnet.notice1':
+    '1. Conflux Mainnet Phase II - Oceanus - will officially launch between the 17th and 18th of July. If you are a DApp developer, please make sure to back up your relevant data.',
+  'app.pages.index.mainnet.notice2':
+    "2. During the launch of Conflux Oceanus, FC transfers might be affected. Please don't transfer any FC during the launch.",
   'security.High': 'Great',
   'security.Medium': 'Good',
   'security.Low': 'Weak',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index d2c9125..b760d6c 100755
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -246,9 +246,11 @@ export default {
   'app.common.abi': 'ABI',
   'app.common.officialSite': '官方网站',
   'app.common.contract': '合约',
-  'app.pages.index.testnet.notice1': '1. 当前网络为 Conflux Testnet，Conflux-Rust 版本号：v0.6.0-rc-1，所有数据均为 Conflux 测试网数据。',
+  'app.pages.index.testnet.notice1': '1. 当前网络为 Conflux Testnet，Conflux-Rust 版本号：v0.6.0-rc-3，所有数据均为 Conflux 测试网数据。',
   'app.pages.index.testnet.notice2': '2. Conflux 主网第一阶段 Conflux Pontus 已于 2020.4.27 上线，欢迎体验。',
-  'app.pages.index.mainnet.notice1': '当前网络为 Conflux 主网第一阶段 Conflux Pontus，Conflux-Rust 版本号：v0.5.2',
+  'app.pages.index.mainnet.notice1':
+    '1. Conflux 主网第二阶段 Conflux Oceanus 将于 7 月 17 日至 7 月 18 日上线，请 DApp 开发者提前备份好相关数据。',
+  'app.pages.index.mainnet.notice2': '2. Conflux Oceanus 上线期间，FC 转账功能会有影响，在此期间请不要进行 FC 的转账操作。',
 
   'security.High': '高',
   'security.Medium': '中',
diff --git a/src/pages/Home/index.js b/src/pages/Home/index.js
index 1367a97..36b2311 100644
--- a/src/pages/Home/index.js
+++ b/src/pages/Home/index.js
@@ -352,6 +352,7 @@ class Home extends Component {
             <i />
             <div className="notice-content">
               <div>{i18n('app.pages.index.mainnet.notice1')}</div>
+              <div>{i18n('app.pages.index.mainnet.notice2')}</div>
             </div>
           </NoticeDiv>
         )}