Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: feedback fixes #512

Merged
merged 1 commit into from
Jan 16, 2024
Merged

chore: feedback fixes #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ const Main = () => {
address === null ||
address === ""
? withRouter(Homepage)
: withRouter(DashboardWallet)
: withRouter(DashboardStaking)
}
path="/"
/>
Expand All @@ -194,7 +194,6 @@ const Main = () => {
/>
);
}

return (
<Route
key={route.path}
Expand Down Expand Up @@ -239,7 +238,7 @@ const Main = () => {
address === null ||
address === ""
? withRouter(Homepage)
: withRouter(DashboardWallet)
: withRouter(DashboardStaking)
}
path="/"
/>
Expand Down
9 changes: 5 additions & 4 deletions src/assets/scss/_common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
29 changes: 17 additions & 12 deletions src/assets/scss/index.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/assets/scss/index.css.map
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 8 additions & 3 deletions src/assets/scss/views/_dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,9 @@
display: flex;
display: -webkit-flex;
align-items: center;

&.theme-item{
display: none!important;
}
.nav-link {
display: flex;
display: -webkit-flex;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -1131,6 +1133,9 @@
}
}
}
.voting .sub-text{
font-size: 12px;
}
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/assets/scss/views/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -112,7 +112,7 @@
}
.icon-close{
width: 10px;
fill: #FFFFFF;
fill: #DB2438;
cursor: pointer;
position: absolute;
right: 20px;
Expand Down
3 changes: 1 addition & 2 deletions src/components/Banner/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ const countries = [
"US",
"GB",
"CU",
"CA",
"IN"
"CA"
];
const Banner = () => {
const unbond = useSelector((state) => state.unbond.unbond);
Expand Down
11 changes: 8 additions & 3 deletions src/containers/Common/DashboardHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
>
Expand Down Expand Up @@ -247,7 +252,7 @@ const DashboardHeader = () => {
</div>
</NavDropdown>
</li>
<li className="nav-item link">
<li className="nav-item link theme-item">
<Darktheme />
</li>
</Nav>
Expand Down
44 changes: 13 additions & 31 deletions src/containers/Common/TokenInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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}
Expand Down Expand Up @@ -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>
Expand Down
39 changes: 21 additions & 18 deletions src/containers/Staking/Validators/ValidatorsTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -145,7 +148,7 @@ const ValidatorsTable = (props) => {
onClick={() => handleModal("ModalActions", validator.data)}
className="button button-primary"
>
Actions
Manage
</button>
</div>
])
Expand Down
Loading