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

Changes from 2 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
112 changes: 63 additions & 49 deletions src/txs/stake/WithdrawRewardsForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,27 @@ const WithdrawRewardsForm = ({ rewards, validators, chain }: Props) => {
{}
)

const selectedValidatorsText = !selected.length
? t("Not selected")
: selected.length === 1
? findMoniker(selected[0])
: t("{{moniker}} and {{length}} others", {
let selectedValidatorsText = ""
switch (selected.length) {
case 0:
selectedValidatorsText = t("None selected")
break
case 1:
selectedValidatorsText = findMoniker(selected[0])
break
case 2:
selectedValidatorsText = t("{{moniker}} and {{moniker2}}", {
moniker: findMoniker(selected[0]),
moniker2: findMoniker(selected[1]),
})
break
default:
selectedValidatorsText = t("{{moniker}} and {{length}} others", {
moniker: findMoniker(selected[0]),
length: selected.length - 1,
})
break
}

/* form */
const { handleSubmit, reset } = useForm({ mode: "onChange" })
Expand Down Expand Up @@ -130,7 +143,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 Down Expand Up @@ -158,52 +171,53 @@ const WithdrawRewardsForm = ({ rewards, validators, chain }: Props) => {
</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))}
>
{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}
<>
<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))}
>
<div className={styles.item}>
<ValidatorLink address={address} />
</div>
</Checkbox>
)
})}
</section>
</Card>
{t("Select all")}
</button>
) : (
<button
type="button"
className={styles.button}
onClick={() => setState(init(false))}
>
{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}>
<ValidatorLink address={address} />
</div>
</Checkbox>
)
})}
</section>
</Card>
{selected.length ? <FormArrow /> : undefined}
</>
)}

<FormArrow />

<FormItem>
<TokenCardGrid maxHeight>
{Object.entries(selectedTotal).map(([denom, amount]) => (
Expand Down