From 3439d27ca8866ad4f35b6c55fabc64eaf599d9ac Mon Sep 17 00:00:00 2001
From: Artem <temakolodko@gmail.com>
Date: Wed, 11 May 2022 12:08:56 +0100
Subject: [PATCH] Refactor main screen metrics, fix iPad charts overlay (#177)

* Refactor main screen metrics, fix iPad charts overlay

* Improve metrics styles for tablets
---
 package.json                     |   3 +-
 src/components/metrics/index.tsx | 131 +++++++++++++++----------------
 2 files changed, 64 insertions(+), 70 deletions(-)

diff --git a/package.json b/package.json
index e6a709e..0e27586 100644
--- a/package.json
+++ b/package.json
@@ -74,6 +74,7 @@
     "web-vitals": "^1.0.1"
   },
   "resolutions": {
-     "@types/react": "17.0.30"
+    "@types/react": "17.0.30",
+    "react-error-overlay": "6.0.9"
   }
 }
diff --git a/src/components/metrics/index.tsx b/src/components/metrics/index.tsx
index b4f1add..9dc69ad 100644
--- a/src/components/metrics/index.tsx
+++ b/src/components/metrics/index.tsx
@@ -70,9 +70,9 @@ export const Metrics = (params: {
   latency: number;
   latencyPerBlock: number[];
 }) => {
-  const isLessLaptop = useMediaQuery({ maxDeviceWidth: "852px" });
-  const isLessTablet = useMediaQuery({ maxDeviceWidth: breakpoints.tablet });
-  const isLessMobileM = useMediaQuery({ maxDeviceWidth: "468px" });
+  const isLessLaptop = useMediaQuery({ query: '(max-width: 852px)' });
+  const isLessTablet = useMediaQuery({ query: `(max-width: ${breakpoints.tablet})` });
+  const isLessMobileM = useMediaQuery({ query: '(max-width: 468px)' });
 
   return (
     <BasePage
@@ -80,78 +80,71 @@ export const Metrics = (params: {
       justify="between"
       wrap={isLessLaptop}
       margin={{ bottom: "medium" }}
+      style={{ width: '100%' }}
     >
       <Box
-        justify="between"
-        pad={{ right: isLessMobileM ? "0" : "medium" }}
-        border={{
-          size: isLessMobileM ? "0" : "xsmall",
-          side: "right",
-          color: "border",
-        }}
-        style={{
-          height: isLessMobileM ? "auto" : "140px",
-          flex: isLessLaptop ? "1 1 40%" : "1 1 100%",
-        }}
-        gap={isLessMobileM ? "small" : "0"}
+        direction={'row'}
+        style={{ flexWrap: 'wrap', flexBasis: isLessLaptop ? '100%' : '50%'}}
       >
-        <ONEPrice />
-        {!isLessMobileM && <Line horizontal />}
-        <TransactionsCount />
-      </Box>
-      <Box
-        justify="between"
-        pad={{ left: "medium", right: isLessLaptop ? "0" : "medium" }}
-        border={{
-          size: isLessLaptop ? "0" : "xsmall",
-          side: "right",
-          color: "border",
-        }}
-        style={{
-          height: isLessMobileM ? "auto" : "140px",
-          flex: isLessLaptop ? "1 1 50%" : "1 1 100%",
-        }}
-      >
-        <ShardCount />
-        {!isLessMobileM && <Line horizontal />}
-        <BlockLatency
-          latency={params.latency}
-          latencyPerBlock={params.latencyPerBlock}
-        />
-      </Box>
-      {isLessLaptop && (
-        <Line
-          horizontal
-          style={{ marginTop: isLessTablet ? "16px" : "24px" }}
-        />
-      )}
-      <Box
-        justify="between"
-        pad={{
-          left: isLessLaptop ? "0" : "medium",
-        }}
-        margin={{ top: isLessLaptop ? "medium" : "0" }}
-        style={{ height: "140px", flex: "1 1 100%" }}
-      >
-        <BlockTransactionsHistory />
+        <Box
+          justify="between"
+          pad={{ right: isLessMobileM ? "0" : "medium" }}
+          border={{
+            size: isLessMobileM ? "0" : "xsmall",
+            side: "right",
+            color: "border",
+          }}
+          style={{
+            height: isLessMobileM ? "auto" : "140px",
+            flex: 1
+          }}
+          gap={isLessMobileM ? "small" : "0"}
+        >
+          <ONEPrice />
+          {!isLessMobileM && <Line horizontal />}
+          <TransactionsCount />
+        </Box>
+        <Box
+          justify="between"
+          pad={{ left: "medium", right: isLessLaptop ? "0" : "medium" }}
+          border={{
+            size: isLessLaptop ? "0" : "xsmall",
+            side: "right",
+            color: "border",
+          }}
+          style={{
+            height: isLessMobileM ? "auto" : "140px",
+            flex: 1
+          }}
+        >
+          <ShardCount />
+          {!isLessMobileM && <Line horizontal />}
+          <BlockLatency
+            latency={params.latency}
+            latencyPerBlock={params.latencyPerBlock}
+          />
+        </Box>
+        {isLessLaptop && (
+          <Line
+            horizontal
+            style={{ marginTop: isLessTablet ? "16px" : "24px" }}
+          />
+        )}
       </Box>
-
-      {isLessLaptop && (
-        <Line
-          horizontal
-          style={{ marginTop: isLessTablet ? "16px" : "24px" }}
-        />
-      )}
-
       <Box
-        justify="between"
-        pad={{
-          left: isLessLaptop ? "0" : "medium",
-        }}
-        margin={{ top: isLessLaptop ? "medium" : "0" }}
-        style={{ height: "140px", flex: "1 1 100%" }}
+        direction={'row'}
+        justify={'between'}
+        wrap={isLessLaptop}
+        pad={{ left: 'medium', top: isLessLaptop ? 'medium' : 'none' }}
+        gap={'large'}
+        style={{ flexWrap: 'wrap', flexBasis: isLessLaptop ? '100%' : '50%' }}
       >
-        <WalletsHistory />
+        <Box style={{flex: isLessMobileM ? 'unset' : 1}}>
+          <BlockTransactionsHistory />
+        </Box>
+        <Box style={{flex: isLessMobileM ? 'unset' : 1}}>
+          <WalletsHistory />
+        </Box>
       </Box>
     </BasePage>
   );