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.

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

improve stake-tokens example #67

Merged
merged 2 commits into from
Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
78 changes: 65 additions & 13 deletions examples/stake-tokens/components/react/all-validators.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
Text,
Image,
useColorMode,
Center,
} from '@chakra-ui/react';
import {
DelegateWarning,
Expand All @@ -46,20 +47,52 @@ import type {
import { TransactionResult } from '../types';
import { ChainName } from '@cosmos-kit/core';

export const Thumbnail = ({
identity,
name,
thumbnailUrl,
}: {
identity: string | undefined;
name: string | undefined;
thumbnailUrl: string;
}) => {
return (
<>
{identity && thumbnailUrl ? (
<Image
borderRadius="full"
boxSize="30px"
src={thumbnailUrl}
alt={name}
mr={2}
/>
) : (
<Center boxSize="30px" bgColor="gray.400" borderRadius="full" mr={2}>
{name && name.slice(0, 1).toUpperCase()}
</Center>
)}
</>
);
};

const AllValidators = ({
validators,
balance,
delegations,
updateData,
unbondingDays,
chainName,
thumbnails,
}: {
validators: Validator[];
balance: number;
delegations: Delegation[];
updateData: () => void;
unbondingDays: number;
chainName: ChainName;
thumbnails: {
[key: string]: string;
};
}) => {
const { isOpen, onOpen, onClose } = useDisclosure();
const { getSigningStargateClient, address } = useChain(chainName);
Expand Down Expand Up @@ -161,9 +194,20 @@ const AllValidators = ({

<ModalBody>
<ValidatorInfo
imgUrl="https://wallet.keplr.app/_next/image?url=https%3A%2F%2Fs3.amazonaws.com%2Fkeybase_processed_uploads%2F909034c1d36c1d1f3e9191f668007805_360_360.jpeg&w=64&q=75"
imgUrl={
currentValidator?.description?.identity
? thumbnails[currentValidator.description.identity]
: ''
}
name={currentValidator?.description?.moniker || ''}
commission={5}
commission={
currentValidator?.commission?.commissionRates?.rate
? exponentiate(
currentValidator.commission.commissionRates.rate,
-16
).toFixed(0)
: 0
}
apr={22.08}
/>
<ValidatorDesc
Expand Down Expand Up @@ -223,23 +267,31 @@ const AllValidators = ({
overflowX="hidden"
>
<Text mr={4}>{index + 1}</Text>
{/* <Image
borderRadius="full"
boxSize="30px"
src={validator.imgUrl}
alt={validator.description.moniker}
mr={2}
/> */}
<Thumbnail
identity={validator.description?.identity}
name={validator.description?.moniker}
thumbnailUrl={
validator.description?.identity
? thumbnails[validator.description.identity]
: ''
}
/>
<Text>{validator?.description?.moniker}</Text>
</Box>
</Td>
<Td>
{/* {validator.voting} <Token color="blackAlpha.800" /> */}
10,000,000&nbsp;
{Math.floor(exponentiate(validator.tokens, -exp))}
&nbsp;
<Token color="blackAlpha.800" token={coin.symbol} />
</Td>
{/* <Td>{validator.commission}</Td> */}
<Td>5%</Td>
<Td>
{validator.commission?.commissionRates?.rate &&
exponentiate(
validator.commission.commissionRates.rate,
-16
).toFixed(0)}
%
</Td>
<Td>
<Box width="100%" display="flex" alignItems="center">
{/* <Text>{validator.apr}</Text> */}
Expand Down
11 changes: 9 additions & 2 deletions examples/stake-tokens/components/react/delegate-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
UnorderedList,
useColorModeValue,
useToast,
Center,
} from '@chakra-ui/react';
import { TransactionResult } from '../types';

Expand All @@ -33,11 +34,17 @@ export const ValidatorInfo = ({
}: {
imgUrl: string;
name: string;
commission: number;
commission: number | string;
apr: number;
}) => (
<Flex alignItems="center" gap={4} mb={4}>
<Image borderRadius="full" boxSize="60px" src={imgUrl} alt={name} />
{imgUrl ? (
<Image borderRadius="full" boxSize="60px" src={imgUrl} alt={name} />
) : (
<Center boxSize="60px" borderRadius="full" bgColor="gray.400">
{name.slice(0, 1).toUpperCase()}
</Center>
)}
<Stack>
<Heading as="h4" size="md">
{name}
Expand Down
87 changes: 63 additions & 24 deletions examples/stake-tokens/components/react/my-validators.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import type {
} from 'interchain/types/codegen/cosmos/staking/v1beta1/staking';
import type { DelegationDelegatorReward as Reward } from 'interchain/types/codegen/cosmos/distribution/v1beta1/distribution';
import { ChainName } from '@cosmos-kit/core';
import { Thumbnail } from './all-validators';

const MyValidators = ({
validators,
Expand All @@ -57,6 +58,7 @@ const MyValidators = ({
updateData,
unbondingDays,
chainName,
thumbnails,
}: {
validators: Validator[];
allValidator: Validator[];
Expand All @@ -66,6 +68,9 @@ const MyValidators = ({
updateData: () => void;
unbondingDays: number;
chainName: ChainName;
thumbnails: {
[key: string]: string;
};
}) => {
const { getSigningStargateClient, address } = useChain(chainName);

Expand Down Expand Up @@ -152,9 +157,11 @@ const MyValidators = ({
return {
details: validator?.description?.details,
name: validator?.description?.moniker,
identity: validator?.description?.identity,
address: validator.operatorAddress,
staked: exponentiate(delegation.balance!.amount, -exp),
reward: Number(exponentiate(rewardAmount, -exp).toFixed(6)),
commission: validator?.commission?.commissionRates?.rate,
};
});

Expand Down Expand Up @@ -379,9 +386,17 @@ const MyValidators = ({

<ModalBody>
<ValidatorInfo
imgUrl="https://wallet.keplr.app/_next/image?url=https%3A%2F%2Fs3.amazonaws.com%2Fkeybase_processed_uploads%2F909034c1d36c1d1f3e9191f668007805_360_360.jpeg&w=64&q=75"
imgUrl={
currentValidator?.identity
? thumbnails[currentValidator.identity]
: ''
}
name={currentValidator?.name || ''}
commission={5}
commission={
currentValidator?.commission
? exponentiate(currentValidator.commission, -16).toFixed(0)
: 0
}
apr={22.08}
/>
<ValidatorDesc description={currentValidator?.details || ''} />
Expand Down Expand Up @@ -427,9 +442,17 @@ const MyValidators = ({

<ModalBody>
<ValidatorInfo
imgUrl="https://wallet.keplr.app/_next/image?url=https%3A%2F%2Fs3.amazonaws.com%2Fkeybase_processed_uploads%2F909034c1d36c1d1f3e9191f668007805_360_360.jpeg&w=64&q=75"
imgUrl={
currentValidator?.identity
? thumbnails[currentValidator.identity]
: ''
}
name={currentValidator?.name || ''}
commission={5}
commission={
currentValidator?.commission
? exponentiate(currentValidator.commission, -16).toFixed(0)
: 0
}
apr={22.08}
/>
<DelegateWarning unbondingDays={unbondingDays} />
Expand Down Expand Up @@ -474,9 +497,17 @@ const MyValidators = ({

<ModalBody>
<ValidatorInfo
imgUrl="https://wallet.keplr.app/_next/image?url=https%3A%2F%2Fs3.amazonaws.com%2Fkeybase_processed_uploads%2F909034c1d36c1d1f3e9191f668007805_360_360.jpeg&w=64&q=75"
imgUrl={
currentValidator?.identity
? thumbnails[currentValidator.identity]
: ''
}
name={currentValidator?.name || ''}
commission={5}
commission={
currentValidator?.commission
? exponentiate(currentValidator.commission, -16).toFixed(0)
: 0
}
apr={22.08}
/>
<Stack direction="column" spacing={4}>
Expand Down Expand Up @@ -548,23 +579,31 @@ const MyValidators = ({
overflowX="hidden"
>
<Text mr={4}>{index + 1}</Text>
{/* <Image
borderRadius="full"
boxSize="30px"
src={validator.imgUrl}
alt={validator.description.moniker}
mr={2}
/> */}
<Thumbnail
identity={validator.description?.identity}
name={validator.description?.moniker}
thumbnailUrl={
validator.description?.identity
? thumbnails[validator.description.identity]
: ''
}
/>
<Text>{validator?.description?.moniker}</Text>
</Box>
</Td>
<Td>
{/* {validator.voting} <Token color="blackAlpha.800" /> */}
10,000,000&nbsp;
{Math.floor(exponentiate(validator.tokens, -exp))}
&nbsp;
<Token color="blackAlpha.800" token={coin.symbol} />
</Td>
{/* <Td>{validator.commission}</Td> */}
<Td>5%</Td>
<Td>
{validator.commission?.commissionRates?.rate &&
exponentiate(
validator.commission.commissionRates.rate,
-16
).toFixed(0)}
%
</Td>
<Td>
<Box width="100%" display="flex" alignItems="center">
{/* <Text>{validator.apr}</Text> */}
Expand Down Expand Up @@ -645,13 +684,13 @@ const MyValidators = ({
overflowX="hidden"
>
<Text mr={4}>{index + 1}</Text>
{/* <Image
borderRadius="full"
boxSize="30px"
src={validator.imgUrl}
alt={validator.name}
mr={2}
/> */}
<Thumbnail
identity={validator.identity}
name={validator.name}
thumbnailUrl={
validator.identity ? thumbnails[validator.identity] : ''
}
/>
<Text>{validator.name}</Text>
</Box>
</Td>
Expand Down
Loading