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

update rewards section #517

Merged
merged 1 commit into from
Mar 14, 2024
Merged

update rewards section #517

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
15 changes: 15 additions & 0 deletions src/assets/scss/_common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1266,4 +1266,19 @@ ul li em {
font-size: 14px;
margin:0;
}
}

.ibc-rewards-box{
height: 150px;
overflow: auto;
margin-bottom: 16px;
border: 1px solid #6c757d82;
border-radius: 6px;
padding: 10px;
.available-tokens{
margin-bottom: 12px !important;
&:last-child{
margin: 0 !important;
}
}
}
12 changes: 12 additions & 0 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.

278 changes: 156 additions & 122 deletions src/containers/Transactions/ModalWithDrawAllRewards/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,144 +1,178 @@
import {Modal as ReactModal, OverlayTrigger, Popover} from 'react-bootstrap';
import React from 'react';
import {useTranslation} from "react-i18next";
import {useDispatch, useSelector} from "react-redux";
import {hideTxWithDrawTotalModal} from "../../../store/actions/transactions/withdrawTotalRewards";
import {setPreviousModalName, showTxWithDrawAddressModal} from "../../../store/actions/transactions/setWithdrawAddress";
import { Modal as ReactModal, OverlayTrigger, Popover } from "react-bootstrap";
import React from "react";
import { useTranslation } from "react-i18next";
import { useDispatch, useSelector } from "react-redux";
import { hideTxWithDrawTotalModal } from "../../../store/actions/transactions/withdrawTotalRewards";
import {
setPreviousModalName,
showTxWithDrawAddressModal
} from "../../../store/actions/transactions/setWithdrawAddress";
import NumberView from "../../../components/NumberView";
import {formatNumber, stringToNumber, stringTruncate} from "../../../utils/scripts";
import {
formatNumber,
stringToNumber,
stringTruncate
} from "../../../utils/scripts";
import ValidatorCommission from "./ValidatorCommission";
import Validators from "./Validators";
import Memo from "./Memo";
import ButtonNext from "./ButtonNext";
import Icon from "../../../components/Icon";
import {LOGIN_INFO} from "../../../constants/localStorage";
import { LOGIN_INFO } from "../../../constants/localStorage";
import ReactGA from "react-ga4";
import {DefaultChainInfo, PstakeInfo} from "../../../config";
import { DefaultChainInfo, PstakeInfo } from "../../../config";

