Merge pull request #203 from Conflux-Chain/dev

feat: Oceanus is alive
Conflux-Chain · Jul 17, 2020 · 267f394 · 267f394 · vercel · Jul 17, 2020
2 parents a7419b7 + 826ce9c
commit 267f394
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/src/lang/en.js b/src/lang/en.js
@@ -125,9 +125,9 @@ export default {
   'app.directory.ConfluxPortal.title': 'ConfluxPortal',
   'app.directory.ConfluxPortal.desc': 'Conflux DApp Portal & Crypto Asset Management',
 
-  'network.mainnet': 'Conflux Pontus',
+  'network.mainnet': 'Conflux Oceanus',
   'network.testnet': 'Conflux Testnet',
-  'network-short.mainnet': 'Pontus',
+  'network-short.mainnet': 'Oceanus',
   'network-short.testnet': 'Testnet',
 
   'pagination.total': 'A total of <%=total%> records found',
@@ -169,11 +169,9 @@ export default {
   'app.common.contract': 'Contract',
   'app.pages.index.testnet.notice1':
     '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':
-    '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.",
+  'app.pages.index.testnet.notice2': '2. Conflux Oceanus is now live.',
+  'app.pages.index.mainnet.notice1': 'ConfluxScan is currently on the Mainnet Phase II - Oceanus, Conflux-Rust version: v0.6.0',
+
   'security.High': 'Great',
   'security.Medium': 'Good',
   'security.Low': 'Weak',

diff --git a/src/lang/zh.js b/src/lang/zh.js
@@ -192,9 +192,9 @@ export default {
   'Token Burned': '代币承兑',
   'Copy to clipboard': '复制到剪切板',
 
-  'network.mainnet': 'Conflux Pontus',
+  'network.mainnet': 'Conflux Oceanus',
   'network.testnet': 'Conflux 测试网',
-  'network-short.mainnet': 'Pontus',
+  'network-short.mainnet': 'Oceanus',
   'network-short.testnet': '测试网',
 
   'pagination.total': '共计找到<%=total%>条记录',
@@ -247,10 +247,8 @@ export default {
   'app.common.officialSite': '官方网站',
   'app.common.contract': '合约',
   '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':
-    '1. Conflux 主网第二阶段 Conflux Oceanus 将于 7 月 17 日至 7 月 18 日上线，请 DApp 开发者提前备份好相关数据。',
-  'app.pages.index.mainnet.notice2': '2. Conflux Oceanus 上线期间，FC 转账功能会有影响，在此期间请不要进行 FC 的转账操作。',
+  'app.pages.index.testnet.notice2': '2. Conflux 主网第二阶段 Conflux Oceanus 已上线，欢迎体验。',
+  'app.pages.index.mainnet.notice1': '当前网络为 Conflux 主网第二阶段 Conflux Oceanus，Conflux-Rust 版本号：v0.6.0',
 
   'security.High': '高',
   'security.Medium': '中',

diff --git a/src/pages/Home/index.js b/src/pages/Home/index.js
@@ -352,7 +352,6 @@ 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>
         )}