Merge remote-tracking branch 'origin/develop' into master-parity

* origin/develop: (56 commits)
  Add advanced setting to enable editing nonce on confirmation screens (MetaMask#7089)
  Add migration on 3box imports and remove feature flag (MetaMask#7209)
  ci - install deps - limit install scripts to whitelist (MetaMask#7208)
  Add a/b test for full screen transaction confirmations (MetaMask#7162)
  Update minimum Firefox verison to 56.0 (MetaMask#7213)
  mesh-testing - submit infura rpc requests to mesh-testing container (MetaMask#7031)
  obs-store/local-store should upgrade webextension error to real error (MetaMask#7207)
  sesify-viz - bump dep for visualization enhancement (MetaMask#7175)
  address book entries by chainId (MetaMask#7205)
  Optimize images only during production build (MetaMask#7194)
  Use common test build during CI (MetaMask#7196)
  Report missing `en` locale messages to Sentry (MetaMask#7197)
  Verify locales on CI (MetaMask#7199)
  updated ganache and addons-linter (MetaMask#7204)
  fixup! add user rejected errors
  add user rejected errors
  update json-rpc-engine
  use eth-json-rpc-errors
  Remove unused locale messages (MetaMask#7190)
  Remove unused components (MetaMask#7191)
  ...

.circleci/config.yml

@@ -14,6 +14,9 @@ workflows:
       - prep-build:
           requires:
             - prep-deps
+      - prep-build-test:
+          requires:
+            - prep-deps
       # - prep-docs:
       #    requires:
       #      - prep-deps
@@ -25,10 +28,10 @@ workflows:
             - prep-deps
       - test-e2e-chrome:
           requires:
-            - prep-deps
+            - prep-build-test
       - test-e2e-firefox:
           requires:
-            - prep-deps
+            - prep-build-test
       - test-unit:
           requires:
             - prep-deps
@@ -92,11 +95,16 @@ jobs:
       - run:
           name: Install deps
           command: |
-           yarn --frozen-lockfile
+            .circleci/scripts/deps-install.sh
+      - run:
+          name: Collect yarn install HAR logs
+          command: |
+            .circleci/scripts/collect-har-artifact.sh
       - persist_to_workspace:
           root: .
           paths:
           - node_modules
+          - build-artifacts
 
   prep-build:
     docker:
@@ -117,6 +125,24 @@ jobs:
             - dist
             - builds
 
+  prep-build-test:
+    docker:
+      - image: circleci/node:10.16-browsers
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: Build extension for testing
+          command: yarn build:test
+      - run:
+          name: Move test build to 'dist-test' to avoid conflict with production build
+          command: mv ./dist ./dist-test
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist-test
+
   prep-docs:
     docker:
       - image: circleci/node:10.16-browsers
@@ -159,8 +185,11 @@ jobs:
       - attach_workspace:
           at: .
       - run:
-          name: Test
+          name: Lint
           command: yarn lint
+      - run:
+          name: Verify locales
+          command: yarn verify-locales --quiet
 
   test-deps:
     docker:
@@ -180,9 +209,12 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test ./dist
       - run:
           name: test:e2e:chrome
-          command: yarn build:test && yarn test:e2e:chrome
+          command: yarn test:e2e:chrome
           no_output_timeout: 20m
       - store_artifacts:
           path: test-artifacts
@@ -198,9 +230,12 @@ jobs:
           command: ./.circleci/scripts/firefox-install
       - attach_workspace:
           at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test ./dist
       - run:
           name: test:e2e:firefox
-          command: yarn build:test && yarn test:e2e:firefox
+          command: yarn test:e2e:firefox
           no_output_timeout: 20m
       - store_artifacts:
           path: test-artifacts
@@ -213,6 +248,9 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - run:
+          name: build:source-map-explorer
+          command: ./development/source-map-explorer.sh
       - store_artifacts:
           path: dist/sourcemaps
           destination: builds/sourcemaps
@@ -222,6 +260,13 @@ jobs:
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
+      # important: generate sesify viz AFTER uploading builds as artifacts
+      - run:
+          name: build:sesify-viz
+          command: ./.circleci/scripts/create-sesify-viz
+      - store_artifacts:
+          path: build-artifacts
+          destination: build-artifacts
       - run:
           name: build:announce
           command: ./development/metamaskbot-build-announce.js

.circleci/scripts/collect-har-artifact.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -x
+
+mkdir -p build-artifacts/yarn-install-har
+mv ./*.har build-artifacts/yarn-install-har/

.circleci/scripts/create-sesify-viz

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+set -u
+set -o pipefail
+
+# prepare artifacts dir
+mkdir -p ./build-artifacts/deps-viz/
+
+# generate viz
+SESIFY_AUTOGEN=1 npx gulp build:extension:js:background
+npx sesify-viz --deps sesify/deps-background.json --config sesify/background.json --dest ./build-artifacts/deps-viz/background

.circleci/scripts/deps-install.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -x
+
+yarn --frozen-lockfile --ignore-scripts --har
+
+# run each in subshell so directory change does not persist
+# scripts can be any of:
+#   preinstall
+#   install
+#   postinstall
+
+# for build
+(cd node_modules/node-sass && yarn run postinstall)
+(cd node_modules/optipng-bin && yarn run postinstall)
+(cd node_modules/gifsicle && yarn run postinstall)
+(cd node_modules/jpegtran-bin && yarn run postinstall)
+
+# for test
+(cd node_modules/scrypt && yarn run install)
+(cd node_modules/weak && yarn run install)
+(cd node_modules/chromedriver && yarn run install)
+(cd node_modules/geckodriver && yarn run postinstall)

.github/CODEOWNERS

@@ -5,4 +5,4 @@ package.json                         @danjm @whymarrh @Gudahtt
 yarn.lock                            @danjm @whymarrh @Gudahtt
 ui/                                  @danjm @whymarrh @Gudahtt
 app/scripts/controllers/transactions @frankiebee
-
+.circleci/scripts/deps-install.sh    @kumavis @Gudahtt

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## Current Develop Branch
+- [#7168](https://github.com/MetaMask/metamask-extension/pull/7168): Add fixes for German translations
 
 ## 7.2.2 Tue Sep 24 2019
 - [#7213](https://github.com/MetaMask/metamask-extension/pull/7213): Update minimum Firefox verison to 56.0