diff options
author | kumavis <kumavis@users.noreply.github.com> | 2018-03-07 09:12:32 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-07 09:12:32 +0800 |
commit | 8e0131cbb52eae9d0fd07ac20d1e39bae99446e1 (patch) | |
tree | 5d9391f0948754fda99b1009669e3dd02ae3cb1d | |
parent | 36c5bf203ede58f75468c27ae17a0a7d7adc4628 (diff) | |
parent | cb4ad608003b17098a71e6919a3d22b2ff0a6dbf (diff) | |
download | tangerine-wallet-browser-8e0131cbb52eae9d0fd07ac20d1e39bae99446e1.tar tangerine-wallet-browser-8e0131cbb52eae9d0fd07ac20d1e39bae99446e1.tar.gz tangerine-wallet-browser-8e0131cbb52eae9d0fd07ac20d1e39bae99446e1.tar.bz2 tangerine-wallet-browser-8e0131cbb52eae9d0fd07ac20d1e39bae99446e1.tar.lz tangerine-wallet-browser-8e0131cbb52eae9d0fd07ac20d1e39bae99446e1.tar.xz tangerine-wallet-browser-8e0131cbb52eae9d0fd07ac20d1e39bae99446e1.tar.zst tangerine-wallet-browser-8e0131cbb52eae9d0fd07ac20d1e39bae99446e1.zip |
Merge pull request #3455 from MetaMask/i2475-UnifyLogInWording
Replace Lock wording with Log Out / Log In
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | old-ui/app/unlock.js | 2 | ||||
-rw-r--r-- | ui/app/unlock.js | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ef2f36b6..b6d0df8ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Current Master +- Replace "Unlock" wording with "Log In". - Allow adding custom tokens to classic ui when balance is 0 - Allow editing of symbol and decimal info when adding custom token in new-ui - new-ui shapeshift form can select all coins (not just BTC) diff --git a/old-ui/app/unlock.js b/old-ui/app/unlock.js index a1f791552..7bf4ad29f 100644 --- a/old-ui/app/unlock.js +++ b/old-ui/app/unlock.js @@ -69,7 +69,7 @@ UnlockScreen.prototype.render = function () { style: { margin: 10, }, - }, 'Unlock'), + }, 'Log In'), ]), h('.flex-row.flex-center.flex-grow', [ diff --git a/ui/app/unlock.js b/ui/app/unlock.js index 13c3f1274..cafe3a859 100644 --- a/ui/app/unlock.js +++ b/ui/app/unlock.js @@ -71,7 +71,7 @@ UnlockScreen.prototype.render = function () { style: { margin: 10, }, - }, 'Unlock'), + }, 'Log In'), ]), h('.flex-row.flex-center.flex-grow', [ @@ -104,7 +104,7 @@ UnlockScreen.prototype.render = function () { }, }, 'Use classic interface'), ]), - + ]) ) } |