Merge pull request #1394 from nervosnetwork/develop

Merge develop into testnet
nervosnetwork · Nov 29, 2023 · a9bae91 · a9bae91
2 parents 1c18a33 + 897e30c
commit a9bae91
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "@storybook/react-webpack5": "7.5.3",
     "@storybook/testing-library": "0.2.2",
     "@testing-library/react": "12.1.5",
-    "@types/echarts": "4.9.21",
+    "@types/echarts": "4.9.22",
     "@types/eslint": "8.44.6",
     "@types/jest": "26.0.24",
     "@types/node": "16.18.61",
@@ -77,7 +77,7 @@
     "husky": "^7.0.1",
     "jest-styled-components": "^7.0.5",
     "mockdate": "^2.0.5",
-    "postcss-scss": "4.0.8",
+    "postcss-scss": "4.0.9",
     "postcss-styled-syntax": "^0.4.0",
     "prettier": "^2.8.8",
     "prop-types": "15.8.1",

diff --git a/src/pages/StatisticsChart/activities/BalanceDistribution.tsx b/src/pages/StatisticsChart/activities/BalanceDistribution.tsx
@@ -47,6 +47,7 @@ const useOption = (
     bottom: '6%',
     containLabel: true,
   }
+
   return {
     color: chartColor.colors,
     tooltip: !isThumbnail

diff --git a/src/pages/StatisticsChart/block/AverageBlockTime.tsx b/src/pages/StatisticsChart/block/AverageBlockTime.tsx
@@ -45,6 +45,7 @@ const useOption = (
     }
     return ''
   }
+
   return {
     color: chartColor.colors,
     tooltip: !isThumbnail
@@ -115,6 +116,7 @@ const useOption = (
       },
       {
         position: 'right',
+        splitLine: { show: false },
         name: isMobile || isThumbnail ? '' : t('statistic.weekly_moving_average'),
         type: 'value',
         scale: true,

diff --git a/src/pages/StatisticsChart/nervosDao/NewDaoDeposit.tsx b/src/pages/StatisticsChart/nervosDao/NewDaoDeposit.tsx
@@ -129,6 +129,7 @@ const useOption = (
         },
         type: 'value',
         scale: true,
+        splitLine: { show: false },
         axisLine: {
           lineStyle: {
             color: chartColor.colors[1],

diff --git a/src/pages/StatisticsChart/nervosDao/TotalDaoDeposit.tsx b/src/pages/StatisticsChart/nervosDao/TotalDaoDeposit.tsx
@@ -135,6 +135,7 @@ const useOption = (
             color: chartColor.colors[1],
           },
         },
+        splitLine: { show: false },
         axisLabel: {
           formatter: (value: string) => `${parseNumericAbbr(new BigNumber(value))}`,
         },

diff --git a/yarn.lock b/yarn.lock
@@ -5006,10 +5006,10 @@
   resolved "https://registry.yarnpkg.com/@types/doctrine/-/doctrine-0.0.3.tgz#e892d293c92c9c1d3f9af72c15a554fbc7e0895a"
   integrity sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA==
 
-"@types/[email protected].21":
-  version "4.9.21"
-  resolved "https://registry.yarnpkg.com/@types/echarts/-/echarts-4.9.21.tgz#9626d0db7215cf51cbfe02a42c05d9d2834f243a"
-  integrity sha512-xUvHN2TbednNO3bybnG8GtOWU/f+/ouSlC9wO+704uiRlVtPEcLPfvfD24WqZ8uAXJ2dvlBLeB60WIlzv+Xajw==
+"@types/[email protected].22":
+  version "4.9.22"
+  resolved "https://registry.yarnpkg.com/@types/echarts/-/echarts-4.9.22.tgz#b584fd3d312f106dd8cacb53f689573a6953d822"
+  integrity sha512-7Fo6XdWpoi8jxkwP7BARUOM7riq8bMhmsCtSG8gzUcJmFhLo387tihoBYS/y5j7jl3PENT5RxeWZdN9RiwO7HQ==
   dependencies:
     "@types/zrender" "*"
 
@@ -13955,7 +13955,12 @@ postcss-safe-parser@^6.0.0:
   resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1"
   integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==
 
-[email protected], postcss-scss@^4.0.7:
+[email protected]:
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.9.tgz#a03c773cd4c9623cb04ce142a52afcec74806685"
+  integrity sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==
+
+postcss-scss@^4.0.7:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.8.tgz#12a4991a902a782d4e9b86b1f217d5181c6c4f32"
   integrity sha512-Cr0X8Eu7xMhE96PJck6ses/uVVXDtE5ghUTKNUYgm8ozgP2TkgV3LWs3WgLV1xaSSLq8ZFiXaUrj0LVgG1fGEA==