From 065f7e9be95a0b09f767a5d2e565a0fdac56490b Mon Sep 17 00:00:00 2001
From: denge jbam <dev.jbam@gmail.com>
Date: Wed, 7 Dec 2022 11:53:59 +0900
Subject: [PATCH 1/2] Revert "feat: dashboard maintenance"

---
 src/layouts/Sidebar.tsx       |  2 +-
 src/pages/Dashboard/index.tsx | 89 -----------------------------------
 src/routes.tsx                |  2 +-
 3 files changed, 2 insertions(+), 91 deletions(-)

diff --git a/src/layouts/Sidebar.tsx b/src/layouts/Sidebar.tsx
index 58733535..b76ac4f0 100644
--- a/src/layouts/Sidebar.tsx
+++ b/src/layouts/Sidebar.tsx
@@ -191,7 +191,7 @@ const Sidebar = () => {
         ) : (
           <div>
             <NavLink
-              to="/dashboard"
+              to="/"
               className={location.pathname?.includes("/pairs") ? "active" : ""}
               onClick={() => close()}
             >
diff --git a/src/pages/Dashboard/index.tsx b/src/pages/Dashboard/index.tsx
index 6a5df519..08a1e782 100644
--- a/src/pages/Dashboard/index.tsx
+++ b/src/pages/Dashboard/index.tsx
@@ -20,56 +20,6 @@ import Summary from "./Summary"
 import LatestBlock from "components/LatestBlock"
 import Tooltip from "components/Tooltip"
 import Loading from "components/Loading"
-import Modal from "components/Modal"
-import Button from "components/Button"
-
-const ModalContent = styled.div`
-  width: 100%;
-  max-width: calc(100vw - 32px);
-  margin: 0 auto;
-  border-radius: 20px;
-  box-shadow: 0 0 40px 0 rgba(0, 0, 0, 0.35);
-  background-color: #fff;
-  padding: 30px 0px;
-  color: #5c5c5c;
-  & > div {
-    position: relative;
-    width: 100%;
-    height: auto;
-    max-height: 80vh;
-    overflow-y: auto;
-    padding: 0 30px;
-
-    font-size: 14px;
-    font-weight: normal;
-    font-stretch: normal;
-    font-style: normal;
-    line-height: 1.71;
-    letter-spacing: normal;
-    text-align: center;
-    color: #5c5c5c;
-  }
-
-  @media screen and (max-width: ${({ theme }) => theme.breakpoint}) {
-    padding: 30px 0px;
-    & > div {
-      padding: 0 16px;
-    }
-  }
-`
-
-const ModalTitle = styled.div`
-  display: block;
-  font-size: 20px;
-  font-weight: bold;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: 1.35;
-  letter-spacing: normal;
-  text-align: center;
-  color: #0222ba;
-  margin-bottom: 30px;
-`
 
 const Wrapper = styled(container)`
   width: 100%;
@@ -693,45 +643,6 @@ const Dashboard = () => {
           />
         </LatestBlockWrapper>
       </Container>
-      <Modal isOpen close={() => {}} open={() => {}}>
-        <ModalContent>
-          <div>
-            <ModalTitle>Under maintenance</ModalTitle>
-            <div style={{ marginBottom: 20 }}>
-              Terraswap classic dashboard is under maintenance due to the price
-              calculation update & historical data recollecting. Apologies for
-              any inconvenience.
-              <div
-                style={{
-                  border: "1px solid #eeeeee",
-                  borderRadius: 8,
-                  padding: 10,
-                  marginTop: 10,
-                  fontWeight: 400,
-                  textAlign: "left",
-                }}
-              >
-                <b>As-is:</b> Mixed (USTC-based & exchange_rate from Terra
-                Oracle)
-                <br />
-                <b>To-Be:</b> Unify to the Oracle base
-              </div>
-            </div>
-            <Button
-              size="lg"
-              onClick={() => window.location.replace("/")}
-              style={{
-                textTransform: "unset",
-                maxWidth: 235,
-                borderRadius: 10,
-                marginBottom: 4,
-              }}
-            >
-              Back
-            </Button>
-          </div>
-        </ModalContent>
-      </Modal>
     </Wrapper>
   )
 }
diff --git a/src/routes.tsx b/src/routes.tsx
index b61095e7..3a356cbf 100644
--- a/src/routes.tsx
+++ b/src/routes.tsx
@@ -6,7 +6,7 @@ import Swap from "./pages/Swap"
 
 export default () => (
   <Routes>
-    <Route path="/dashboard" element={<Dashboard />} />
+    <Route index element={<Dashboard />} />
     <Route path="/swap" element={<Swap />} />
     <Route path="/pairs/:address" element={<PairPage />} />
     <Route element={<Navigate to="/" replace />} />

From 444ade5f51805e1899bbb4eb9a6c2940faab9145 Mon Sep 17 00:00:00 2001
From: jbamlee <dev.jbam@gmail.com>
Date: Wed, 7 Dec 2022 19:20:02 +0900
Subject: [PATCH 2/2] feat: change UST to $

---
 src/pages/Dashboard/index.tsx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/Dashboard/index.tsx b/src/pages/Dashboard/index.tsx
index 08a1e782..90170ee0 100644
--- a/src/pages/Dashboard/index.tsx
+++ b/src/pages/Dashboard/index.tsx
@@ -250,6 +250,7 @@ const Dashboard = () => {
               </div>
             </Row>
             <div style={{ fontSize: 18, fontWeight: 700, marginBottom: 14 }}>
+              $
               {formatMoney(
                 Number(
                   lookup(
@@ -260,7 +261,6 @@ const Dashboard = () => {
                   )
                 )
               )}
-              &nbsp;UST
             </div>
             <Chart
               type="line"
@@ -340,8 +340,8 @@ const Dashboard = () => {
                           />
                         </div>
                         <div>
-                          {token0Symbol}-{token1Symbol} /&nbsp;
-                          {formatMoney(Number(lookup(volumeUst, UST)))} UST
+                          {token0Symbol}-{token1Symbol} /&nbsp; $
+                          {formatMoney(Number(lookup(volumeUst, UST)))}
                         </div>
                       </Link>
                     )
@@ -460,8 +460,8 @@ const Dashboard = () => {
                           />
                         </div>
                         <div>
-                          {token0Symbol}-{token1Symbol} /&nbsp;
-                          {formatMoney(Number(lookup(liquidityUst, UST)))} UST
+                          {token0Symbol}-{token1Symbol} /&nbsp; $
+                          {formatMoney(Number(lookup(liquidityUst, UST)))}
                         </div>
                       </Link>
                     )
@@ -558,7 +558,7 @@ const Dashboard = () => {
                       width: 230,
                       Cell: ({ cell: { value } }: any) => (
                         <span>
-                          {formatMoney(Number(lookup(`${value}`, UST)))} UST
+                          ${formatMoney(Number(lookup(`${value}`, UST)))}
                         </span>
                       ),
                     },
@@ -574,7 +574,7 @@ const Dashboard = () => {
                       width: 230,
                       Cell: ({ cell: { value } }: any) => (
                         <span>
-                          {formatMoney(Number(lookup(`${value}`, UST)))} UST
+                          ${formatMoney(Number(lookup(`${value}`, UST)))}
                         </span>
                       ),
                     },
@@ -596,10 +596,10 @@ const Dashboard = () => {
                         const { volumeUst } = original
                         return (
                           <span>
+                            $
                             {formatMoney(
                               Number(lookup(`${volumeUst * 0.003}`, UST))
-                            )}{" "}
-                            UST
+                            )}
                           </span>
                         )
                       },