Merge pull request #181 from poanetwork/develop

NW Release 4.8.7

.babelrc

@@ -1,4 +1,4 @@
 {
-  "presets": [["env", { "debug": true }], "react", "stage-0"],
+  "presets": [["env", { "targets": { "browsers": [">0.25%", "not ie 11", "not op_mini all"] } } ], "react", "stage-0"],
   "plugins": ["transform-runtime", "transform-async-to-generator", "transform-class-properties"]
 }

.circleci/config.yml

@@ -5,7 +5,6 @@ workflows:
   full_test:
     jobs:
     - prep-deps-npm
-    - prep-deps-firefox
     - prep-build:
         requires:
         - prep-deps-npm
@@ -28,7 +27,6 @@ workflows:
     - test-e2e-firefox:
         requires:
         - prep-deps-npm
-        - prep-deps-firefox
         - prep-build
     - test-unit:
         requires:
@@ -40,7 +38,6 @@ workflows:
     - test-integration-mascara-firefox:
         requires:
         - prep-deps-npm
-        - prep-deps-firefox
         - prep-scss
     - test-integration-flat-chrome:
         requires:
@@ -49,7 +46,6 @@ workflows:
     - test-integration-flat-firefox:
         requires:
         - prep-deps-npm
-        - prep-deps-firefox
         - prep-scss
     - all-tests-pass:
         requires:
@@ -109,20 +105,6 @@ jobs:
         key: dependency-cache-{{ .Revision }}
         paths:
         - node_modules
-  prep-deps-firefox:
-    docker:
-    - image: circleci/node:8.12.0-browsers
-    steps:
-    - checkout
-    - restore_cache:
-        key: dependency-cache-firefox-{{ .Revision }}
-    - run:
-        name: Download Firefox
-        command: ./.circleci/scripts/firefox-download.sh
-    - save_cache:
-        key: dependency-cache-firefox-{{ .Revision }}
-        paths:
-        - firefox
 
   prep-build:
     docker:
@@ -224,7 +206,7 @@ jobs:
         key: dependency-cache-firefox-{{ .Revision }}
     - run:
         name: Install firefox
-        command: ./.circleci/scripts/firefox-install.sh
+        command: ./.circleci/scripts/firefox-install
     - restore_cache:
         key: dependency-cache-{{ .Revision }}
     - restore_cache:
@@ -261,7 +243,7 @@ jobs:
         key: dependency-cache-firefox-{{ .Revision }}
     - run:
         name: Install firefox
-        command: ./.circleci/scripts/firefox-install.sh
+        command: ./.circleci/scripts/firefox-install
     - restore_cache:
         key: dependency-cache-{{ .Revision }}
     - restore_cache:
@@ -375,7 +357,7 @@ jobs:
         key: dependency-cache-firefox-{{ .Revision }}
     - run:
         name: Install firefox
-        command: ./.circleci/scripts/firefox-install.sh
+        command: ./.circleci/scripts/firefox-install
     - restore_cache:
         key: dependency-cache-{{ .Revision }}
     - run:
@@ -418,7 +400,7 @@ jobs:
         key: dependency-cache-firefox-{{ .Revision }}
     - run:
         name: Install firefox
-        command: ./.circleci/scripts/firefox-install.sh
+        command: ./.circleci/scripts/firefox-install
     - restore_cache:
         key: dependency-cache-{{ .Revision }}
     - run:

.circleci/scripts/firefox-install

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+FIREFOX_VERSION='62.0'
+FIREFOX_BINARY="firefox-${FIREFOX_VERSION}.tar.bz2"
+FIREFOX_BINARY_URL="https://ftp.mozilla.org/pub/firefox/releases/${FIREFOX_VERSION}/linux-x86_64/en-US/${FIREFOX_BINARY}"
+FIREFOX_PATH='/opt/firefox'
+
+printf '%s\n' "Removing old Firefox installation"
+
+sudo rm -r "${FIREFOX_PATH}"
+
+printf '%s\n' "Downloading & installing Firefox ${FIREFOX_VERSION}"
+
+wget --quiet --show-progress -O- "${FIREFOX_BINARY_URL}" | sudo tar xj -C /opt
+
+printf '%s\n' "Firefox ${FIREFOX_VERSION} installed"
+
+{
+  printf '%s\n' 'pref("general.config.filename", "firefox.cfg");'
+  printf '%s\n' 'pref("general.config.obscure_value", 0);'
+} | sudo tee "${FIREFOX_PATH}/defaults/pref/autoconfig.js"
+
+sudo cp .circleci/scripts/firefox.cfg "${FIREFOX_PATH}"
+
+printf '%s\n' "Firefox ${FIREFOX_VERSION} configured"

