feedback fixes

persistenceOne · Jan 16, 2024 · 65b643b · 65b643b
1 parent a23731c
commit 65b643b
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 83 deletions.
diff --git a/src/App.js b/src/App.js
@@ -179,7 +179,7 @@ const Main = () => {
                 address === null ||
                 address === ""
                   ? withRouter(Homepage)
-                  : withRouter(DashboardWallet)
+                  : withRouter(DashboardStaking)
               }
               path="/"
             />
@@ -194,7 +194,6 @@ const Main = () => {
                   />
                 );
               }
-
               return (
                 <Route
                   key={route.path}
@@ -239,7 +238,7 @@ const Main = () => {
               address === null ||
               address === ""
                 ? withRouter(Homepage)
-                : withRouter(DashboardWallet)
+                : withRouter(DashboardStaking)
             }
             path="/"
           />

diff --git a/src/assets/scss/_common.scss b/src/assets/scss/_common.scss
@@ -758,14 +758,15 @@ body {
 
 .view-button {
   font-family: "Poppins", sans-serif;
-  font-weight: 600;
+  font-weight: 400;
   font-size: 12px;
   line-height: 180%;
-  color: #FCFCFC;
+  color: #0F0F0F;
   cursor: pointer;
   padding: 5px 10px;
-  background: #C73238;
-  border-radius: 4px;
+  background: transparent;
+  border: 1px solid #C73238;
+  border-radius: 6px;
   margin-right: 4px;
 }
 

diff --git a/src/assets/scss/index.css b/src/assets/scss/index.css
diff --git a/src/assets/scss/index.css.map b/src/assets/scss/index.css.map
diff --git a/src/assets/scss/views/_dashboard.scss b/src/assets/scss/views/_dashboard.scss
@@ -510,7 +510,9 @@
     display: flex;
     display: -webkit-flex;
     align-items: center;
-
+    &.theme-item{
+      display: none!important;
+    }
     .nav-link {
       display: flex;
       display: -webkit-flex;
@@ -593,7 +595,7 @@
     .profile-dropdown {
       padding: 10px 0 !important;
       .dropdown-toggle {
-        border: 1px solid #DDE1E6;
+        border: 1px solid #C73238;
         border-radius: 6px;
         padding: 6px 16px !important;
         cursor: pointer;
@@ -844,7 +846,7 @@
       display: flex;
       display: -webkit-flex;
       justify-content: space-between;
-      padding-bottom: 10px;
+      padding-bottom: 16px;
       align-items: center;
 
       &:nth-child(3) {
@@ -1131,6 +1133,9 @@
         }
       }
     }
+    .voting .sub-text{
+      font-size: 12px;
+    }
   }
 }
 

diff --git a/src/assets/scss/views/_header.scss b/src/assets/scss/views/_header.scss
@@ -85,24 +85,24 @@
 
 
 .top-banner-section{
-  background: #e50913;
+  background: #FEE2D5;
   text-align: center;
   padding: 7px 40px 7px 0;
   position: relative;
   &.initial-banner{
-    border-bottom: 1px solid #ff3b3b
+    border-bottom: 1px solid #FEE2D5
   }
   .content{
-    color: #FFFFFF;
+    color: #DB2438;
     font-size: 12px;
     margin: 0;
     .link{
       text-decoration: underline;
-      color: #FFFFFF;
+      color: #DB2438 !important;
     }
     .icon{
       margin-left: 10px;
-      fill: #FFFFFF;
+      fill: #DB2438;
       width: 16px;
     }
     .logo{
@@ -112,7 +112,7 @@
   }
   .icon-close{
     width: 10px;
-    fill: #FFFFFF;
+    fill: #DB2438;
     cursor: pointer;
     position: absolute;
     right: 20px;

diff --git a/src/components/Banner/index.js b/src/components/Banner/index.js
@@ -26,8 +26,7 @@ const countries = [
   "US",
   "GB",
   "CU",
-  "CA",
-  "IN"
+  "CA"
 ];
 const Banner = () => {
   const unbond = useSelector((state) => state.unbond.unbond);

diff --git a/src/containers/Common/DashboardHeader.js b/src/containers/Common/DashboardHeader.js
@@ -123,12 +123,17 @@ const DashboardHeader = () => {
                   width={20}
                   className="mr-1"
                 />
-                $<NumberView value={formatNumber(tokenPrice)} />
+                ${formatNumber(tokenPrice)}
               </div>
             </li>
             <li className="nav-item link mobile-nav-item">
               <NavLink
-                className="nav-link primary-medium-color"
+                className={`nav-link primary-medium-color ${
+                  window.location.pathname === "/dashboard/staking" ||
+                  window.location.pathname === "/"
+                    ? "active"
+                    : ""
+                }`}
                 onClick={() => onClick(t("STAKING"))}
                 to="/dashboard/staking"
               >
@@ -247,7 +252,7 @@ const DashboardHeader = () => {
                 </div>
               </NavDropdown>
             </li>
-            <li className="nav-item link">
+            <li className="nav-item link theme-item">
               <Darktheme />
             </li>
           </Nav>

diff --git a/src/containers/Common/TokenInfo.js b/src/containers/Common/TokenInfo.js
@@ -183,11 +183,8 @@ const TokenInfo = (props) => {
                   props.unbond
                 ).toFixed(DefaultChainInfo.currency.coinDecimals)}
               >
-                <NumberView
-                  value={formatNumber(
-                    props.delegations + props.balance + props.unbond
-                  )}
-                />
+                {formatNumber(props.delegations + props.balance + props.unbond)}{" "}
+                {""}
                 <span className={"denom"}>
                   {DefaultChainInfo.currency.coinDenom}
                 </span>
@@ -197,9 +194,7 @@ const TokenInfo = (props) => {
               <p className="key">Available Amount</p>
               <p className="value" title={props.transferableAmount.toFixed(6)}>
                 <span className="inner-grid-icon" />
-                <NumberView
-                  value={formatNumber(props.transferableAmount)}
-                />{" "}
+                {formatNumber(props.transferableAmount)}{" "}
                 <span className={"denom"}>
                   {" "}
                   {DefaultChainInfo.currency.coinDenom}
@@ -278,48 +273,35 @@ const TokenInfo = (props) => {
             <div className="line">
               <p className="key">Staked Amount</p>
               <p
-                className="value rewards d-flex align-items-center"
+                className="value d-flex align-items-center"
                 title={props.delegations}
               >
-                <span
-                  onClick={() => handleRewards("rewards")}
-                  className="claim inner-grid"
-                >
-                  Claim Rewards
+                <span className="inner-grid">
+                  <span
+                    onClick={() => handleRewards("rewards")}
+                    className="view-button"
+                  >
+                    Claim Rewards
+                  </span>
                 </span>
                 <span>
                   {" "}
-                  <NumberView value={formatNumber(props.delegations)} />{" "}
+                  {formatNumber(props.delegations)}
                   <span className={"denom"}>
                     {" "}
                     {DefaultChainInfo.currency.coinDenom}
                   </span>
                 </span>
               </p>
             </div>
-            {/*<div className="line">*/}
-            {/*  <p className="key">{t("REWARDS")}</p>*/}
-            {/*  <p className="value rewards">*/}
-            {/*    <span*/}
-            {/*      onClick={() => handleRewards("rewards")}*/}
-            {/*      className="claim inner-grid"*/}
-            {/*    >*/}
-            {/*      {t("CLAIM")}*/}
-            {/*    </span>*/}
-            {/*    <span title={props.rewards[0]}>*/}
-            {/*      <NumberView value={formatNumber(props.rewards[0])} />{" "}*/}
-            {/*      {DefaultChainInfo.currency.coinDenom}*/}
-            {/*    </span>*/}
-            {/*  </p>*/}
-            {/*</div>*/}
             <div className="line p-0">
               <p className="key">Unbonding Amount</p>
               <p className="value d-flex align-items-center">
                 <span className="inner-grid">
                   {props.unbond > 0 ? <ModalViewUnbondDetails /> : ""}
                 </span>
                 <span title={props.unbond}>
-                  <NumberView value={formatNumber(props.unbond)} />
+                  {formatNumber(props.unbond)}
                   <span className={"denom"}>
                     {DefaultChainInfo.currency.coinDenom}
                   </span>

diff --git a/src/containers/Staking/Validators/ValidatorsTable.js b/src/containers/Staking/Validators/ValidatorsTable.js
@@ -103,23 +103,26 @@ const ValidatorsTable = (props) => {
         </div>,
         <div className="voting" key={index}>
           {parseFloat((validator.data.tokens * Math.pow(10, -6)).toFixed())}
-          {helper.isActive(validator.data)
-            ? `(${parseFloat(
-                (
-                  (validator.data.tokens * 100) /
-                  props.activeValidatorsTokens
-                ).toString()
-              )
-                .toFixed(6)
-                .toLocaleString()}%)`
-            : `(${parseFloat(
-                (
-                  (validator.data.tokens * 100) /
-                  props.inActiveValidatorsTokens
-                ).toString()
-              )
-                .toFixed(6)
-                .toLocaleString()}%)`}
+          <p className={"sub-text"}>
+            {" "}
+            {helper.isActive(validator.data)
+              ? `(${parseFloat(
+                  (
+                    (validator.data.tokens * 100) /
+                    props.activeValidatorsTokens
+                  ).toString()
+                )
+                  .toFixed(6)
+                  .toLocaleString()}%)`
+              : `(${parseFloat(
+                  (
+                    (validator.data.tokens * 100) /
+                    props.inActiveValidatorsTokens
+                  ).toString()
+                )
+                  .toFixed(6)
+                  .toLocaleString()}%)`}
+          </p>
         </div>,
         <span className="voting" key={index}>
           {`${parseFloat(
@@ -145,7 +148,7 @@ const ValidatorsTable = (props) => {
             onClick={() => handleModal("ModalActions", validator.data)}
             className="button button-primary"
           >
-            Actions
+            Manage
           </button>
         </div>
       ])