feat(staking): ui of validator selection #691
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import styled, { css } from 'styled-components'; | ||
|
|
||
| import { Icon, IconName } from '@/components/Icon'; | ||
|
|
||
| type ElementProps = { | ||
| iconName?: IconName; | ||
| isOpen?: boolean; | ||
| }; | ||
|
|
||
| type StyleProps = { | ||
| className?: string; | ||
| }; | ||
|
|
||
| export const DropdownIcon = ({ | ||
| iconName = IconName.Triangle, | ||
| isOpen, | ||
| className, | ||
| }: ElementProps & StyleProps) => { | ||
| return ( | ||
| <$DropdownIcon aria-hidden="true" isOpen={isOpen} className={className}> | ||
| <Icon iconName={iconName} aria-hidden="true" /> | ||
| </$DropdownIcon> | ||
| ); | ||
| }; | ||
|
|
||
| const $DropdownIcon = styled.span<{ isOpen?: boolean }>` | ||
| display: inline-flex; | ||
| transition: transform 0.3s var(--ease-out-expo); | ||
| font-size: 0.375em; | ||
|
|
||
| ${({ isOpen }) => | ||
| isOpen && | ||
| css` | ||
| transform: scaleY(-1); | ||
| `} | ||
| `; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There was a problem hiding this comment. Since this is implemented already so don't sweat it, and I think this approach is totally valid. Originally I was thinking we could have leveraged There was a problem hiding this comment. ooh good point; yeah my understanding of product was that sortability seemed more important than search but may have been easier to use There was a problem hiding this comment. All good! I think this reasoning make sense too |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| import { memo, useMemo, useState } from 'react'; | ||
|
|
||
| import { Validator } from '@dydxprotocol/v4-client-js/build/node_modules/@dydxprotocol/v4-proto/src/codegen/cosmos/staking/v1beta1/staking'; | ||
| import styled from 'styled-components'; | ||
|
|
||
| import { STRING_KEYS } from '@/constants/localization'; | ||
| import { ValidatorData } from '@/constants/validators'; | ||
|
|
||
| import { useStakingValidator } from '@/hooks/useStakingValidator'; | ||
| import { useStringGetter } from '@/hooks/useStringGetter'; | ||
| import { useTokenConfigs } from '@/hooks/useTokenConfigs'; | ||
|
|
||
| import { layoutMixins } from '@/styles/layoutMixins'; | ||
| import { popoverMixins } from '@/styles/popoverMixins'; | ||
|
|
||
| import { DropdownIcon } from '@/components/DropdownIcon'; | ||
| import { Icon, IconName } from '@/components/Icon'; | ||
| import { Link } from '@/components/Link'; | ||
| import { Output, OutputType } from '@/components/Output'; | ||
| import { Popover, TriggerType } from '@/components/Popover'; | ||
| import { ColumnDef, Table } from '@/components/Table'; | ||
| import { TableCell } from '@/components/Table/TableCell'; | ||
| import { Tag } from '@/components/Tag'; | ||
| import { ValidatorFaviconIcon } from '@/components/ValidatorName'; | ||
|
|
||
| import { MustBigNumber } from '@/lib/numbers'; | ||
|
|
||
| const ValidatorsDropdownContent = ({ | ||
| availableValidators, | ||
| }: { | ||
| availableValidators: Validator[]; | ||
| }) => { | ||
| const stringGetter = useStringGetter(); | ||
| const { chainTokenLabel } = useTokenConfigs(); | ||
|
|
||
| const columns = useMemo( | ||
| () => | ||
| [ | ||
| { | ||
| columnKey: 'commission', | ||
| getCellValue: (row) => row.commissionRate.toNumber(), | ||
| label: stringGetter({ key: STRING_KEYS.VALIDATOR }), | ||
| allowsSorting: true, | ||
| renderCell: ({ website, name, commissionRate }) => ( | ||
| <TableCell | ||
| stacked | ||
| stackedWithSecondaryStyling | ||
| slotLeft={<ValidatorFaviconIcon url={website} fallbackText={name} />} | ||
| > | ||
| <span>{name}</span> | ||
| <span> | ||
| {stringGetter({ | ||
| key: STRING_KEYS.COMMISSION_PERCENTAGE, | ||
| params: { | ||
| PERCENTAGE: ( | ||
| <$CommissionOutput type={OutputType.Percent} value={commissionRate} /> | ||
| ), | ||
| }, | ||
| })} | ||
| </span> | ||
| </TableCell> | ||
| ), | ||
| }, | ||
| { | ||
| columnKey: 'votingPower', | ||
| getCellValue: (row) => row.votingPower.toNumber(), | ||
| allowsSorting: true, | ||
| label: stringGetter({ key: STRING_KEYS.VOTING_POWER }), | ||
| tag: <Tag> {chainTokenLabel} </Tag>, | ||
| renderCell: ({ votingPower }) => <Output type={OutputType.Number} value={votingPower} />, | ||
| }, | ||
| ] satisfies ColumnDef<ValidatorData>[], | ||
| [stringGetter, chainTokenLabel] | ||
| ); | ||
|
|
||
| const filteredValidators = availableValidators.reduce((validators: ValidatorData[], val) => { | ||
| if (val.description) { | ||
| validators.push({ | ||
| name: val.description.moniker, | ||
| operatorAddress: val.operatorAddress, | ||
| votingPower: MustBigNumber(val.delegatorShares).div(10 ** 36), | ||
|
There was a problem hiding this comment. oops forgot to update these hardcoded vals (36; 16) will do |
||
| commissionRate: MustBigNumber(val.commission?.commissionRates?.rate).div(10 ** 16), | ||
| website: val.description?.website, | ||
| }); | ||
| } | ||
| return validators; | ||
| }, []); | ||
|
|
||
| return ( | ||
| <$ScrollArea> | ||
| <$Table | ||
| key="validators" | ||
| label="Validators" | ||
| data={filteredValidators} | ||
| getRowKey={(row: ValidatorData) => row.operatorAddress} | ||
| // onRowAction // TODO: OTE-449 | ||
| columns={columns} | ||
| defaultSortDescriptor={{ | ||
| column: 'commission', | ||
| direction: 'ascending', | ||
| }} | ||
| paginationBehavior="showAll" | ||
| slotEmpty={ | ||
| <> | ||
| <Icon iconName={IconName.OrderPending} /> | ||
| <h4> | ||
| { | ||
| 'There are no validators currently available.' // TODO: localize | ||
| } | ||
| </h4> | ||
| </> | ||
| } | ||
| /> | ||
| </$ScrollArea> | ||
| ); | ||
| }; | ||
|
|
||
| export const ValidatorDropdown = memo(() => { | ||
| const { selectedValidator, availableValidators } = useStakingValidator() ?? {}; | ||
|
|
||
| const [isOpen, setIsOpen] = useState(false); | ||
|
|
||
| const output = ( | ||
| <$Output | ||
| type={OutputType.Text} | ||
| value={selectedValidator?.description?.moniker} | ||
| slotLeft={ | ||
| <ValidatorFaviconIcon | ||
| url={selectedValidator?.description?.website} | ||
| fallbackText={selectedValidator?.description?.moniker} | ||
| /> | ||
| } | ||
| slotRight={<$DropdownIcon iconName={IconName.Caret} isOpen={isOpen} />} | ||
| /> | ||
| ); | ||
|
|
||
| const slotTrigger = selectedValidator?.description?.website ? ( | ||
| <Link href={selectedValidator?.description?.website} withIcon> | ||
| {output} | ||
| </Link> | ||
| ) : ( | ||
| output | ||
| ); | ||
|
|
||
| return ( | ||
| <$Popover | ||
| open={isOpen} | ||
| onOpenChange={setIsOpen} | ||
| slotTrigger={slotTrigger} | ||
| triggerType={TriggerType.MarketDropdown} | ||
| align="end" | ||
| sideOffset={8} | ||
| withPortal | ||
| > | ||
| <ValidatorsDropdownContent availableValidators={availableValidators ?? []} /> | ||
| </$Popover> | ||
| ); | ||
| }); | ||
|
|
||
| const $ScrollArea = styled.div` | ||
| ${layoutMixins.scrollArea} | ||
|
|
||
| max-height: 20rem; | ||
| `; | ||
|
|
||
| const $DropdownIcon = styled(DropdownIcon)` | ||
| margin-left: 0.5rem; | ||
| `; | ||
|
|
||
| const $Popover = styled(Popover)` | ||
| ${popoverMixins.popover} | ||
| `; | ||
|
|
||
| const $Table = styled(Table)` | ||
| --tableRow-backgroundColor: var(--color-layer-4); | ||
| --tableCell-padding: 0.5rem 1rem; | ||
| ` as typeof Table; | ||
|
|
||
| const $Output = styled(Output)` | ||
| color: var(--color-text-1); | ||
| `; | ||
|
|
||
| const $CommissionOutput = styled(Output)` | ||
| display: inline; | ||
| `; | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice one