Skip to content

Commit 71e048d

Browse files
rickimooreAgeManning
authored andcommitted
Fix:build fix deposits (#287)
1 parent a926f68 commit 71e048d

File tree

3 files changed

+26
-23
lines changed

3 files changed

+26
-23
lines changed

src/components/ValidatorCredentialRow/ValidatorCredentialRow.tsx

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { getAddress, verifyMessage } from 'ethers';
2-
import { ChangeEvent, FC, useEffect, useState } from 'react';
3-
import { useTranslation } from 'react-i18next';
4-
import { useSignMessage } from 'wagmi';
5-
import addClassString from '../../../utilities/addClassString';
6-
import { ValidatorCandidate } from '../../types';
7-
import Button, { ButtonFace } from '../Button/Button';
8-
import Typography from '../Typography/Typography';
9-
import ValidatorCandidateRow from '../ValidatorCandidateRow/ValidatorCandidateRow';
10-
import WalletActionBtn from '../WalletActionBtn/WalletActionBtn';
1+
import { getAddress, verifyMessage } from 'ethers'
2+
import { ChangeEvent, FC, useEffect, useState } from 'react'
3+
import { useTranslation } from 'react-i18next'
4+
import { useSignMessage } from 'wagmi'
5+
import addClassString from '../../../utilities/addClassString'
6+
import { ValidatorCandidate } from '../../types'
7+
import Button, { ButtonFace } from '../Button/Button'
8+
import Typography from '../Typography/Typography'
9+
import ValidatorCandidateRow from '../ValidatorCandidateRow/ValidatorCandidateRow'
10+
import WalletActionBtn from '../WalletActionBtn/WalletActionBtn'
1111

1212
export interface ValidatorCredentialRowProps {
1313
validatorCandidate: ValidatorCandidate
@@ -16,7 +16,7 @@ export interface ValidatorCredentialRowProps {
1616

1717
const ValidatorCredentialRow: FC<ValidatorCredentialRowProps> = ({
1818
validatorCandidate,
19-
onUpdateCandidate
19+
onUpdateCandidate,
2020
}) => {
2121
const { t } = useTranslation()
2222
const { id, index, isVerifiedCredentials } = validatorCandidate
@@ -28,18 +28,22 @@ const ValidatorCredentialRow: FC<ValidatorCredentialRowProps> = ({
2828

2929
const { data, signMessage, error, reset } = useSignMessage()
3030

31-
const handleError = (e) => {
31+
const handleError = (e: any) => {
3232
let message = 'error.unexpectedAddressError'
3333

34-
if (e?.code === "INVALID_ARGUMENT") {
34+
if (e?.code === 'INVALID_ARGUMENT') {
3535
message = 'error.invalidAddressFormat'
3636
}
3737

3838
setError(t(message))
3939
}
4040

4141
const setCredential = (e: ChangeEvent<HTMLInputElement>) => {
42-
onUpdateCandidate(id, {...validatorCandidate, withdrawalCredentials: '', isVerifiedCredentials: false})
42+
onUpdateCandidate(id, {
43+
...validatorCandidate,
44+
withdrawalCredentials: undefined,
45+
isVerifiedCredentials: false,
46+
})
4347
setError('')
4448
setIsValidAddress(false)
4549
reset()
@@ -48,7 +52,7 @@ const ValidatorCredentialRow: FC<ValidatorCredentialRowProps> = ({
4852
const value = e.target.value
4953
setCredentialInput(value)
5054
const checkSumAddress = getAddress(value)
51-
onUpdateCandidate(id, {...validatorCandidate, withdrawalCredentials: checkSumAddress})
55+
onUpdateCandidate(id, { ...validatorCandidate, withdrawalCredentials: checkSumAddress })
5256
setIsValidAddress(true)
5357
} catch (e) {
5458
handleError(e)
@@ -69,12 +73,11 @@ const ValidatorCredentialRow: FC<ValidatorCredentialRowProps> = ({
6973
const checkSumAddress = getAddress(credentialInput)
7074
const isVerifiedCredentials = signedAddress === checkSumAddress
7175

72-
onUpdateCandidate(id, {...validatorCandidate, isVerifiedCredentials })
76+
onUpdateCandidate(id, { ...validatorCandidate, isVerifiedCredentials })
7377

74-
if(!isVerifiedCredentials) {
78+
if (!isVerifiedCredentials) {
7579
setError(t('validatorManagement.withdrawalCredentials.incorrectSignature'))
7680
}
77-
7881
} catch (e) {
7982
handleError(e)
8083
} finally {

src/components/ValidatorManagement/CreateValidatorView/CreateValidatorView.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const CreateValidatorView: FC<CreateValidatorViewProps> = ({
4848
]
4949
const [candidates, setValidatorCandidates] = useState<ValidatorCandidate[]>([])
5050
const [keyPhrase, setKeyPhrase] = useState('')
51-
const [sharedWithdrawalCredentials, setSharedCredentials] = useState('')
51+
const [sharedWithdrawalCredentials, setSharedCredentials] = useState<string | undefined>()
5252
const [sharedKeystorePassword, setSharedKeystorePassword] = useState('')
5353
const [isRisk, setIsRisk] = useState(false)
5454

@@ -73,7 +73,7 @@ const CreateValidatorView: FC<CreateValidatorViewProps> = ({
7373
const decrementStep = () => setStep((prevStep) => Math.max(prevStep - 1, 0))
7474
const setNewValidators = (vals: ValidatorCandidate[]) => setValidatorCandidates(vals)
7575
const setPhrase = (e: ChangeEvent<HTMLTextAreaElement>) => setKeyPhrase(e.target.value)
76-
const setCredentials = (credentials: string) => setSharedCredentials(credentials)
76+
const updateSharedCredentials = (credentials?: string) => setSharedCredentials(credentials)
7777
const setKeystorePassword = (password: string) => setSharedKeystorePassword(password)
7878

7979
const showRiskMessage = () => setIsRisk(true)
@@ -163,7 +163,7 @@ const CreateValidatorView: FC<CreateValidatorViewProps> = ({
163163
onValidatorChange={setNewValidators}
164164
onBackStep={decrementStep}
165165
onNextStep={incrementStep}
166-
onUpdateSharedCredentials={setCredentials}
166+
onUpdateSharedCredentials={updateSharedCredentials}
167167
sharedCredentials={sharedWithdrawalCredentials}
168168
/>
169169
</CreateValidatorStep>

src/components/ValidatorManagement/CreateValidatorView/Steps/WithdrawalCredentials.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export interface WithdrawalCredentialsProps {
1515
onValidatorChange: (vals: ValidatorCandidate[]) => void
1616
isActive: boolean
1717
onShowRisk: () => void
18-
sharedCredentials: string
18+
sharedCredentials?: string | undefined
1919
onUpdateSharedCredentials: (credentials?: string) => void
2020
}
2121

@@ -62,7 +62,7 @@ const WithdrawalCredentials: FC<WithdrawalCredentialsProps> = ({
6262
}
6363

6464
const toggleAssignAllCredentials = (): void => {
65-
onUpdateSharedCredentials('')
65+
onUpdateSharedCredentials(undefined)
6666
const updatedCandidates = candidates.map((validator) => ({
6767
...validator,
6868
withdrawalCredentials: '',

0 commit comments

Comments
 (0)