diff --git a/src/components/General/ValidatorProfile.tsx b/src/components/General/ValidatorProfile.tsx index e6c7eb0f..917d5e6e 100644 --- a/src/components/General/ValidatorProfile.tsx +++ b/src/components/General/ValidatorProfile.tsx @@ -4,21 +4,21 @@ import { XStack } from 'tamagui' import ValidatorNameAddress from './ValidatorNameAddress' type ValidatorProfileProps = { - number: number + name: string address: string } -const ValidatorProfile = ({ number, address }: ValidatorProfileProps) => { +const ValidatorProfile = ({ name, address }: ValidatorProfileProps) => { return ( - + ) } diff --git a/src/constants.ts b/src/constants.ts index 42ed82d7..ac5240b3 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -73,7 +73,7 @@ export const VALIDATOR_TABS_MANAGEMENT = [ export const VALIDATORS_DATA = [ { - number: 1, + name: '1', address: 'zQ3asdf9d4Gs0', balance: 32.0786, income: 0.0786, @@ -83,7 +83,7 @@ export const VALIDATORS_DATA = [ status: 'Active', }, { - number: 1, + name: '1', address: 'zQ3asdf9d4Gs0', balance: 32.0786, income: 0.0786, @@ -93,7 +93,7 @@ export const VALIDATORS_DATA = [ status: 'Active', }, { - number: 1, + name: '1', address: 'zQ3asdf9d4Gs0', balance: 32.0786, income: 0.0786, @@ -103,7 +103,7 @@ export const VALIDATORS_DATA = [ status: 'Active', }, { - number: 1, + name: '1', address: 'zQ3asdf9d4Gs0', balance: 32.0786, income: 0.0786, diff --git a/src/pages/ValidatorManagement/ManagementTable/ManagementTable.tsx b/src/pages/ValidatorManagement/ManagementTable/ManagementTable.tsx index ee7306e5..05a5d099 100644 --- a/src/pages/ValidatorManagement/ManagementTable/ManagementTable.tsx +++ b/src/pages/ValidatorManagement/ManagementTable/ManagementTable.tsx @@ -15,7 +15,7 @@ type ManagementTableProps = { } export type Validator = { - number: number + name: string address: string balance: number income: number @@ -35,12 +35,12 @@ const isValidStatus = (validatorStatus: string, tabStatus: string) => { return false } -const isValidNumberOrAddress = ( - validatorNumber: number, +const isValidNameOrAddress = ( + validatorName: string, validatorAddress: string, searchValue: string, ) => { - if (validatorNumber.toString().includes(searchValue) || validatorAddress.includes(searchValue)) { + if (validatorName.includes(searchValue) || validatorAddress.includes(searchValue)) { return true } return false @@ -61,7 +61,7 @@ const ManagementTable = ({ tab, searchValue, changeSearchValue }: ManagementTabl const filteredValidators = useMemo(() => { return validators .filter(validator => isValidStatus(validator.status, tab)) - .filter(validator => isValidNumberOrAddress(validator.number, validator.address, searchValue)) + .filter(validator => isValidNameOrAddress(validator.name, validator.address, searchValue)) }, [validators, tab, searchValue]) const handleSelectAll = () => { diff --git a/src/pages/ValidatorManagement/ManagementTable/ManagementTableRow.tsx b/src/pages/ValidatorManagement/ManagementTable/ManagementTableRow.tsx index 7a21bafe..6aefee3d 100644 --- a/src/pages/ValidatorManagement/ManagementTable/ManagementTableRow.tsx +++ b/src/pages/ValidatorManagement/ManagementTable/ManagementTableRow.tsx @@ -32,7 +32,7 @@ const ManagementTableRow = ({ validator, isAllSelected }: ManagementTableRowProp /> - + diff --git a/src/pages/ValidatorOnboarding/Deposit/Deposit.tsx b/src/pages/ValidatorOnboarding/Deposit/Deposit.tsx index b6b5d785..81280e0b 100644 --- a/src/pages/ValidatorOnboarding/Deposit/Deposit.tsx +++ b/src/pages/ValidatorOnboarding/Deposit/Deposit.tsx @@ -52,7 +52,7 @@ const Deposit = () => { {Array.from({ length: validatorCount }).map((_, index) => ( ))} diff --git a/src/pages/ValidatorOnboarding/Deposit/ValidatorRequest/ValidatorRequest.tsx b/src/pages/ValidatorOnboarding/Deposit/ValidatorRequest/ValidatorRequest.tsx index 757907c3..8cb84cbd 100644 --- a/src/pages/ValidatorOnboarding/Deposit/ValidatorRequest/ValidatorRequest.tsx +++ b/src/pages/ValidatorOnboarding/Deposit/ValidatorRequest/ValidatorRequest.tsx @@ -5,11 +5,11 @@ import TransactionStatus from './TransactionStatus' import ValidatorProfile from '../../../../components/General/ValidatorProfile' type ValidatorRequestProps = { - number: number + name: string isTransactionConfirmation?: boolean } -const ValidatorRequest = ({ number, isTransactionConfirmation }: ValidatorRequestProps) => { +const ValidatorRequest = ({ name, isTransactionConfirmation }: ValidatorRequestProps) => { let transactionStatus = 'Complete' const isTransactionCompleted = transactionStatus === 'Complete' @@ -17,7 +17,7 @@ const ValidatorRequest = ({ number, isTransactionConfirmation }: ValidatorReques - + Keys Generated