Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/shared/components/inputs/Password.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
revealed = !revealed
}

const STRENGTH_COLORS = ['gray-300', 'orange-500', 'yellow-500', 'green-500', 'green-700']
const STRENGTH_COLORS = ['gray-300', 'orange-500', 'yellow-600', 'yellow-300', 'green-700']
</script>

<style type="text/scss">
Expand Down
92 changes: 46 additions & 46 deletions packages/shared/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,23 @@
},
"appearance": {
"title": "Appearance",
"body": "Choose your wallet’s theme"
"body": "Choose your wallet’s theme."
},
"setup": {
"title": "Set up your wallet",
"body1": "You can create multiple user profiles to organize your wallets or separate user identities.",
"body2": "For now, let's start with your first profile name. You can add more profiles later",
"body1": "You can create multiple user profiles to keep your tokens separate and improve privacy.",
"body2": "For now, let's start with your first profile name. You can add more profiles later.",
"profileName": "Profile Name"
},
"secure": {
"title": "Secure your wallet",
"body1": "Your Firefly wallet is secured by a password and a PIN code.",
"body2": "Use the Recovery Kit PDF template to store your wallet's login credentials safely."
"body1": "Save and print the Recovery Kit PDF template.",
"body2": "If you fill out the Recovery Kit and store it safely, you will always be able to recover your wallet."
},
"password": {
"title": "Create a password",
"body": "You need a strong password to protect your funds. Use a combination of words, and avoid common phrases, names or dates."
"body1": "You need a strong password to protect your funds. Use a combination of words, and avoid common phrases, names or dates.",
"body2": "It is recommended that you write down your password in your Recovery Kit."
},
"protect": {
"title": "Protect your wallet",
Expand All @@ -53,41 +54,42 @@
},
"pin": {
"title": "Set up PIN code",
"body1": "Enter a 6-digit PIN below. You will be asked for this frequently when you access your device.",
"body1": "Enter a 6-digit PIN below. You will be asked for your PIN to access your profile.",
"body2": "Use numbers only"
},
"confirmPin": {
"title": "Confirm PIN code",
"body": "Confirm the PIN code you just created by repeating it."
"title": "Verify your PIN code",
"body1": "Your PIN keeps your balance and transactions private.",
"body2": "Re-enter your PIN code to proceed. "
},
"backup": {
"title": "Back up your wallet",
"body1": "You will now be shown a recovery phrase.",
"body2": "Do not share this phrase with anyone. Your recovery phrase can be used to access your tokens from anywhere.",
"body1": "You will now be shown a recovery phrase. Write it down in your Recovery Kit.",
"body2": "Do not share your recovery phrase with anyone. It can be used to access your tokens from anywhere.",
"body3": "If you lose your recovery phrase, you may lose your funds."
},
"recoveryPhrase": {
"title": "Recovery phrase",
"body1": "Carefully copy the words in the exact order shown.",
"body1": "In your Recovery Kit, write down the words in the exact order shown.",
"body2": "Keep this private and safely stored.",
"body3": "It is important to have a written backup. Computers often fail and files can corrupt.",
"revealRecoveryPhrase": "Reveal recovery phrase",
"hideRecoveryPhrase": "Hide recovery phrase"
},
"verifyRecoveryPhrase": {
"title": "Verify recovery phrase",
"body": "Let's check you wrote down the phrase correctly. Please select the right word with the corresponding number.",
"body": "Let's check you wrote down the phrase correctly. Please select each word in numbered order.",
"word": "Word",
"verified": "Recovery phrase verified",
"verifiedBody": "Remember to keep it private and safely guarded."
"verifiedBody": "Remember to keep it private and safely stored."
},
"backupWallet": {
"title": "Back up to a file",
"body1": "Your wallet password is also used to encrypt a Stronghold backup. Enter your wallet password to save your recovery phrase backup to a file.",
"body2": "Reasons why backing up to a file is important:",
"reason1": "Recover your full history",
"reason2": "Save your settings",
"reason3": "Recover a complete wallet setup and configuration",
"reason4": "Import into other devices"
"title": "Back up to a Stronghold file",
"body1": "Enter your password to backup your wallet to a Stronghold file. Your password is used to encrypt the backup.",
"body2": "Reasons why digital backups are important:",
"reason1": "Easily recover your wallet without typing in your recovery phrase",
"reason2": "Import your wallet to other devices",
"reason3": "Recover your full transaction history"
},
"recoveryPhraseSaved": {
"title": "Successfully backed up",
Expand All @@ -99,30 +101,28 @@
},
"import": {
"title": "Import a wallet",
"body": "If you have an existing seed or wallet back up file, you can import it here."
"body": "If you have a recovery phrase or Stronghold back up, you can import it here."
},
"importFromText": {
"title": "Type your seed or secret phase",
"body1": "A seed consists of 81 characters. This is used to recover the older Trinity wallet.",
"body2": "A secret phrase is a 24 word mnemonic. This is used to recover a newer Firefly wallet.",
"body3": "Enter your seed or secret phrase",
"title": "Restore your wallet with a recovery phrase or seed",
"body1": "A seed consists of 81 characters. This is used to recover from an older Trinity wallet.",
"body2": "A recovery phrase is 24 words long (with spaces). This is used to recover an existing Firefly wallet.",
"body3": "Enter your seed or recovery phrase",
"seedDetected": "81 character seed detected",
"phraseDetected": "24 word secret phrase detected"
"phraseDetected": "24 word recovery phrase detected"
},
"importFromFile": {
"title": "Restore your wallet using a backup file",
"body": "Upload a file to restore existing wallet funds. File backups can be either a Trinity SeedVault or a Firefly Stronghold."
"body": "Import a backup file to restore your wallet. Backups can either be a Stronghold (.stronghold) or a Trinity SeedVault (.kdbx)."
},
"importBackupPassword": {
"title": "Restore your wallet from a SeedVault or Stronghold",
"body1": "Please provide your backup password.",
"body2": "This is the password created when you first created your backup. This stops unauthorized access to your funds."
"body1": "Please enter your backup password.",
"body2": "This is the password you set when you first created your backup."
},
"importSuccess": {
"mnemonicTitle": "You have successfully recovered your backup",
"mnemonicBody": "Your secret phrase is correct, you can now set up your new wallet.",
"seedTitle": "You have successfully recovered your backup",
"seedBody": "Your secret phrase is correct, you can now set up your new wallet.",
"title": "You have successfully recovered your backup",
"body": "You can now set up your new wallet.",
"seedvaultTitle": "Successfully imported",
"seedvaultBody": "Your password is correct, you can now continue.",
"strongholdTitle": "Successfully imported",
Expand Down Expand Up @@ -199,7 +199,7 @@
},
"changePincode": {
"title": "Change PIN code",
"description": "Your pin keeps your balance and transactions private",
"description": "Your PIN keeps your balance and transactions private",
"currentPincode": "Current PIN",
"newPincode": "New PIN",
"confirmNewPincode": "Confirm new PIN",
Expand Down Expand Up @@ -334,14 +334,14 @@
"notBackedUpDescription": "You have not backed up your Stronghold"
},
"deleteAccount": {
"title": "Delete {name}?",
"body": "You will permanently lose your transaction history and maybe something else as well.",
"typePassword": "Type your wallet’s password to confirm.",
"deleteAccount": "Delete account",
"errorTitle": "Unable to delete {name}",
"errorBody1": "To delete an account you must have 0 balance.",
"title": "Remove {name}?",
"body": "You can add this account back later but you may lose your transaction history.",
"typePassword": "Type your wallet password to confirm.",
"deleteAccount": "Remove account",
"errorTitle": "Unable to remove {name}",
"errorBody1": "To remove an account it must have 0 balance.",
"errorBody2": "You currently have {balance} remaining on this account. Please move these funds to a different account and try again.",
"errorBody3": "You cannot delete this account, you must have at least one."
"errorBody3": "You cannot remove this account, you must have at least one."
},
"addressHistory": {
"title": "{name} account address history",
Expand Down Expand Up @@ -432,7 +432,7 @@
"saveBackup": "Save Stronghold backup",
"customizeAcount": "Customise account",
"viewAddressHistory": "View address history",
"deleteAccount": "Delete account",
"deleteAccount": "Remove account",
"max": "Max",
"addNode": "Add node",
"removeNode": "Remove node",
Expand All @@ -455,7 +455,7 @@
"yes": "Yes",
"no": "No",
"reset": "Reset",
"downloadRecoveryKit": "Download recovery kit template",
"downloadRecoveryKit": "Save Recovery Kit template",
"skipBackup": "Skip file backup",
"finishSetup": "Finish setup",
"readDocumentation": "Read the documentation",
Expand Down Expand Up @@ -563,7 +563,7 @@
"passwordStrength0": "Bad",
"passwordStrength1": "Poor",
"passwordStrength2": "Weak",
"passwordStrength3": "Good",
"passwordStrength3": "Average",
"passwordStrength4": "Strong",
"creatingProfile": "Creating profile, please wait..."
},
Expand Down Expand Up @@ -646,7 +646,7 @@
"mnemonic": "The mnemonic is not valid.",
"seedTooShort": "The seed should be 81 characters long, it {length, plural, one {is 1} other {is #}}",
"seedCharacters": "The seed should only contain characters A-Z or 9",
"phraseWordCount": "There should be 24 words in your recovery phrase, currently there {length, plural, one {is 1} other {are #}}",
"phraseWordCount": "There should be 24 words in your recovery phrase, currently there {length, plural, one {is 1} other {are #}}.",
"phraseUnrecognizedWord": "Unrecognized word \"{word}\" in your recovery phrase"
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/routes/setup/Congratulations.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<Icon icon="success-check" classes="text-white" />
</div>
<Text type="h2" classes="mb-5 text-center">{locale('views.congratulations.title')}</Text>
<Text type="p" secondary classes="mb-10">{locale('views.congratulations.body')}</Text>
<Text type="p" secondary classes="mb-2">{locale('views.congratulations.body')}</Text>
</div>
</div>
<div slot="leftpane__action">
Expand Down
6 changes: 4 additions & 2 deletions packages/shared/routes/setup/Password.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@
<OnboardingLayout onBackClick={handleBackClick} {busy}>
<div slot="leftpane__content">
<form on:submit={handleContinueClick} id="password-form">
<Text type="h2" classes="mb-5">{locale('views.password.title')}</Text>
<Text type="p" secondary classes="mb-10">{locale('views.password.body')}</Text>
<Text type="h2" classes="mb-6">{locale('views.password.title')}</Text>
<Text type="p" classes="mb-4" secondary>{locale('views.password.body1')}</Text>
<Text type="p" classes="mb-10" secondary>{locale('views.password.body2')}</Text>
<Password
{error}
classes="mb-1"
Expand All @@ -73,6 +74,7 @@
disabled={busy} />
<Password
bind:value={confirmedPassword}
classes="mb-5"
{locale}
placeholder={locale('general.confirmPassword')}
showRevealToggle
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/routes/setup/Secure.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<OnboardingLayout onBackClick={handleBackClick}>
<div slot="leftpane__content">
<Text type="h2" classes="mb-4">{locale('views.secure.title')}</Text>
<Text type="p" secondary classes="mb-2">{locale('views.secure.body1')}</Text>
<Text type="p" secondary classes="mb-4">{locale('views.secure.body1')}</Text>
<Text type="p" secondary classes="mb-10">{locale('views.secure.body2')}</Text>
</div>
<div slot="leftpane__action" class="flex flex-col">
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/routes/setup/Setup.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<OnboardingLayout onBackClick={handleBackClick} {busy}>
<div slot="leftpane__content">
<Text type="h2" classes="mb-4">{locale('views.setup.title')}</Text>
<Text type="p" secondary classes="mb-10">{locale('views.setup.body1')}</Text>
<Text type="p" secondary classes="mb-4">{locale('views.setup.body1')}</Text>
<Text type="p" secondary classes="mb-10">{locale('views.setup.body2')}</Text>
<Input
{error}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<Text type="p" secondary smaller classes="mb-2">- {locale('views.backupWallet.reason1')}</Text>
<Text type="p" secondary smaller classes="mb-2">- {locale('views.backupWallet.reason2')}</Text>
<Text type="p" secondary smaller classes="mb-2">- {locale('views.backupWallet.reason3')}</Text>
<Text type="p" secondary smaller classes="mb-2">- {locale('views.backupWallet.reason4')}</Text>
</form>
</div>
<div slot="leftpane__action">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
<div slot="leftpane__content">
<Text type="h2" classes="mb-5">{locale('views.recoveryPhrase.title')}</Text>
<Text type="p" secondary classes="mb-4">{locale('views.recoveryPhrase.body1')}</Text>
<Text type="p" secondary highlighted classes="font-bold">{locale('views.recoveryPhrase.body2')}</Text>
<Text type="p" secondary highlighted classes="font-bold mb-4">{locale('views.recoveryPhrase.body2')}</Text>
<Text type="p" secondary classes="mb-4">{locale('views.recoveryPhrase.body3')}</Text>
</div>
<div slot="leftpane__action" class="flex flex-col">
<Button secondary classes="flex-1 mb-4" onClick={() => handleDownloadClick()}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<Icon icon="success-check" classes="text-white" />
</div>
<Text type="h2" classes="mb-5 text-center">{locale('views.verifyRecoveryPhrase.verified')}</Text>
<Text type="p" secondary classes="mb-10">{locale('views.verifyRecoveryPhrase.verifiedBody')}</Text>
<Text type="p" secondary classes="mb-2">{locale('views.verifyRecoveryPhrase.verifiedBody')}</Text>
</div>
{/if}
</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/routes/setup/import/views/Success.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<div class="bg-green-100 rounded-2xl relative -top-10">
<Icon icon="success-check" classes="text-white" />
</div>
<Text type="h2" classes="mb-5 text-center">{locale(`views.importSuccess.${importType}Title`)}</Text>
<Text type="p" secondary classes="mb-10">{locale(`views.importSuccess.${importType}Body`)}</Text>
<Text type="h2" classes="mb-5 text-center">{locale(`views.importSuccess.title`)}</Text>
<Text type="p" secondary classes="mb-2">{locale(`views.importSuccess.body`)}</Text>
</div>
</div>
<div slot="leftpane__action">
Expand Down
3 changes: 2 additions & 1 deletion packages/shared/routes/setup/protect/views/Pin.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
<Pin bind:value={pinInput} glimpse classes="w-full mx-auto block" on:submit={onSubmit} autofocus disabled={busy} />
{:else}
<Text type="h2" classes="mb-5">{locale('views.confirmPin.title')}</Text>
<Text type="p" secondary classes="mb-8">{locale('views.confirmPin.body')}</Text>
<Text type="p" secondary classes="mb-4">{locale('views.confirmPin.body1')}</Text>
<Text type="p" secondary classes="mb-8">{locale('views.confirmPin.body2')}</Text>
<Pin bind:value={pinInput} glimpse classes="w-full mx-auto block" on:submit={onSubmit} autofocus disabled={busy} />
{/if}
</div>
Expand Down