.circleci/scripts/firefox.cfg

@@ -0,0 +1,13 @@
+// IMPORTANT: Start your code on the 2nd line
+
+lockPref("app.update.enabled", false);
+lockPref("app.update.auto", false);
+lockPref("app.update.mode", 0);
+lockPref("app.update.service.enabled", false);
+
+pref("browser.rights.3.shown", true);
+
+pref("browser.startup.homepage_override.mstone","ignore");
+
+lockPref("plugins.hide_infobar_for_outdated_plugin", true);
+clearPref("plugins.update.url");

.eslintignore

@@ -3,6 +3,7 @@ dist/**
 builds/**
 test-builds/**
 docs/**
+coverage/
 
 development/bundle.js
 development/states.js
@@ -19,5 +20,4 @@ mascara/test/jquery-3.1.0.min.js
 test/integration/bundle.js
 test/integration/jquery-3.1.0.min.js
 test/integration/helpers.js
-test/integration/lib/first-time.js
-test/integration/lib/send-new-ui.js
+test/integration/lib/first-time.js

.gitignore

@@ -9,6 +9,7 @@ package
 # IDEs
 .idea
 .vscode
+.sublime-project
 
 # VIM
 *.swp
@@ -20,6 +21,7 @@ temp
 .DS_Store
 app/.DS_Store
 
+coverage/
 dist
 builds/
 disc/
@@ -34,6 +36,7 @@ test/bundle.js
 test/test-bundle.js
 
 test-artifacts
+test-builds
 
 #ignore css output and sourcemaps
 ui/app/css/output/

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Current Master
 
+## 4.8.7 Tue Nov 06 2018
+
+- [#180](https://github.com/poanetwork/metamask-extension/pull/180), [#172](https://github.com/poanetwork/metamask-extension/pull/172), [#169](https://github.com/poanetwork/metamask-extension/pull/169), [#165](https://github.com/poanetwork/metamask-extension/pull/165), [#160](https://github.com/poanetwork/metamask-extension/pull/160): (Fix) Memory leaks
+- [#177](https://github.com/poanetwork/metamask-extension/pull/177): (Fix) Zero balance display instead of "None"
+- [#175](https://github.com/poanetwork/metamask-extension/pull/175), [#176](https://github.com/poanetwork/metamask-extension/pull/176), [#178](https://github.com/poanetwork/metamask-extension/pull/178): (Feature) Auto-detect tokens for POA
+- [#164](https://github.com/poanetwork/metamask-extension/pull/164): (Fix) Confirm token transfer page display fix
+
 ## 4.8.6 Thu Oct 18 2018
 
 - [#153](https://github.com/poanetwork/metamask-extension/pull/153), [#154](https://github.com/poanetwork/metamask-extension/pull/154), [#158](https://github.com/poanetwork/metamask-extension/pull/158): (Feature) xDai chain support
@@ -62,8 +69,6 @@
 - Remove rejected transactions from transaction history
 - Add Trezor Support
 - Allow to remove accounts (Imported and Hardware Wallets)
-- [#4840](https://github.com/MetaMask/metamask-extension/pull/4840): Now shows notifications when transactions are completed.
-- [#4855](https://github.com/MetaMask/metamask-extension/pull/4855): network.js: convert rpc protocol to lower case.
 
 ## 4.8.0 Thur Jun 14 2018
 

README.md

@@ -27,15 +27,22 @@ 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`.
  - To package .zip files for distribution, run `gulp zip`, or run the full build & zip with `gulp dist`.
 
  Uncompressed builds can be found in `/dist`, compressed builds can be found in `/builds` once they're built.
 
+## Contributing
+
+You can read [our internal docs here](https://metamask.github.io/metamask-extension/).
+
+You can re-generate the docs locally by running `npm run doc`, and contributors can update the hosted docs by running `npm run publish-docs`.
+
 ### Running Tests
 
 Requires `mocha` installed. Run `npm install -g mocha`.

app/_locales/cs/messages.json

@@ -372,7 +372,7 @@
     "message": "Import účtu"
   },
   "importAccountMsg": {
-    "message":"Importované účty nebudou spojeny s vaší původní Nifty Walletovou klíčovou frází. Zjistěte více o importovaných účtech "
+    "message": "Importované účty nebudou spojeny s vaší původní Nifty Walletovou klíčovou frází. Zjistěte více o importovaných účtech "
   },
   "importAnAccount": {
     "message": "Import účtu"
@@ -736,7 +736,7 @@
     "message": "Nastavení"
   },
   "info": {
-  "message": "Informace"
+    "message": "Informace"
   },
   "shapeshiftBuy": {
     "message": "Nakoupit na ShapeShift"
@@ -802,7 +802,7 @@
     "message": "Testovací faucet"
   },
   "to": {
-    "message": "Komu: "
+    "message": "Komu"
   },
   "toETHviaShapeShift": {
     "message": "$1 na ETH přes ShapeShift",

app/_locales/de/messages.json

@@ -68,13 +68,13 @@
     "message": "Muss größer oder gleich $1 und kleiner oder gleich $2 sein.",
     "description": "Helfer für die Eingabe von hex als dezimal"
   },
-    "blockiesIdenticon": {
+  "blockiesIdenticon": {
     "message": "Blockies Identicon verwenden"
   },
   "borrowDharma": {
     "message": "Mit Dharma ausleihen (Beta)"
   },
-    "builtInCalifornia": {
+  "builtInCalifornia": {
     "message": "Nifty Wallet wurde in Kalifornien entwickelt und gebaut."
   },
   "buy": {
@@ -84,15 +84,15 @@
     "message": "Auf Coinbase kaufen"
   },
   "buyCoinbaseExplainer": {
-    "message": "Coinbase ist die weltweit bekannteste Art und Weise um bitcoin, ethereum und litecoin zu kaufen und verkaufen."
+    "message": "Coinbase ist die weltweit bekannteste Art und Weise um Bitcoin, Ethereum und Litecoin zu kaufen und verkaufen."
   },
-    "ok": {
+  "ok": {
     "message": "Ok"
   },
   "cancel": {
     "message": "Abbrechen"
   },
-    "classicInterface": {
+  "classicInterface": {
     "message": "Klassische Oberfläche verwenden"
   },
   "clickCopy": {
@@ -101,7 +101,7 @@
   "confirm": {
     "message": "Bestätigen"
   },
-    "confirmed": {
+  "confirmed": {
     "message": "Bestätigt"
   },
   "confirmContract": {
@@ -369,7 +369,7 @@
     "message": "Account importieren"
   },
   "importAccountMsg": {
-    "message":" Importierte Accounts werden nicht mit der Seed-Wörterfolge  deines ursprünglichen Nifty Wallet Accounts verknüpft. Erfahre mehr über importierte Accounts."
+    "message": " Importierte Accounts werden nicht mit der Seed-Wörterfolge  deines ursprünglichen Nifty Wallet Accounts verknüpft. Erfahre mehr über importierte Accounts."
   },
   "importAnAccount": {
     "message": "Einen Account importieren"
@@ -715,7 +715,7 @@
     "message": "Einstellungen"
   },
   "info": {
-  "message": "Info"
+    "message": "Info"
   },
   "shapeshiftBuy": {
     "message": "Mit Shapeshift kaufen"
@@ -781,7 +781,7 @@
     "message": "Testfaucet"
   },
   "to": {
-    "message": "An:"
+    "message": "An"
   },
   "toETHviaShapeShift": {
     "message": "$1 an ETH via ShapeShift",