diff --git a/src/pages/ValidatorOnboarding/KeyGeneration/KeyGeneration.tsx b/src/pages/ValidatorOnboarding/KeyGeneration/KeyGeneration.tsx index 0d0f7cb7..2a516d22 100644 --- a/src/pages/ValidatorOnboarding/KeyGeneration/KeyGeneration.tsx +++ b/src/pages/ValidatorOnboarding/KeyGeneration/KeyGeneration.tsx @@ -1,9 +1,6 @@ -import { useEffect } from 'react' import { Stack, YStack } from 'tamagui' import { Text } from '@status-im/components' -import { generateMnemonic } from 'web-bip39' -import { useDispatch, useSelector } from 'react-redux' -import wordlist from 'web-bip39/wordlists/english' +import { useSelector } from 'react-redux' import KeyGenerationHeader from './KeyGenerationHeader/KeyGenerationHeader' import RecoveryMechanism from './RecoveryMechanism/RecoveryMechanism' @@ -16,22 +13,11 @@ import { RECOVERY_PHRASE, } from '../../../constants' import { RootState } from '../../../redux/store' -import { setGeneratedMnemonic } from '../../../redux/ValidatorOnboarding/KeyGeneration/slice' const KeyGeneration = () => { const { recoveryMechanism, isConfirmPhraseStage } = useSelector( (state: RootState) => state.keyGeneration, ) - const dispatch = useDispatch() - - useEffect(() => { - getMnemonic() - }, []) - - const getMnemonic = async () => { - const mnemonic = await generateMnemonic(wordlist, 256) - dispatch(setGeneratedMnemonic(mnemonic.split(' '))) - } const isKeystoreFiles = recoveryMechanism === KEYSTORE_FILES || diff --git a/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryPhrase.tsx b/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryPhrase.tsx index a253dcb8..fd98dd72 100644 --- a/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryPhrase.tsx +++ b/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryPhrase.tsx @@ -2,10 +2,13 @@ import { Stack, XStack, YStack } from 'tamagui' import { Button, InformationBox, Text } from '@status-im/components' import { CloseCircleIcon, CopyIcon, CheckIcon } from '@status-im/icons' import { useEffect, useState } from 'react' -import { useSelector } from 'react-redux' +import { useDispatch, useSelector } from 'react-redux' +import { generateMnemonic } from 'web-bip39' +import wordlist from 'web-bip39/wordlists/english' import { RootState } from '../../../redux/store' import { copyFunction } from '../../../utilities' +import { setGeneratedMnemonic } from '../../../redux/ValidatorOnboarding/KeyGeneration/slice' import styles from './index.module.css' type RecoveryPhraseProps = { @@ -18,6 +21,16 @@ const RecoveryPhrase = ({ isKeystoreFiles }: RecoveryPhraseProps) => { const { generatedMnemonic } = useSelector( (state: RootState) => state.keyGeneration, ) + const dispatch = useDispatch() + + useEffect(() => { + getMnemonic() + }, []) + + const getMnemonic = async () => { + const mnemonic = await generateMnemonic(wordlist, 256) + dispatch(setGeneratedMnemonic(mnemonic.split(' '))) + } useEffect(() => { setIsCopied(false) @@ -80,12 +93,8 @@ const RecoveryPhrase = ({ isKeystoreFiles }: RecoveryPhraseProps) => { {word} - - - {word} - - - ))} + + ))} {isCopied ? : }