fix(app): fixes (#1070)

cybercongress · Dec 20, 2023 · 89f8b7b · 89f8b7b
1 parent f32d51f
commit 89f8b7b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 16 deletions.
diff --git a/src/components/denom/denomArr.tsx b/src/components/denom/denomArr.tsx
@@ -7,9 +7,7 @@ import Denom from './index';
 // generated, recheck
 type PossibleTokens =
   | 'millivolt'
-  | 'v'
   | 'milliampere'
-  | 'a'
   | 'hydrogen'
   | 'h'
   | 'liquidpussy'

diff --git a/src/containers/application/App.tsx b/src/containers/application/App.tsx
@@ -92,7 +92,7 @@ function App() {
           <div id={PORTAL_ID} className={styles.portal} />
         )}
 
-        <AdviserContainer />
+        {!(location.pathname === '/') && <AdviserContainer />}
 
         <Outlet />
       </>

diff --git a/src/containers/energy/tab/myEnergy.tsx b/src/containers/energy/tab/myEnergy.tsx
@@ -40,7 +40,7 @@ function MyEnergy({ slotsData, balacesResource, loadingAuthAccounts }: Props) {
           flex-irection="row"
         >
           <Card
-            title={<DenomArr denomValue="a" />}
+            title={<DenomArr denomValue="milliampere" />}
             value={
               balacesResource.milliampere
                 ? formatNumber(balacesResource.milliampere)
@@ -52,7 +52,7 @@ function MyEnergy({ slotsData, balacesResource, loadingAuthAccounts }: Props) {
             x
           </Pane>
           <Card
-            title={<DenomArr denomValue="V" />}
+            title={<DenomArr denomValue="millivolt" />}
             value={
               balacesResource.millivolt
                 ? formatNumber(balacesResource.millivolt)

diff --git a/src/containers/mint/index.tsx b/src/containers/mint/index.tsx
@@ -269,14 +269,14 @@ function Mint() {
           gridGap="20px"
           justifyContent="center"
         >
-          <CardStatisics
-            title={<ValueImg text="millivolt" />}
-            value={formatNumber(vestedV)}
-          />
           <CardStatisics
             title={<ValueImg text="milliampere" />}
             value={formatNumber(vestedA)}
           />
+          <CardStatisics
+            title={<ValueImg text="millivolt" />}
+            value={formatNumber(vestedV)}
+          />
           <CardStatisics
             title="My Energy"
             value={`${formatNumber(vestedA * vestedV)} W`}

diff --git a/src/features/adviser/AdviserContainer.module.scss b/src/features/adviser/AdviserContainer.module.scss
@@ -4,7 +4,7 @@
   width: 60%;
 
   z-index: 3;
-  min-height: 90px; // 3 lines
+  min-height: 60px; // 2 lines of text
 
   margin-top: -45px;
   margin-bottom: 15px;

diff --git a/src/pages/oracle/landing/OracleLanding.module.scss b/src/pages/oracle/landing/OracleLanding.module.scss
@@ -9,7 +9,7 @@ $mobile-breakpoint: 480px;
   flex-direction: column;
   justify-content: space-between;
   // header, footer widths, TODO: use variables
-  min-height: calc(100vh - 120px - 60px - 100px);
+  min-height: calc(100vh - 120px - 60px - 100px + 45px);
 
   padding: 0 10px;
 
@@ -38,11 +38,6 @@ $mobile-breakpoint: 480px;
   margin: 0px auto;
   width: 415px;
 
-  // because of adviser container
-  position: relative;
-  top: -45px;
-  z-index: 5;
-
   @media (width <= $mobile-breakpoint) {
     width: unset;