From 34decdcd106c95fadf6b83fff4b10131cf8cc3a5 Mon Sep 17 00:00:00 2001 From: WaDadidou Date: Tue, 14 May 2024 19:37:29 -0400 Subject: [PATCH] fix: fix error on stake screen --- .../Stake/components/ValidatorsList.tsx | 79 ++++++++++--------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/packages/screens/Stake/components/ValidatorsList.tsx b/packages/screens/Stake/components/ValidatorsList.tsx index 4468679db5..278be35e4f 100644 --- a/packages/screens/Stake/components/ValidatorsList.tsx +++ b/packages/screens/Stake/components/ValidatorsList.tsx @@ -1,4 +1,4 @@ -import { Decimal } from "@cosmjs/math"; +import {Decimal} from "@cosmjs/math"; import React from "react"; import { ActivityIndicator, @@ -8,19 +8,19 @@ import { ViewStyle, } from "react-native"; -import { BrandText } from "@/components/BrandText"; -import { PrimaryButtonOutline } from "@/components/buttons/PrimaryButtonOutline"; -import { SecondaryButtonOutline } from "@/components/buttons/SecondaryButtonOutline"; -import { RoundedGradientImage } from "@/components/images/RoundedGradientImage"; -import { SpacerRow } from "@/components/spacer"; -import { TableColumns, TableHeader } from "@/components/table/TableHeader"; -import { useCosmosValidatorBondedAmount } from "@/hooks/useCosmosValidatorBondedAmount"; -import { useIsMobile } from "@/hooks/useIsMobile"; -import { useKeybaseAvatarURL } from "@/hooks/useKeybaseAvatarURL"; -import { Reward, rewardsPrice, useRewards } from "@/hooks/useRewards"; -import { UserKind, getStakingCurrency, parseUserId } from "@/networks"; -import { prettyPrice } from "@/utils/coins"; -import { removeObjectKey, removeObjectKeys } from "@/utils/object"; +import {BrandText} from "@/components/BrandText"; +import {PrimaryButtonOutline} from "@/components/buttons/PrimaryButtonOutline"; +import {SecondaryButtonOutline} from "@/components/buttons/SecondaryButtonOutline"; +import {RoundedGradientImage} from "@/components/images/RoundedGradientImage"; +import {SpacerRow} from "@/components/spacer"; +import {TableColumns, TableHeader} from "@/components/table/TableHeader"; +import {useCosmosValidatorBondedAmount} from "@/hooks/useCosmosValidatorBondedAmount"; +import {useIsMobile} from "@/hooks/useIsMobile"; +import {useKeybaseAvatarURL} from "@/hooks/useKeybaseAvatarURL"; +import {Reward, rewardsPrice, useRewards} from "@/hooks/useRewards"; +import {UserKind, getStakingCurrency, parseUserId} from "@/networks"; +import {prettyPrice} from "@/utils/coins"; +import {removeObjectKey, removeObjectKeys} from "@/utils/object"; import { errorColor, mineShaftColor, @@ -29,9 +29,9 @@ import { successColor, yellowDefault, } from "@/utils/style/colors"; -import { fontSemibold11, fontSemibold13 } from "@/utils/style/fonts"; -import { layout } from "@/utils/style/layout"; -import { ValidatorInfo } from "@/utils/types/staking"; +import {fontSemibold11, fontSemibold13} from "@/utils/style/fonts"; +import {layout} from "@/utils/style/layout"; +import {ValidatorInfo} from "@/utils/types/staking"; const serviceScoreSize = 24; @@ -82,7 +82,7 @@ export const ValidatorsTable: React.FC<{ style?: StyleProp; userId: string | undefined; userKind: UserKind; -}> = ({ validators: validatorsProp, actions, style, userId, userKind }) => { +}> = ({validators: validatorsProp, actions, style, userId, userKind}) => { const isMobile = useIsMobile(); const [sortBy, setSortBy] = React.useState("rank"); @@ -103,20 +103,21 @@ export const ValidatorsTable: React.FC<{ const COLUMNS = userId ? COLUMNS_TMP : removeObjectKeys(COLUMNS_TMP, ["staked", "claimable"]); - const { rewards, claimReward } = useRewards(userId, userKind); + const {rewards, claimReward} = useRewards(userId, userKind); return ( <> setSortBy(key)} + style={{ + paddingHorizontal: layout.spacing_x2_5, + }} /> item.address} - renderItem={({ item }) => ( + renderItem={({item}) => ( Promise; actions?: (validator: ValidatorInfo) => ValidatorsListAction[]; userId: string | undefined; -}> = ({ validator, claimReward, pendingRewards, actions, userId }) => { +}> = ({validator, claimReward, pendingRewards, actions, userId}) => { const isMobile = useIsMobile(); const imageURL = useKeybaseAvatarURL(validator.identity); const [network, userAddress] = parseUserId(userId); // Rewards price with all denoms const claimablePrice = rewardsPrice(pendingRewards); const stakingCurrency = getStakingCurrency(network?.id); - const { bondedTokens } = useCosmosValidatorBondedAmount( + const {bondedTokens} = useCosmosValidatorBondedAmount( userId, validator?.address, ); @@ -168,7 +169,7 @@ const ValidatorRow: React.FC<{ {validator.rank} @@ -182,9 +183,9 @@ const ValidatorRow: React.FC<{ paddingRight: layout.spacing_x1, }} > - + - + {validator.serviceScore === undefined ? ( - + ) : ( <> {validator.serviceScore === null @@ -303,8 +304,8 @@ const ValidatorRow: React.FC<{ size={isMobile ? "XXS" : "XS"} style={ isMobile - ? { paddingTop: layout.spacing_x1 } - : { paddingLeft: layout.spacing_x2 } + ? {paddingTop: layout.spacing_x1} + : {paddingLeft: layout.spacing_x2} } text="Claim" disabled={!userAddress}