diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e1e1ff4b..ea5d90500 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Current Master +- [#4884](https://github.com/MetaMask/metamask-extension/pull/4884): Allow to have tokens per account and network. + +## 4.9.0 Tue Aug 07 2018 + - Add new tokens auto detection - Remove rejected transactions from transaction history - Add Trezor Support diff --git a/README.md b/README.md index 8a1eda46c..38aceaf7e 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,9 @@ If you're a web dapp developer, we've got two types of guides for you: ## Building locally - Install [Node.js](https://nodejs.org/en/) version 8.11.3 and npm version 6.1.0 - - Install dependencies: - - If you are using nvm (recommended) running `nvm use` will automatically choose the right node version for you. + - If you are using [nvm](https://github.com/creationix/nvm#installation) (recommended) running `nvm use` will automatically choose the right node version for you. + - Select npm 6.1.0: ```npm install -g npm@6.1.0``` + - Install dependencies: ```npm install``` - Install gulp globally with `npm install -g gulp-cli`. - Build the project to the `./dist/` folder with `gulp build`. - Optionally, to rebuild on file changes, run `gulp dev`. diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 6f315bb7a..c4c19762d 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -513,6 +513,9 @@ "invalidRPC": { "message": "Invalid RPC URI" }, + "invalidSeedPhrase": { + "message": "Invalid seed phrase" + }, "jsonFail": { "message": "Something went wrong. Please make sure your JSON file is properly formatted." }, diff --git a/app/phishing.html b/app/phishing.html index 86f2985cc..e20c9ac9c 100644 --- a/app/phishing.html +++ b/app/phishing.html @@ -3,26 +3,29 @@
-