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

fix: rewards validator selection #388

Merged
merged 9 commits into from
May 25, 2023
Merged

fix: rewards validator selection #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fdd305e
fix: rewards validator selection
terran6 May 23, 2023
aa97436
style: remove arrow on validator list collapse
terran6 May 23, 2023
cbc7d4e
fix: gt or eq on byValidator.length
mwmerz May 23, 2023
b2e2f5f
style: remove collapsable list
terran6 May 24, 2023
54bc07c
style: table design
terran6 May 25, 2023
015453a
Revert "style: table design"
terran6 May 25, 2023
af008d2
style: (de)select all button
terran6 May 25, 2023
0414eca
slight styling changes
JoshuaBrigati May 25, 2023
0fd8c02
fix: remove duplicate font weight
terran6 May 25, 2023
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
22 changes: 21 additions & 1 deletion src/txs/stake/WithdrawRewardsForm.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}

.button {
font-size: 10px;
font-size: var(--font-size-small);
font-weight: var(--bold);
padding: 6px 0;
}
Expand All @@ -32,3 +32,23 @@
@include flex(space-between);
flex: 1;
}

.title {
padding-bottom: 10px;

dt,
dd {
font-weight: var(--bold);
}
}

.actions {
display: flex;

.button {
color: var(--button-primary-bg);
margin-left: auto;
order: 2;
padding: 0px 5px 0px 0px;
}
}
133 changes: 51 additions & 82 deletions src/txs/stake/WithdrawRewardsForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@ import { useCallback, useEffect, useMemo, useState } from "react"
import { useTranslation } from "react-i18next"
import { useForm } from "react-hook-form"
import BigNumber from "bignumber.js"
import ExpandMoreIcon from "@mui/icons-material/ExpandMore"
import ExpandLessIcon from "@mui/icons-material/ExpandLess"
import { Validator, ValAddress } from "@terra-money/feather.js"
import { Rewards } from "@terra-money/feather.js"
import { MsgWithdrawDelegatorReward } from "@terra-money/feather.js"
import { queryKey } from "data/query"
import { useCurrency } from "data/settings/Currency"
import { useNetwork } from "data/wallet"
import { useMemoizedCalcValue } from "data/queries/coingecko"
import { getFindMoniker } from "data/queries/staking"
import { calcRewardsValues } from "data/queries/distribution"
import { WithTokenItem } from "data/token"
import { ValidatorLink } from "components/general"
Expand All @@ -22,6 +19,7 @@ import { Empty } from "components/feedback"
import styles from "./WithdrawRewardsForm.module.scss"
import Tx from "txs/Tx"
import { useInterchainAddresses } from "auth/hooks/useAddress"
import { Read } from "components/token"

interface Props {
rewards: Rewards
Expand All @@ -35,7 +33,6 @@ const WithdrawRewardsForm = ({ rewards, validators, chain }: Props) => {
const addresses = useInterchainAddresses()
const address = addresses && addresses[chain]
const calcValue = useMemoizedCalcValue()
const findMoniker = getFindMoniker(validators)
const { byValidator } = useMemo(
() =>
calcRewardsValues(rewards, currency.id, (coin) => Number(coin.amount)),
Expand All @@ -62,15 +59,12 @@ const WithdrawRewardsForm = ({ rewards, validators, chain }: Props) => {
setState(init(true))
}, [init])

const selectable = byValidator.length > 1
const selectable = byValidator.length >= 1
const selected = useMemo(
() => Object.keys(state).filter((address) => state[address]),
[state]
)

const [isOpen, setIsOpen] = useState(true)
const toggle = () => setIsOpen(!isOpen)

/* calc */
const selectedTotal = selected.reduce<Record<Denom, Amount>>(
(prev, address) => {
Expand All @@ -95,15 +89,6 @@ const WithdrawRewardsForm = ({ rewards, validators, chain }: Props) => {
{}
)

const selectedValidatorsText = !selected.length
? t("Not selected")
: selected.length === 1
? findMoniker(selected[0])
: t("{{moniker}} and {{length}} others", {
moniker: findMoniker(selected[0]),
length: selected.length - 1,
})

/* form */
const { handleSubmit, reset } = useForm({ mode: "onChange" })

Expand All @@ -130,7 +115,7 @@ const WithdrawRewardsForm = ({ rewards, validators, chain }: Props) => {
onSuccess: () => reset(),
}

if (Object.keys(selectedTotal).length === 0) {
if (!selectable) {
return <Empty>{t("No rewards on selected chain")}</Empty>
}

Expand All @@ -139,71 +124,56 @@ const WithdrawRewardsForm = ({ rewards, validators, chain }: Props) => {
{({ fee, submit }) => (
<Form onSubmit={handleSubmit(submit.fn)}>
<Grid gap={12}>
<dl>
<dt>{t("Validators")}</dt>
<dd>
{selectable ? (
<button type="button" onClick={toggle}>
{selectedValidatorsText}
{isOpen ? (
<ExpandLessIcon style={{ fontSize: 16 }} />
) : (
<ExpandMoreIcon style={{ fontSize: 16 }} />
)}
</button>
) : (
selectedValidatorsText
)}
</dd>
</dl>

{selectable && isOpen && (
<Card size="small" className={styles.card}>
<Flex className={styles.actions} start>
{Object.values(state).some((state) => !state) ? (
<button
type="button"
className={styles.button}
onClick={() => setState(init(true))}
>
{t("Select all")}
</button>
) : (
<button
type="button"
className={styles.button}
onClick={() => setState(init(false))}
<Flex className={styles.actions} start>
{Object.values(state).some((state) => !state) ? (
<button
type="button"
className={styles.button}
onClick={() => setState(init(true))}
>
{t("Select All")}
</button>
) : (
<button
type="button"
className={styles.button}
onClick={() => setState(init(false))}
>
{t("Deselect All")}
</button>
)}
</Flex>
<Card size="small" className={styles.card}>
<dl className={styles.title}>
<dt>{t("Validators")}</dt>
<dd>{t("Rewards")}</dd>
</dl>
<section className={styles.validators}>
{byValidator.map(({ address, list: [{ denom, amount }] }) => {
const checked = state[address]
return (
<Checkbox
className={styles.checkbox}
checked={checked}
onChange={() =>
setState({ ...state, [address]: !checked })
}
key={address}
>
{t("Deselect all")}
</button>
)}
</Flex>

<section className={styles.validators}>
{byValidator.map(({ address, sum }) => {
const checked = state[address]

return (
<Checkbox
className={styles.checkbox}
checked={checked}
onChange={() =>
setState({ ...state, [address]: !checked })
}
key={address}
>
<div className={styles.item}>
<dl className={styles.item}>
<dt>
<ValidatorLink address={address} />
</div>
</Checkbox>
)
})}
</section>
</Card>
)}

<FormArrow />

</dt>
<dd>
<Read amount={amount} denom={denom} />
</dd>
</dl>
</Checkbox>
)
})}
</section>
</Card>
{selected.length ? <FormArrow /> : undefined}
<FormItem>
<TokenCardGrid maxHeight>
{Object.entries(selectedTotal).map(([denom, amount]) => (
Expand All @@ -221,7 +191,6 @@ const WithdrawRewardsForm = ({ rewards, validators, chain }: Props) => {
</TokenCardGrid>
</FormItem>
</Grid>

{fee.render()}
{submit.button}
</Form>
Expand Down