Skip to content

Commit

Permalink
Merge pull request #1374 from emeraldpay/fix/create-wallet-texts
Browse files Browse the repository at this point in the history
problem: inconsistent texts when creating a wallet
  • Loading branch information
splix authored Feb 8, 2024
2 parents 9336089 + 06dd2ea commit c5f7f91
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 26 deletions.
2 changes: 1 addition & 1 deletion packages/react-app/src/app/vault/GlobalKey/GlobalKey.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const GlobalKey: React.FC<DispatchProps & StateProps> = ({
</FormRow>
<Typography>
NOTE: The password is the only way to access your coins. If you lose it, the only way to restore is to recover
the Wallet from Secret Phrase backup. Please make sure you have it backed up.
the Wallet from Seed Phrase backup. Please make sure you have it backed up.
</Typography>
</Page>
);
Expand Down
6 changes: 3 additions & 3 deletions packages/react-app/src/create-wallet/flow/createWalletFlow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ const STEPS: { [key in STEP_CODE]: StepDescription } = {
},
lockSeed: {
code: STEP_CODE.LOCK_SEED,
title: 'Save Secret Phrase',
title: 'Save Seed Phrase',
},
mnemonicGenerate: {
code: STEP_CODE.MNEMONIC_GENERATE,
title: 'Generate Secret Phrase',
title: 'Generate Seed Phrase',
},
mnemonicImport: {
code: STEP_CODE.MNEMONIC_IMPORT,
title: 'Import Secret Phrase',
title: 'Import Seed Phrase',
},
options: {
code: STEP_CODE.OPTIONS,
Expand Down
4 changes: 2 additions & 2 deletions packages/react-app/src/create-wallet/steps/SaveMnemonic.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ const SaveMnemonic: React.FC<DispatchProps & OwnProps> = ({ onPassword, verifyGl
Enter your password
</Typography>
<Alert severity="info">
You&apos;re about to save an encrypted copy of the secret phrase (&quot;Mnemonic Phrase&quot;) generated on
the previous step. Please enter the Emerald Wallet password to save the Seed Phrase!
You will now save an encrypted version of your seed phrase.
Please enter your Emerald Wallet password to securely encrypt and store your seed phrase.
</Alert>
</Grid>
<Grid item xs={12}>
Expand Down
20 changes: 11 additions & 9 deletions packages/react-app/src/create-wallet/steps/SelectKeySource.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,33 +53,35 @@ const SelectKeySource: React.FC<OwnProps> = ({ seeds, onSelect }) => {
<ListItemIcon>
<Ledger />
</ListItemIcon>
<ListItemText primary="Create from Ledger Nano" secondary="Create wallet backed by Ledger Nano model S or X" />
<ListItemText
primary="Create with Ledger Nano"
secondary="Connect and set up your Ledger Nano S or X to manage your wallet." />
</ListItem>
<ListItem button onClick={() => onSelect({ type: KeySourceType.SEED_GENERATE })}>
<ListItemIcon>
<AddBoxIcon />
</ListItemIcon>
<ListItemText
primary="Create new seed"
secondary="Generate a new mnemonic phrase for a new wallet (24 words)"
primary="Generate New Seed Phrase"
secondary="Set up a new wallet by creating a 24-word seed phrase."
/>
</ListItem>
<ListItem button onClick={() => onSelect({ type: KeySourceType.SEED_IMPORT })}>
<ListItemIcon>
<PublishIcon />
</ListItemIcon>
<ListItemText
primary="Import existing seed"
secondary="Import another mnemonic phrase or use new Hardware Wallet (Ledger Nano)"
primary="Import Seed Phrase"
secondary="Use an existing 24-word seed phrase to restore a wallet."
/>
</ListItem>
<ListItem button onClick={() => onSelect({ type: KeySourceType.PK_RAW, password: '', pk: '' })}>
<ListItemIcon>
<PublishIcon />
</ListItemIcon>
<ListItemText
primary="Import existing Raw Private Key"
secondary={'Create a new wallet dedicated to a single Private Key, by importing a raw key'}
primary="Import Private Key"
secondary="Input a private key directly to access a single wallet."
/>
</ListItem>
<ListItem
Expand All @@ -90,8 +92,8 @@ const SelectKeySource: React.FC<OwnProps> = ({ seeds, onSelect }) => {
<PublishIcon />
</ListItemIcon>
<ListItemText
primary="Import existing Private Key JSON file"
secondary="Create a new wallet dedicated to a single Private Key, by importing Ethereum JSON file"
primary="Import Private Key File"
secondary="Upload an Ethereum JSON file to access a single wallet."
/>
</ListItem>
</List>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-app/src/settings/SettingsForm/SeedItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function seedTypeName(type: SeedType): string {
return 'Ledger';
case 'mnemonic':
case 'raw':
return 'Secret Phrase';
return 'Seed Phrase';
default:
return 'Unknown type';
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ const Component: React.FC<OwnProps> = ({ isValidMnemonic, onSubmit }) => {
buttonLabel={'Set password'}
disabled={done}
helperText={
'(optional) Additional password to protect the secret mnemonic phrase. ' +
"Please save the password, if you lose it you'll be unable to recover your wallet."
'(optional) You can set an additional password for extra protection of your seed phrase.' +
'Remember to save this password. If it\'s lost, you won\'t be able to access your wallet.'
}
minLength={1}
onChange={setPassword}
Expand Down
17 changes: 9 additions & 8 deletions packages/ui/src/components/accounts/NewMnemonic/NewMnemonic.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ const NewMnemonic: React.FC<OwnProps> = ({ onContinue, onGenerate }) => {
<ConfirmedPasswordInput
buttonLabel="Set password"
disabled={done}
helperText="(optional) Additional passphrase to protect the secret mnemonic phrase."
helperText="(optional) Additional password to protect the seed phrase."
minLength={1}
onChange={setPassword}
/>
Expand All @@ -144,7 +144,7 @@ const NewMnemonic: React.FC<OwnProps> = ({ onContinue, onGenerate }) => {
}
severity="info"
>
You may set an additional passphrase to your secret phrase.
You may set an additional password to your seed phrase.
</Alert>
);
}
Expand Down Expand Up @@ -287,7 +287,7 @@ const NewMnemonic: React.FC<OwnProps> = ({ onContinue, onGenerate }) => {
</Grid>
);
} else {
title = 'Create secret "mnemonic" phrase';
title = 'Generated Seed Phrase';

if (hasMnemonic) {
content = (
Expand Down Expand Up @@ -322,9 +322,10 @@ const NewMnemonic: React.FC<OwnProps> = ({ onContinue, onGenerate }) => {
}
severity="warning"
>
Please write the phrase (&quot;Mnemonic Phrase&quot;) and keep it in a safe place. Never tell it to
anyone. Don&apos;t enter it anywhere online. It&apos;s the key to spend your funds. If you lose this
phrase, you will not be able to recover your account.
Write down your 24-word seed phrase and store it safely.
This phrase is the only way to access your funds, and it must never be shared or entered online.
If you lose this seed phrase, you cannot recover your wallet.
Keep it secret, keep it safe.
</Alert>
</Box>
</>
Expand All @@ -334,7 +335,7 @@ const NewMnemonic: React.FC<OwnProps> = ({ onContinue, onGenerate }) => {
<>
<Box mb={2}>
<Alert severity="info">
Click &quot;Generate Phrase&quot; to create a new secret phrase that will be a key to spend your
Click &quot;Generate Seed&quot; to create a new seed phrase that will be a key to spend your
cryptocurrencies.
</Alert>
</Box>
Expand All @@ -344,7 +345,7 @@ const NewMnemonic: React.FC<OwnProps> = ({ onContinue, onGenerate }) => {
variant="contained"
onClick={() => onGenerate().then(setMnemonic).catch(console.error)}
>
Generate Phrase
Generate Seed
</Button>
</Box>
</>
Expand Down

0 comments on commit c5f7f91

Please sign in to comment.