Merge pull request #777 from Conflux-Chain/s38

feat: bug fix
Conflux-Chain · Jun 8, 2022 · a8cf9e6 · a8cf9e6
2 parents 9123196 + 4a6431b
commit a8cf9e6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/src/app/containers/Charts/crossSpace/index.tsx b/src/app/containers/Charts/crossSpace/index.tsx
@@ -15,7 +15,7 @@ export function Chart() {
 
   const format = iszh ? 'YYYY MMMDD' : 'DD MMM YYYY';
   const current = moment().subtract(1, 'day');
-  const oneMonthBefore = current.subtract(30, 'day');
+  const oneMonthBefore = moment().subtract(30, 'day');
 
   return (
     <StyledChartPreviewWrapper>

diff --git a/src/app/containers/Charts/pos/index.tsx b/src/app/containers/Charts/pos/index.tsx
@@ -20,8 +20,8 @@ export function Chart() {
   const iszh = i18n.language.includes('zh');
 
   const format = iszh ? 'YYYY MMMDD' : 'DD MMM YYYY';
-  const current = moment().subtract(1, 'day');
-  const oneMonthBefore = current.subtract(30, 'day');
+  const current = moment();
+  const oneMonthBefore = moment().subtract(29, 'day');
 
   return (
     <StyledChartPreviewWrapper>

diff --git a/src/app/containers/Charts/pow/index.tsx b/src/app/containers/Charts/pow/index.tsx
@@ -26,7 +26,7 @@ export function Chart() {
 
   const format = iszh ? 'YYYY MMMDD' : 'DD MMM YYYY';
   const current = moment().subtract(1, 'day');
-  const oneMonthBefore = current.subtract(30, 'day');
+  const oneMonthBefore = moment().subtract(30, 'day');
 
   return (
     <StyledChartPreviewWrapper>

diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
@@ -524,7 +524,7 @@
     "crossSpace": {
       "preview": {
         "title": "Cross Space Charts",
-        "subtitle": "A collection of cross space charts between PoW and PoS on the Conflux Chain (click on View Details for a zoomed view)",
+        "subtitle": "A collection of cross space charts between Core and eSpace on the Conflux Chain (click on View Details for a zoomed view)",
         "viewDetail": "View Details",
         "tip": "Showing the last 30 days"
       },
@@ -535,11 +535,11 @@
       },
       "dailyCFXTransfer": {
         "title": "Daily CFX Transfer",
-        "subtitle": "The CFX transfer in and out per day between PoW and PoS.",
+        "subtitle": "The CFX transfer in and out per day between Core and eSpace.",
         "yAxisTitle": "Count",
-        "seriesName": "Transfer In Count (Day)",
+        "seriesName": "Transfer Out Count (Day)",
         "yAxisTitle2": "Count",
-        "seriesName2": "Transfer Out Count (Day)"
+        "seriesName2": "Transfer In Count (Day)"
       },
       "contract": {
         "title": "Contract Statistics",
@@ -567,7 +567,7 @@
         "daily-apy": "APY",
         "total-reward": "Total Reward",
         "daily-reward-rank": "Reward Rank",
-        "daily-deposit": "Deposit",
+        "daily-deposit": "Deposit & Withdraw",
         "participation-rate": "Participation Rate"
       },
       "finalizedInterval": {

diff --git a/src/locales/zh_cn/translation.json b/src/locales/zh_cn/translation.json
@@ -390,7 +390,7 @@
     "more": "更多",
     "tools": "工具",
     "balanceChecker": "余额检索器",
-    "charts": "图表",
+    "charts": "PoW 图表",
     "posCharts": "PoS 图表",
     "crossSpaceCharts": "跨空间图表",
     "statistics": "最佳统计数据",
@@ -524,7 +524,7 @@
     "crossSpace": {
       "preview": {
         "title": "跨空间图表",
-        "subtitle": "Conflux 链上跨 PoW 和 PoS 的图表 （点击查看详情）",
+        "subtitle": "Conflux 链上跨 Core 和 eSpace 的图表 （点击查看详情）",
         "viewDetail": "查看详情",
         "tip": "显示最近 30 天"
       },
@@ -535,11 +535,11 @@
       },
       "dailyCFXTransfer": {
         "title": "每日交易-CFX",
-        "subtitle": "每日在 PoW 和 PoS 间转入，转出的 CFX 统计数据",
+        "subtitle": "每日在 Core 和 eSpace 间转入，转出的 CFX 统计数据",
         "yAxisTitle": "数量",
-        "seriesName": "每天转入的 CFX 数量",
+        "seriesName": "每天转出的 CFX 数量",
         "yAxisTitle2": "数量",
-        "seriesName2": "每天转出的 CFX 数量"
+        "seriesName2": "每天转入的 CFX 数量"
       },
       "contract": {
         "title": "合约分析",
@@ -628,8 +628,8 @@
     },
     "pow": {
       "preview": {
-        "title": "图表",
-        "subtitle": "Conflux 链上的图表 （点击查看详情）",
+        "title": "PoW 图表",
+        "subtitle": "Conflux 链上的 PoW 图表 （点击查看详情）",
         "viewDetail": "查看详情",
         "tip": "显示最近 30 天",
         "marketData": "市场数据",
@@ -639,7 +639,7 @@
         "contracts": "合约"
       },
       "breadcrumb": {
-        "charts": "图表",
+        "charts": "PoW 图表",
         "blocktime": "出块间隔",
         "tps": "交易 TPS",
         "hashrate": "哈希算力",