diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/app.js | 8 | ||||
| -rw-r--r-- | src/i18n.js | 2 |
2 files changed, 6 insertions, 4 deletions
@@ -1685,9 +1685,11 @@ function lock({ offerPassword = false } = {}) { ui.broadcastTx = null; ui.bump = null; // After the resets above (which clear ui.pw): locking with no password locks - // nothing, so offer one — once, and only when a person chose to lock, never - // when the idle timer did it for them. - if (noPassword && offerPassword && !lockPwAsked()) { + // NOTHING — the wallets reopen by themselves. So a person who taps the + // padlock gets the password prompt every time until one exists; without it + // the tap would just be a confusing trip to the wallet list. (The idle + // timer still never nags.) + if (noPassword && offerPassword) { ui.pw = { purpose: 'lock', mode: 'set', v0: '', v1: '', v2: '', error: '' }; } render(); diff --git a/src/i18n.js b/src/i18n.js index 8c2ad0b..de6a5d8 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -84,7 +84,7 @@ const STR = { pwWrong: 'Wrong password.', pwNeededToLock: 'Enter a password, or choose "Not now".', lockPwTitle: 'Protect this device?', - lockPwDesc: 'Your wallets stay saved here when you lock. Without a password anyone holding this device can open them again — set one and it will be asked for every time.', + lockPwDesc: 'Locking only means something with a password: without one, this device reopens your wallets by itself. Set one now and it will be required every time.', lockPwSkip: 'Not now', unlockSaved: 'Unlock saved wallets', unlockSavedDesc: 'Enter your password to open the wallets saved on this device.', |