const ModalWithDraw = () => {
const {t} = useTranslation();
const show = useSelector((state) => state.mulitpleRewardsWithDraw.modal);
const rewards = useSelector((state) => state.rewards.rewards);
const tokenPrice = useSelector((state) => state.tokenPrice.tokenPrice);
let selectedValidators = useSelector((state) => state.mulitpleRewardsWithDraw.validatorsList);
const loginInfo = JSON.parse(localStorage.getItem(LOGIN_INFO));
const error = useSelector(state => state.common.error);
const { t } = useTranslation();
const show = useSelector((state) => state.mulitpleRewardsWithDraw.modal);
const rewards = useSelector((state) => state.rewards.rewards);
const tokenPrice = useSelector((state) => state.tokenPrice.tokenPrice);
let selectedValidators = useSelector(
(state) => state.mulitpleRewardsWithDraw.validatorsList
);
const loginInfo = JSON.parse(localStorage.getItem(LOGIN_INFO));
const error = useSelector((state) => state.common.error);

const dispatch = useDispatch();
const dispatch = useDispatch();

const handleClose = () => {
dispatch(hideTxWithDrawTotalModal());
};
const handleClose = () => {
dispatch(hideTxWithDrawTotalModal());
};

const setWithdrawAddressHandler = () => {
ReactGA.event({
category: `Setup Rewards Withdrawal Address`,
action: `Clicked on Setup Rewards Withdrawal Address`
});
dispatch(setPreviousModalName({
value: 'withdrawTotal',
error: {
message: ''
}
}));
dispatch(hideTxWithDrawTotalModal());
dispatch(showTxWithDrawAddressModal());
};

const popoverSetupAddress = (
<Popover id="popover-memo">
<Popover.Content>
{t("SETUP_ADDRESS_NOTE")}
</Popover.Content>
</Popover>
const setWithdrawAddressHandler = () => {
ReactGA.event({
category: `Setup Rewards Withdrawal Address`,
action: `Clicked on Setup Rewards Withdrawal Address`
});
dispatch(
setPreviousModalName({
value: "withdrawTotal",
error: {
message: ""
}
})
);
dispatch(hideTxWithDrawTotalModal());
dispatch(showTxWithDrawAddressModal());
};

const popoverSetupAddress = (
<Popover id="popover-memo">
<Popover.Content>{t("SETUP_ADDRESS_NOTE")}</Popover.Content>
</Popover>
);

let ibcRewards = [];
if(rewards && rewards[1]) {
ibcRewards = (rewards[1].filter(item => item.denom !== DefaultChainInfo.currency.coinMinimalDenom));
}
let ibcRewards = [];
if (rewards && rewards[1]) {
ibcRewards = rewards[1].filter(
(item) => item.denom !== DefaultChainInfo.currency.coinMinimalDenom
);
}

return (
<ReactModal
animation={false}
backdrop="static"
className="modal-custom claim-rewards-modal wallet-rewards-modal"
centered={true}
keyboard={false}
show={show}
onHide={handleClose}>
<ReactModal.Header closeButton>
<h3 className="heading">{t("CLAIM_STAKING_REWARDS")}</h3>
</ReactModal.Header>
return (
<ReactModal
animation={false}
backdrop="static"
className="modal-custom claim-rewards-modal wallet-rewards-modal"
centered={true}
keyboard={false}
show={show}
onHide={handleClose}
>
<ReactModal.Header closeButton>
<h3 className="heading">{t("CLAIM_STAKING_REWARDS")}</h3>
</ReactModal.Header>

<ReactModal.Body className="rewards-modal-body">
<div className="form-field">
<p className="label">{t("TOTAL_AVAILABLE_XPRT_REWARDS")}</p>
<div className="available-tokens">
<p className="tokens"
title={rewards.length ? (rewards[0] * tokenPrice) : 0}>
<NumberView value={formatNumber(rewards.length ? (rewards[0]) : 0)}/>
{DefaultChainInfo.currency.coinDenom}
</p>
<p className="usd">= $<NumberView
value={formatNumber(rewards.length ? (rewards[0] * tokenPrice) : 0)}/></p>
<ReactModal.Body className="rewards-modal-body">
{ibcRewards.length ? (
<>
<p className="label">All Available Rewards</p>
<div className="form-field ibc-rewards-box">
{ibcRewards.map((item, index) => {
if (stringToNumber(item.amount) > 0) {
return (
<div className="available-tokens" key={index}>
<p className="tokens" title={item.amount}>
{item.denom === PstakeInfo.coinMinimalDenom ? (
item.amount
) : (
<NumberView value={formatNumber(item.amount)} />
)}
&nbsp;
<span title={item.denom}>
{stringTruncate(item.denom)}
</span>
</p>
</div>
</div>
{ibcRewards.length ?
ibcRewards.map((item, index) => {
if(stringToNumber(item.amount) > 0) {
return (
<div className="form-field" key={index}>
<p className="label">{t("IBC_REWARDS")}</p>
<div className="available-tokens">
<p className="tokens"
title={item.amount}>
{item.denom === PstakeInfo.coinMinimalDenom ?
item.amount
:
<NumberView value={formatNumber(item.amount)}/>
}
&nbsp;<span title={item.denom}>{stringTruncate(item.denom)}</span>
</p>
</div>
</div>
);
}
})
: ""
}
<Validators/>
<ValidatorCommission/>

{loginInfo && loginInfo.loginMode !== 'keplr'
?
<Memo/>
: null
);
}
{selectedValidators.error.message !== '' ?
<div className="validator-limit-warning">
<p className="amount-warning">Warning: Recommend 3 or fewer validators to avoid potential issues.</p>
</div>
: ""}
{error.error.message !== '' ?
<p className="form-error">{error.error.message}</p> : null}
<ButtonNext/>
<div className="buttons">
<p className="button-link"
onClick={() => setWithdrawAddressHandler()}>
{t("SET_WITHDRAW_ADDRESS")}
</p>
<OverlayTrigger trigger={['hover', 'focus']} placement="bottom"
overlay={popoverSetupAddress}>
<button className="icon-button info" type="button"><Icon
viewClass="arrow-right"
icon="info"/></button>
</OverlayTrigger>
</div>
</ReactModal.Body>
</ReactModal>
);
})}
</div>
</>
) : (
""
)}
<div className="form-field">
<p className="label">{t("TOTAL_AVAILABLE_XPRT_REWARDS")}</p>
<div className="available-tokens">
<p
className="tokens"
title={rewards.length ? rewards[0] * tokenPrice : 0}
>
<NumberView
value={formatNumber(rewards.length ? rewards[0] : 0)}
/>
{DefaultChainInfo.currency.coinDenom}
</p>
<p className="usd">
= $
<NumberView
value={formatNumber(
rewards.length ? rewards[0] * tokenPrice : 0
)}
/>
</p>
</div>
</div>

<Validators />
<ValidatorCommission />

{loginInfo && loginInfo.loginMode !== "keplr" ? <Memo /> : null}
{selectedValidators.error.message !== "" ? (
<div className="validator-limit-warning">
<p className="amount-warning">
Warning: Recommend 3 or fewer validators to avoid potential
issues.
</p>
</div>
) : (
""
)}
{error.error.message !== "" ? (
<p className="form-error">{error.error.message}</p>
) : null}
<ButtonNext />
<div className="buttons">
<p
className="button-link"
onClick={() => setWithdrawAddressHandler()}
>
{t("SET_WITHDRAW_ADDRESS")}
</p>
<OverlayTrigger
trigger={["hover", "focus"]}
placement="bottom"
overlay={popoverSetupAddress}
>
<button className="icon-button info" type="button">
<Icon viewClass="arrow-right" icon="info" />
</button>
</OverlayTrigger>
</div>
</ReactModal.Body>
</ReactModal>
);
};

export default ModalWithDraw;
Loading
Loading