From 48a8d016e4501da4d17b1430aa071120596cf808 Mon Sep 17 00:00:00 2001
From: tangxuezhi <0x74616e67@gmail.com>
Date: Mon, 30 May 2022 10:33:15 +0800
Subject: [PATCH 1/2] fix: optimize blocktime undefined value in homepage

---
 src/app/containers/HomePage/BlockchainInfo.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/containers/HomePage/BlockchainInfo.tsx b/src/app/containers/HomePage/BlockchainInfo.tsx
index dce592508..8a5dbf059 100644
--- a/src/app/containers/HomePage/BlockchainInfo.tsx
+++ b/src/app/containers/HomePage/BlockchainInfo.tsx
@@ -160,7 +160,7 @@ export function BlockchainInfo({ timestamp = 1 }: { timestamp?: number }) {
               <Link to="/charts/tps" className="info-link">
                 {t(translations.charts.tps.title)}
               </Link>,
-              plotData.tps,
+              lodash.isNil(plotData.tps) ? '--' : plotData.tps,
             )}
           </Grid>
           <Grid xs={24} sm={24} md={4}>
@@ -178,7 +178,9 @@ export function BlockchainInfo({ timestamp = 1 }: { timestamp?: number }) {
               <Link to="/charts/blocktime" className="info-link">
                 {t(translations.charts.blockTime.title)}
               </Link>,
-              plotData.blockTime + 's',
+              lodash.isNil(plotData.blockTime)
+                ? '--'
+                : plotData.blockTime + 's',
             )}
           </Grid>
           <Grid xs={24} sm={24} md={4}>
@@ -186,7 +188,7 @@ export function BlockchainInfo({ timestamp = 1 }: { timestamp?: number }) {
               <Link to="/charts/hashrate" className="info-link">
                 {t(translations.charts.hashRate.title)}
               </Link>,
-              plotData.hashRate,
+              lodash.isNil(plotData.hashRate) ? '--' : plotData.hashRate,
             )}
           </Grid>
         </Grid.Container>

From 49e2cac7af7d4f2407d111206e1145c72c7a140c Mon Sep 17 00:00:00 2001
From: tangxuezhi <0x74616e67@gmail.com>
Date: Mon, 30 May 2022 11:15:50 +0800
Subject: [PATCH 2/2] feat: update release note and version number

---
 src/app/containers/Notices/index.tsx | 8 ++++----
 src/index.tsx                        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/containers/Notices/index.tsx b/src/app/containers/Notices/index.tsx
index ca2560b79..13cd4c394 100644
--- a/src/app/containers/Notices/index.tsx
+++ b/src/app/containers/Notices/index.tsx
@@ -12,14 +12,14 @@ export const noticeInfo = {
   hot: false,
   type: 'Announcement',
   brief: {
-    en: 'ConfluxScan V2.11.0 Released!',
-    zh: 'ConfluxScan V2.11.0 发布喽！',
+    en: 'ConfluxScan V2.12.0 Released!',
+    zh: 'ConfluxScan V2.12.0 发布喽！',
   },
   link: {
     en:
-      'https://confluxscansupportcenter.zendesk.com/hc/en-us/articles/6127401433243-Apr-27-2022-May-23-2022',
+      'https://confluxscansupportcenter.zendesk.com/hc/en-us/articles/6257231619099-May-23-2022-May-30-2022',
     zh:
-      'https://confluxscansupportcenter.zendesk.com/hc/zh-cn/articles/6127401433243-2022-4-27-2022-5-23',
+      'https://confluxscansupportcenter.zendesk.com/hc/zh-cn/articles/6257231619099-2022-5-24-2022-5-30',
   },
 };
 
diff --git a/src/index.tsx b/src/index.tsx
index e1449a5bc..086a88c6f 100755
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -61,7 +61,7 @@ Promise.all([completeDetect()]).then(() => {
   render(App);
 });
 
-const currentVersion = 'V2.11.0';
+const currentVersion = 'V2.12.0';
 
 const brand = `
 ┌─┐┌─┐┌┐┌┌─┐┬  ┬ ┬─┐ ┬  ┌─┐┌─┐┌─┐┌┐┌ ${currentVersion}