mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-02-23 15:20:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/patch-for-settingsui'

Browse source
This commit is contained in:
Overtorment 2020-03-23 12:27:42 +00:00
commit 15a446dc0c
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
loc/en.js
View file

@ -176,7 +176,7 @@ module.exports = {
},
settings: {
header: 'settings',
plausible_deniability: 'Plausible deniability...',
plausible_deniability: 'Plausible deniability',
storage_not_encrypted: 'Storage: not encrypted',
storage_encrypted: 'Storage: encrypted',
password: 'Password',
@ -204,14 +204,14 @@ module.exports = {
'password. To keep your coins safe, BlueWallet can create another ' +
'encrypted storage, with a different password. Under pressure, ' +
'you can disclose this password to a 3rd party. If entered in ' +
"BlueWallet, it will unlock new 'fake' storage. This will seem " +
'legit to a 3rd party, but will secretly keep your main storage ' +
"BlueWallet, it will unlock a new 'fake' storage. This will seem " +
'legit to a 3rd party, but it will secretly keep your main storage ' +
'with coins safe.',
help2: 'New storage will be fully functional, and you can store some ' + 'minimum amounts there so it looks more believable.',
create_fake_storage: 'Create fake encrypted storage',
help2: 'The new storage will be fully functional, and you can store some ' + 'minimum amounts there so it looks more believable.',
create_fake_storage: 'Create Encrypted storage',
go_back: 'Go Back',
create_password: 'Create a password',
create_password_explanation: 'Password for fake storage should not match password for your main storage',
create_password_explanation: 'Password for fake storage should not match the password for your main storage',
password_should_not_match: 'Password is currently in use. Please, try a different password.',
retype_password: 'Retype password',
passwords_do_not_match: 'Passwords do not match, try again',

5
screen/plausibledeniability.js
View file

@ -48,11 +48,6 @@ export default class PlausibleDeniability extends Component {
<BlueButton
testID="CreateFakeStorageButton"
icon={{
name: 'shield',
type: 'font-awesome',
color: BlueApp.settings.buttonTextColor,
}}
title={loc.plausibledeniability.create_fake_storage}
onPress={async () => {
let p1 = await prompt(loc.plausibledeniability.create_password, loc.plausibledeniability.create_password_explanation);

2
screen/settings/encryptStorage.js
View file

@ -149,7 +149,7 @@ export default class EncryptStorage extends Component {
<BlueCard>
<BlueText>
{this.state.biometrics.biometricsType} will be used to confirm your identity prior to making a transaction, unlocking,
exporting or deleting wallet. {this.state.biometrics.biometricsType} will not be used to unlock an encrypted storage.
exporting or deleting a wallet. {this.state.biometrics.biometricsType} will not be used to unlock an encrypted storage.
</BlueText>
</BlueCard>
<BlueSpacing20 />