aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-10-27 02:43:52 +0800
committerGitHub <noreply@github.com>2016-10-27 02:43:52 +0800
commit0bad9414338b5343f6afd19a3ac10fba19c3cbf1 (patch)
treeec049a67fb02d34a682d3b03e0a6c5216b55bb4d
parent2dad59b56194a4094130ad8895340c0b084465c7 (diff)
parent0bf139188e4bd820a16203f161d29c9d2c8fb398 (diff)
downloadtangerine-wallet-browser-0bad9414338b5343f6afd19a3ac10fba19c3cbf1.tar
tangerine-wallet-browser-0bad9414338b5343f6afd19a3ac10fba19c3cbf1.tar.gz
tangerine-wallet-browser-0bad9414338b5343f6afd19a3ac10fba19c3cbf1.tar.bz2
tangerine-wallet-browser-0bad9414338b5343f6afd19a3ac10fba19c3cbf1.tar.lz
tangerine-wallet-browser-0bad9414338b5343f6afd19a3ac10fba19c3cbf1.tar.xz
tangerine-wallet-browser-0bad9414338b5343f6afd19a3ac10fba19c3cbf1.tar.zst
tangerine-wallet-browser-0bad9414338b5343f6afd19a3ac10fba19c3cbf1.zip
Merge pull request #768 from MetaMask/i762-RenameWalletToAccount
Rename wallet to account
-rw-r--r--CHANGELOG.md1
-rw-r--r--app/scripts/lib/idStore.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4ea16f11..fa0fb5a63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
## Current Master
- Add a check for improper Transaction data.
+- Now nicknaming new accounts "Account #" instead of "Wallet #" for clarity.
- Fix bug where custom provider selection could show duplicate items.
- Fix bug where connecting to a local morden node would make two providers appear selected.
- Fix bug that was sometimes preventing transactions from being sent.
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 27372b3e9..46d53c4e1 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -426,7 +426,7 @@ IdentityStore.prototype._loadIdentities = function () {
// // add to ethStore
this._ethStore.addAccount(ethUtil.addHexPrefix(address))
// add to identities
- const defaultLabel = 'Wallet ' + (i + 1)
+ const defaultLabel = 'Account ' + (i + 1)
const nickname = configManager.nicknameForWallet(address)
var identity = {
name: nickname || defaultLabel,