From 4b905ffe39bf1918ae64e00377b77f3b1a0b7559 Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Tue, 27 Aug 2019 03:37:09 +0000 Subject: [PATCH 01/19] Version v7.1.1 --- CHANGELOG.md | 2 ++ app/manifest.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13790627d41e..c13dc9bd9c31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Develop Branch +## 7.1.1 Tue Aug 27 2019 + ## 7.1.0 Fri Aug 16 2019 - [#7035](https://github.com/MetaMask/metamask-extension/pull/7035): Filter non-ERC-20 assets during mobile sync (#7035) - [#7021](https://github.com/MetaMask/metamask-extension/pull/7021): Using translated string for end of flow messaging (#7021) diff --git a/app/manifest.json b/app/manifest.json index fdcbd0c1b4ce..7deaf280bfb1 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "__MSG_appName__", - "version": "7.1.0", + "version": "7.1.1", "manifest_version": 2, "author": "https://metamask.io", "description": "__MSG_appDescription__", From 76ef33257ecdd2ae564623b1d25d8e534369a63e Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Tue, 27 Aug 2019 00:39:55 -0300 Subject: [PATCH 02/19] Add changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c13dc9bd9c31..a1bde370992a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## Current Develop Branch ## 7.1.1 Tue Aug 27 2019 +- [#7059](https://github.com/MetaMask/metamask-extension/pull/7059): Remove blockscale, replace with ethgasstation +- [#7037](https://github.com/MetaMask/metamask-extension/pull/7037): Remove Babel 6 from internal dependencies ## 7.1.0 Fri Aug 16 2019 - [#7035](https://github.com/MetaMask/metamask-extension/pull/7035): Filter non-ERC-20 assets during mobile sync (#7035) From d2799f40b65e2fb55379488e38050d7fae6f8981 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Tue, 3 Sep 2019 14:27:20 -0300 Subject: [PATCH 03/19] Allow dismissing privacy mode from popup --- CHANGELOG.md | 1 + ui/app/pages/home/home.component.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1bde370992a..f53a2fc1f511 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ## 7.1.1 Tue Aug 27 2019 - [#7059](https://github.com/MetaMask/metamask-extension/pull/7059): Remove blockscale, replace with ethgasstation - [#7037](https://github.com/MetaMask/metamask-extension/pull/7037): Remove Babel 6 from internal dependencies +- [#7093](https://github.com/MetaMask/metamask-extension/pull/7093): Allow dismissing privacy mode notification from popup ## 7.1.0 Fri Aug 16 2019 - [#7035](https://github.com/MetaMask/metamask-extension/pull/7035): Filter non-ERC-20 assets during mobile sync (#7035) diff --git a/ui/app/pages/home/home.component.js b/ui/app/pages/home/home.component.js index ff7428efff6b..0ee9a526ff9e 100644 --- a/ui/app/pages/home/home.component.js +++ b/ui/app/pages/home/home.component.js @@ -99,7 +99,11 @@ export default class Home extends PureComponent { descriptionText={t('privacyModeDefault')} acceptText={t('learnMore')} onAccept={() => { + unsetMigratedPrivacyMode() window.open('https://medium.com/metamask/42549d4870fa', '_blank', 'noopener') + }} + ignoreText={t('dismiss')} + onIgnore={() => { unsetMigratedPrivacyMode() }} key="home-privacyModeDefault" From f9a10c20918d28f204b6837d4ae5de6a810dd015 Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Tue, 10 Sep 2019 00:35:54 -0230 Subject: [PATCH 04/19] Update changelog with 7.2.0 changes --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f53a2fc1f511..51a0d12f659e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## Current Develop Branch +## 7.2.0 Mon Sep 8, 2019 +- [#7137](https://github.com/MetaMask/metamask-extension/pull/7137): Fix validation of empty block explorer url's in custom network form +- [#7128](https://github.com/MetaMask/metamask-extension/pull/7128): Support for eth_signTypedData_v4 +- [#7110](https://github.com/MetaMask/metamask-extension/pull/7110): Adds `chaindIdChanged` event to the ethereum provider +- [#7091](https://github.com/MetaMask/metamask-extension/pull/7091): Improve browser performance issues caused by missing locale errors +- [#7085](https://github.com/MetaMask/metamask-extension/pull/7085): Prevent ineffectual speed ups of pending transactions that don't have the lowest nonce + ## 7.1.1 Tue Aug 27 2019 - [#7059](https://github.com/MetaMask/metamask-extension/pull/7059): Remove blockscale, replace with ethgasstation - [#7037](https://github.com/MetaMask/metamask-extension/pull/7037): Remove Babel 6 from internal dependencies From c1994ccf36676907d5b38434440e50fde94095e2 Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Tue, 10 Sep 2019 03:07:14 +0000 Subject: [PATCH 05/19] Version v7.2.0 --- app/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/manifest.json b/app/manifest.json index 7deaf280bfb1..f27212f03107 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "__MSG_appName__", - "version": "7.1.1", + "version": "7.2.0", "manifest_version": 2, "author": "https://metamask.io", "description": "__MSG_appDescription__", From d10d345e5c0404bffd5979353ffef291cb975a3e Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 10 Sep 2019 16:48:09 +0800 Subject: [PATCH 06/19] build - replace gulp-uglify-es with gulp-terser-js --- gulpfile.js | 4 ++-- package.json | 2 +- yarn.lock | 65 +++++++++++++++++++++++++++++++++------------------- 3 files changed, 45 insertions(+), 26 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index e18622bdec3d..d8c889ed8fb9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -17,7 +17,7 @@ const sass = require('gulp-sass') const autoprefixer = require('gulp-autoprefixer') const gulpStylelint = require('gulp-stylelint') const stylefmt = require('gulp-stylefmt') -const uglify = require('gulp-uglify-es').default +const terser = require('gulp-terser-js') const pify = require('pify') const rtlcss = require('gulp-rtlcss') const rename = require('gulp-rename') @@ -585,7 +585,7 @@ function bundleTask (opts) { // Minification if (opts.minifyBuild) { buildStream = buildStream - .pipe(uglify({ + .pipe(terser({ mangle: { reserved: [ 'MetamaskInpageProvider' ], }, diff --git a/package.json b/package.json index 8b7f1edc3a35..1d7d4e16ce73 100644 --- a/package.json +++ b/package.json @@ -105,6 +105,7 @@ "fast-json-patch": "^2.0.4", "fuse.js": "^3.2.0", "gaba": "^1.6.0", + "gulp-terser-js": "^5.0.0", "human-standard-token-abi": "^2.0.0", "jazzicon": "^1.2.0", "json-rpc-engine": "^5.1.3", @@ -225,7 +226,6 @@ "gulp-sourcemaps": "^2.6.0", "gulp-stylefmt": "^1.1.0", "gulp-stylelint": "^7.0.0", - "gulp-uglify-es": "^1.0.4", "gulp-util": "^3.0.7", "gulp-watch": "^5.0.1", "gulp-zip": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index cb82748422e0..ffb6954c145c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5799,7 +5799,7 @@ commander@2.9.0: dependencies: graceful-readlink ">= 1.0.0" -commander@^2.16.0, commander@^2.19.0: +commander@^2.16.0, commander@^2.19.0, commander@^2.20.0: version "2.20.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== @@ -11145,15 +11145,15 @@ gulp-stylelint@^7.0.0: strip-ansi "^4.0.0" through2 "^2.0.3" -gulp-uglify-es@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/gulp-uglify-es/-/gulp-uglify-es-1.0.4.tgz#59ee0d5ea98c1e09c6eaa58c8b018a6ad33f48d4" - integrity sha512-UMRufZsBmQizCYpftutaiVoLswpbzFEfY90EJLU4YlTgculeHnanb794s88TMd5tpCZVC638sAX6JrLVYTP/Wg== +gulp-terser-js@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/gulp-terser-js/-/gulp-terser-js-5.0.0.tgz#b570bb14e9c836aab78d633411073af0df8ca514" + integrity sha512-X5bduLqvRdX1RwUJmdm1J+HZu85gfIKkmDK95J6AAfXd4W/oYANt82gmIMZfhUGEmLm6e6xtKGsfTW6c0BRWnQ== dependencies: - o-stream "^0.2.2" + object-assign "^4.1.1" plugin-error "^1.0.1" - terser "^3.7.5" - vinyl "^2.1.0" + terser "^4.1.4" + through2 "^3.0.1" vinyl-sourcemaps-apply "^0.2.1" gulp-util@^3.0.7, gulp-util@^3.0.8, gulp-util@~3.0.0: @@ -15585,11 +15585,6 @@ nyc@^13.0.0: yargs "11.1.0" yargs-parser "^9.0.2" -o-stream@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/o-stream/-/o-stream-0.2.2.tgz#7fe03af870b8f9537af33b312b381b3034ab410f" - integrity sha512-V3j76KU3g/Gyl8rpdi2z72rn5zguMvTCQgAXfBe3pxEefKqXmOUOD7mvx/mNjykdxGqDVfpSoo8r+WdrkWg/1Q== - oauth-sign@~0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" @@ -18044,6 +18039,15 @@ readable-stream@1.1, readable-stream@1.1.x, "readable-stream@>=1.1.13-1 <1.2.0-0 isarray "0.0.1" string_decoder "~0.10.x" +"readable-stream@2 || 3": + version "3.4.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc" + integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.15, readable-stream@~1.0.17: version "1.0.34" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" @@ -20059,6 +20063,14 @@ source-map-support@^0.4.15: dependencies: source-map "^0.5.6" +source-map-support@~0.5.12: + version "0.5.13" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" @@ -21176,15 +21188,6 @@ terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.4: webpack-sources "^1.3.0" worker-farm "^1.7.0" -terser@^3.7.5: - version "3.17.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2" - integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ== - dependencies: - commander "^2.19.0" - source-map "~0.6.1" - source-map-support "~0.5.10" - terser@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz#ef356f6f359a963e2cc675517f21c1c382877374" @@ -21194,6 +21197,15 @@ terser@^4.0.0: source-map "~0.6.1" source-map-support "~0.5.10" +terser@^4.1.4: + version "4.3.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.1.tgz#09820bcb3398299c4b48d9a86aefc65127d0ed65" + integrity sha512-pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg== + dependencies: + commander "^2.20.0" + source-map "~0.6.1" + source-map-support "~0.5.12" + test-exclude@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.2.tgz#8b67aa8408f84afc225b06669e25c510f8582820" @@ -21339,6 +21351,13 @@ through2@^2.0.5: readable-stream "~2.3.6" xtend "~4.0.1" +through2@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a" + integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww== + dependencies: + readable-stream "2 || 3" + through2@~0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/through2/-/through2-0.2.3.tgz#eb3284da4ea311b6cc8ace3653748a52abf25a3f" @@ -22091,7 +22110,7 @@ utf8@^3.0.0: resolved "https://registry.yarnpkg.com/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1" integrity sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ== -util-deprecate@^1.0.2, util-deprecate@~1.0.1: +util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= From 8524d17d2d803842be18fccb32f402345739bd3b Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Tue, 10 Sep 2019 09:44:24 -0300 Subject: [PATCH 07/19] Update the changelog for v7.1.1 (#7145) Due to a mistake in the release scripts, there were a few changes accidentally included in the v7.1.1 release. This updates the changelog to include those changes. --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51a0d12f659e..bb944a968eb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,13 @@ - [#7059](https://github.com/MetaMask/metamask-extension/pull/7059): Remove blockscale, replace with ethgasstation - [#7037](https://github.com/MetaMask/metamask-extension/pull/7037): Remove Babel 6 from internal dependencies - [#7093](https://github.com/MetaMask/metamask-extension/pull/7093): Allow dismissing privacy mode notification from popup +- [#7087](https://github.com/MetaMask/metamask-extension/pull/7087): Add breadcrumb spacing on Contacts page +- [#7081](https://github.com/MetaMask/metamask-extension/pull/7081): Fix confirm token transaction amount display +- [#7088](https://github.com/MetaMask/metamask-extension/pull/7088): Fix BigNumber conversion error +- [#7072](https://github.com/MetaMask/metamask-extension/pull/7072): Right-to-left CSS (using module for conversion) +- [#6878](https://github.com/MetaMask/metamask-extension/pull/6878): Persian translation +- [#7012](https://github.com/MetaMask/metamask-extension/pull/7012): Added missed phrases to RU locale +- [#7099](https://github.com/MetaMask/metamask-extension/pull/7099): Update localization from Transifex Brave ## 7.1.0 Fri Aug 16 2019 - [#7035](https://github.com/MetaMask/metamask-extension/pull/7035): Filter non-ERC-20 assets during mobile sync (#7035) From 41305b6616343efb2b211252f74ae057472d7dbe Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Wed, 11 Sep 2019 11:44:36 -0300 Subject: [PATCH 08/19] Publish GitHub release from master branch (#7136) * Publish GitHub release from master branch This ensures that changes made on `develop` since branching for the release are not included. It also ensures that the final release sourcemaps line-up correctly (they were always build on master)`. * Consolidate publish jobs The jobs `job-publish-release` and `create_github_release` both handle different parts of publishing a release. They have been consolidated into a single `job-publish-release` job. * Update release script to expect a merge commit The release script was originally written to be run on `develop`, so it expected the current commit to be a result of `Squash & Merge`. Now that it's run on `master`, it will generally be run against a merge commit. The version is now extracted from the commit message using a regular expression that should work on all version of Bash v3+, and should be tolerant of both merge commits and `Squash & Merge` commits. * Target `master` with release PR `master` is now targeted by the release PR instead of `develop`, as the release has to be created from the master branch. The update to `develop` is handled after the release by a PR from `master` to `develop`, which is created automatically after the release. --- .circleci/config.yml | 26 +++------- .circleci/scripts/release-create-gh-release | 10 ++-- .circleci/scripts/release-create-master-pr | 53 +++++++++++++++++++++ .circleci/scripts/release-create-release-pr | 2 +- 4 files changed, 66 insertions(+), 25 deletions(-) create mode 100755 .circleci/scripts/release-create-master-pr diff --git a/.circleci/config.yml b/.circleci/config.yml index b5eb6fe85221..7373aa3a258e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,13 +14,6 @@ workflows: - prep-build: requires: - prep-deps - - create_github_release: - requires: - - prep-build - filters: - branches: - only: - - develop # - prep-docs: # requires: # - prep-deps @@ -243,6 +236,13 @@ jobs: - run: name: sentry sourcemaps upload command: yarn sentry:publish + - run: + name: Create GitHub release + command: | + .circleci/scripts/release-create-gh-release + - run: + name: Create GitHub Pull Request to sync master with develop + command: .circleci/scripts/release-create-master-pr # - run: # name: github gh-pages docs publish # command: > @@ -321,15 +321,3 @@ jobs: - run: name: Coveralls upload command: yarn test:coveralls-upload - - create_github_release: - docker: - - image: circleci/node:8.15.1-browsers - steps: - - checkout - - attach_workspace: - at: . - - run: - name: Create GitHub release - command: | - .circleci/scripts/release-create-gh-release diff --git a/.circleci/scripts/release-create-gh-release b/.circleci/scripts/release-create-gh-release index f40df49983fd..93303f576ebe 100755 --- a/.circleci/scripts/release-create-gh-release +++ b/.circleci/scripts/release-create-gh-release @@ -28,24 +28,24 @@ function install_github_cli () current_commit_msg=$(git show -s --format='%s' HEAD) -if grep --quiet '^Version v' <<< "$current_commit_msg" +if [[ $current_commit_msg =~ Version[-[:space:]](v[[:digit:]]+.[[:digit:]]+.[[:digit:]]+) ]] then + tag="${BASH_REMATCH[1]}" + install_github_cli printf '%s\n' 'Creating GitHub Release' - read -ra commit_words <<< "$current_commit_msg" - tag="${commit_words[1]}" release_body="$(awk -v version="${tag##v}" -f .circleci/scripts/show-changelog.awk CHANGELOG.md)" pushd builds hub release create \ --attach metamask-chrome-*.zip \ --attach metamask-firefox-*.zip \ - --message "${commit_words[0]} ${commit_words[1]#v}" \ + --message "Version ${tag##v}" \ --message "$release_body" \ --commitish "$CIRCLE_SHA1" \ "$tag" popd else - printf '%s\n' 'Skipping GitHub Release' + printf '%s\n' 'Version not found in commit message; skipping GitHub Release' exit 0 fi diff --git a/.circleci/scripts/release-create-master-pr b/.circleci/scripts/release-create-master-pr new file mode 100755 index 000000000000..74eeed86c84b --- /dev/null +++ b/.circleci/scripts/release-create-master-pr @@ -0,0 +1,53 @@ +#!/usr/bin/env bash + +set -e +set -u +set -o pipefail + +if [[ "${CI:-}" != 'true' ]] +then + printf '%s\n' 'CI environment variable must be set to true' + exit 1 +fi + +if [[ "${CIRCLECI:-}" != 'true' ]] +then + printf '%s\n' 'CIRCLECI environment variable must be set to true' + exit 1 +fi + +if [[ -z "${GITHUB_TOKEN:-}" ]] +then + printf '%s\n' 'GITHUB_TOKEN environment variable must be set' + exit 1 +fi + +function install_github_cli () +{ + printf '%s\n' 'Installing hub CLI' + pushd "$(mktemp -d)" + curl -sSL 'https://github.com/github/hub/releases/download/v2.11.2/hub-linux-amd64-2.11.2.tgz' | tar xz + PATH="$PATH:$PWD/hub-linux-amd64-2.11.2/bin" + popd +} + +base_branch='develop' + +if [[ -n "${CI_PULL_REQUEST:-}" ]] +then + printf '%s\n' 'CI_PULL_REQUEST is set, pull request already exists for this build' + exit 0 +fi + +install_github_cli + +printf '%s\n' "Creating a Pull Request to sync 'master' with 'develop'" + +if ! hub pull-request \ + --reviewer '@MetaMask/extension-release-team' \ + --message "Master => develop" --message 'Merge latest release back into develop' \ + --base "$CIRCLE_PROJECT_USERNAME:$base_branch" \ + --head "$CIRCLE_PROJECT_USERNAME:$CIRCLE_BRANCH"; +then + printf '%s\n' 'Pull Request already exists' +fi diff --git a/.circleci/scripts/release-create-release-pr b/.circleci/scripts/release-create-release-pr index 8a2238ec4467..76f30ece4c19 100755 --- a/.circleci/scripts/release-create-release-pr +++ b/.circleci/scripts/release-create-release-pr @@ -32,7 +32,7 @@ function install_github_cli () } version="${CIRCLE_BRANCH/Version-v/}" -base_branch='develop' +base_branch='master' if [[ -n "${CI_PULL_REQUEST:-}" ]] then From da4119339ba95ad68d4f016b1442df675d13a6eb Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Thu, 12 Sep 2019 16:55:20 -0300 Subject: [PATCH 09/19] Set minimum Firefox version to v56.2 to support Waterfox (#7156) The minimum compatible version of Firefox has been lowered from `60.0` to `56.2`. It was originally set to `60.0` because that is Firefox ESR, which currently the minimum Firefox version with security updates. However Waterfox is based upon Firefox `56.0`, and has backported security fixes from the ESR release. This change in minimum version requires no additional transpiling, and doesn't affect any browser APIs we use. It does introduce one additional warning in the `addon-linter` about Firefox for Android `56` lacking support for browser action popups. However there is no version `56.2` of Firefox for Android, so the minimum version remains `57` in practice (which does support browser action popups). --- app/manifest.json | 2 +- babel.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/manifest.json b/app/manifest.json index f27212f03107..12727302918e 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -22,7 +22,7 @@ "applications": { "gecko": { "id": "webextension@metamask.io", - "strict_min_version": "60.0" + "strict_min_version": "56.2" } }, "default_locale": "en", diff --git a/babel.config.js b/babel.config.js index 173ebc41af26..24ed8bd4f353 100644 --- a/babel.config.js +++ b/babel.config.js @@ -8,7 +8,7 @@ module.exports = function (api) { targets: { browsers: [ 'chrome >= 58', - 'firefox >= 60', + 'firefox >= 56.2', ], }, }, From c80deaa1b8ab0c5e4ea7e2a8c2aad827c5efb7d9 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Thu, 12 Sep 2019 17:07:27 -0300 Subject: [PATCH 10/19] Add polyfill for AbortController (#7157) The AbortController is used in both the background and the UI. Support for AbortController was added to Chrome in version 66, which is above our minimum supported version. I did consider increasing the minimum Chrome version to 66, but we have a decent number of users still on Chrome 65 unfortunately. --- app/scripts/background.js | 3 +++ app/scripts/ui.js | 3 +++ package.json | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index db2d9e8bb230..37ccba44e9cf 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -5,6 +5,9 @@ // this needs to run before anything else require('./lib/setupFetchDebugging')() +// polyfills +import 'abortcontroller-polyfill/dist/polyfill-patch-fetch' + const urlUtil = require('url') const endOfStream = require('end-of-stream') const pump = require('pump') diff --git a/app/scripts/ui.js b/app/scripts/ui.js index a99da37a0b13..0fe92d47c93c 100644 --- a/app/scripts/ui.js +++ b/app/scripts/ui.js @@ -1,3 +1,6 @@ +// polyfills +import 'abortcontroller-polyfill/dist/polyfill-patch-fetch' + const PortStream = require('extension-port-stream') const { getEnvironmentType } = require('./lib/util') const { ENVIRONMENT_TYPE_NOTIFICATION, ENVIRONMENT_TYPE_FULLSCREEN, ENVIRONMENT_TYPE_POPUP } = require('./lib/enums') diff --git a/package.json b/package.json index 1d7d4e16ce73..01f38e241ee3 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "@sentry/browser": "^4.1.1", "@zxing/library": "^0.8.0", "abi-decoder": "^1.2.0", + "abortcontroller-polyfill": "^1.3.0", "asmcrypto.js": "^2.3.2", "await-semaphore": "^0.1.1", "bignumber.js": "^4.1.0", @@ -181,7 +182,6 @@ "@storybook/addon-info": "^5.1.1", "@storybook/addon-knobs": "^3.4.2", "@storybook/react": "^5.1.1", - "abortcontroller-polyfill": "^1.3.0", "addons-linter": "^1.10.0", "babel-eslint": "^10.0.2", "babelify": "^10.0.0", From 94318d8b28636b9652898559363a021497a73adc Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Fri, 13 Sep 2019 11:32:55 -0300 Subject: [PATCH 11/19] Replace `undefined` selectedAddress with `null` (#7161) * Replace `undefined` selectedAddress with `null` The `runtime.Port.postMessage` API will drop keys with a value of `undefined` on Chrome, but not on Firefox. This was a problem for the `publicConfig` stream, which passed the key `selectedAddress` with the value of `undefined` to communicate to dapps that the user had logged out. Instead a `null` is now passed for `selectedAddress` upon logout, which is correctly sent by the `runtime.Port.postMessage` API on both Chrome and Firefox. closes #7101 closes #7109 * Update `metamask-inpage-provider` to v3.0.0 The v3.0.0 update includes a change to the `accountsChanged` event. The event will now emit an empty array instead of an array with `undefined` or `null`. The previous behavior was to emit `[undefined]`. The previous commit would have changed that to `[null]` anyway, so we figured if we're going to make a public-facing change to the event anyway we should change it to be correct. `[undefined]` was never intended, and it technically violates EIP-1193, which states that the `accountsChanged` event should emit an array of strings. --- app/scripts/metamask-controller.js | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 37c3340f4894..02f76cd9da27 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -367,7 +367,7 @@ module.exports = class MetamaskController extends EventEmitter { const result = { isUnlocked, isEnabled, - selectedAddress: isReady ? selectedAddress : undefined, + selectedAddress: isReady ? selectedAddress : null, networkVersion: network, onboardingcomplete: completedOnboarding, chainId: selectChainId({ network, provider }), diff --git a/package.json b/package.json index 01f38e241ee3..5e46a7a4d806 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "lodash.shuffle": "^4.2.0", "loglevel": "^1.4.1", "luxon": "^1.8.2", - "metamask-inpage-provider": "^2.1.0", + "metamask-inpage-provider": "^3.0.0", "metamask-logo": "^2.1.4", "mkdirp": "^0.5.1", "multihashes": "^0.4.12", diff --git a/yarn.lock b/yarn.lock index ffb6954c145c..9ec18d62da89 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14593,10 +14593,10 @@ mersenne-twister@^1.0.1: resolved "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz#f916618ee43d7179efcf641bec4531eb9670978a" integrity sha1-+RZhjuQ9cXnvz2Qb7EUx65Zwl4o= -metamask-inpage-provider@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/metamask-inpage-provider/-/metamask-inpage-provider-2.1.0.tgz#69e23d63893a5e2bb7a09a6ec96c6f1500588673" - integrity sha512-1+m8Mp8/RM9JMTvDHAMt6a7aqwigRMLvU/VKKmHQFi7AZaagG8Fe4wBe8HdAMysRF3NHV/qOMw0UwP3w9m1Vaw== +metamask-inpage-provider@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/metamask-inpage-provider/-/metamask-inpage-provider-3.0.0.tgz#3b9d4bae6f67962b6a7b1a9ee1efaf424f67b6f4" + integrity sha512-44bBCbQwcFF/XGaXSweCWHJaslKhJEFgvcHdxZf9Fm1QfK7VN4U3iAI0BVOLAIkRg0xV3w7xYGLpx2cM1BU7Qw== dependencies: json-rpc-engine "^5.1.3" json-rpc-middleware-stream "^2.1.1" From 009bf802f76fcbfc5a01aeda6273157884a1b59d Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Mon, 16 Sep 2019 17:05:21 -0230 Subject: [PATCH 12/19] Fix recipient field of approve screen (#7171) --- test/e2e/contract-test/contract.js | 4 ++-- test/e2e/metamask-ui.spec.js | 14 +++++++++++++- ui/app/helpers/utils/token-util.js | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/test/e2e/contract-test/contract.js b/test/e2e/contract-test/contract.js index 38db041c8ccf..971523de22a8 100644 --- a/test/e2e/contract-test/contract.js +++ b/test/e2e/contract-test/contract.js @@ -129,10 +129,10 @@ web3.currentProvider.enable().then(() => { }) approveTokens.addEventListener('click', function () { - contract.approve('0x2f318C334780961FB129D2a6c30D0763d9a5C970', '70000', { + contract.approve('0x9bc5baF874d2DA8D216aE9f137804184EE5AfEF4', '70000', { from: web3.eth.accounts[0], to: contract.address, - data: '0x095ea7b30000000000000000000000002f318C334780961FB129D2a6c30D0763d9a5C9700000000000000000000000000000000000000000000000000000000000000005', + data: '0x095ea7b30000000000000000000000009bc5baF874d2DA8D216aE9f137804184EE5AfEF40000000000000000000000000000000000000000000000000000000000000005', gas: 60000, gasPrice: '20000000000', }, function (result) { diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js index 90f3209040ba..fadabe7c8943 100644 --- a/test/e2e/metamask-ui.spec.js +++ b/test/e2e/metamask-ui.spec.js @@ -1276,7 +1276,7 @@ describe('MetaMask', function () { const confirmDataDiv = await findElement(driver, By.css('.confirm-page-container-content__data-box')) const confirmDataText = await confirmDataDiv.getText() - assert(confirmDataText.match(/0x095ea7b30000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c97/)) + assert(confirmDataText.match(/0x095ea7b30000000000000000000000009bc5baf874d2da8d216ae9f137804184ee5afef4/)) const detailsTab = await findElement(driver, By.xpath(`//li[contains(text(), 'Details')]`)) detailsTab.click() @@ -1336,6 +1336,12 @@ describe('MetaMask', function () { assert.equal(await gasFeeInputs[0].getText(), '0.0006') }) + it('shows the correct recipient', async function () { + const senderToRecipientDivs = await findElements(driver, By.css('.sender-to-recipient__name')) + const recipientDiv = senderToRecipientDivs[1] + assert.equal(await recipientDiv.getText(), '0x9bc5...fEF4') + }) + it('submits the transaction', async function () { const confirmButton = await findElement(driver, By.xpath(`//button[contains(text(), 'Confirm')]`)) await confirmButton.click() @@ -1450,6 +1456,12 @@ describe('MetaMask', function () { await delay(regularDelayMs) }) + it('shows the correct recipient', async function () { + const senderToRecipientDivs = await findElements(driver, By.css('.sender-to-recipient__name')) + const recipientDiv = senderToRecipientDivs[1] + assert.equal(await recipientDiv.getText(), 'Account 2') + }) + it('submits the transaction', async function () { await delay(regularDelayMs) const confirmButton = await findElement(driver, By.xpath(`//button[contains(text(), 'Confirm')]`)) diff --git a/ui/app/helpers/utils/token-util.js b/ui/app/helpers/utils/token-util.js index 3920045acde3..831d851316aa 100644 --- a/ui/app/helpers/utils/token-util.js +++ b/ui/app/helpers/utils/token-util.js @@ -135,5 +135,5 @@ export function getTokenValue (tokenParams = []) { export function getTokenToAddress (tokenParams = []) { const toAddressData = tokenParams.find(param => param.name === '_to') - return toAddressData && toAddressData.value + return toAddressData ? toAddressData.value : tokenParams[0].value } From eb478078a79469e4bb6075e4d41888a967e6be90 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Fri, 13 Sep 2019 11:54:53 -0300 Subject: [PATCH 13/19] Update changelog with additional bug fixes --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb944a968eb2..2012ad7bc913 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ - [#7110](https://github.com/MetaMask/metamask-extension/pull/7110): Adds `chaindIdChanged` event to the ethereum provider - [#7091](https://github.com/MetaMask/metamask-extension/pull/7091): Improve browser performance issues caused by missing locale errors - [#7085](https://github.com/MetaMask/metamask-extension/pull/7085): Prevent ineffectual speed ups of pending transactions that don't have the lowest nonce +- [#7156](https://github.com/MetaMask/metamask-extension/pull/7156): Set minimum Firefox version to v56.2 to support Waterfox +- [#7157](https://github.com/MetaMask/metamask-extension/pull/7157): Add polyfill for AbortController +- [#7161](https://github.com/MetaMask/metamask-extension/pull/7161): Replace `undefined` selectedAddress with `null` +- [#7171](https://github.com/MetaMask/metamask-extension/pull/7171): Fix recipient field of approve screen ## 7.1.1 Tue Aug 27 2019 - [#7059](https://github.com/MetaMask/metamask-extension/pull/7059): Remove blockscale, replace with ethgasstation From 9ca0c6fcddec37ca47b6956700b05b3526315f1a Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Tue, 17 Sep 2019 19:53:30 +0000 Subject: [PATCH 14/19] Version v7.2.1 --- CHANGELOG.md | 2 ++ app/manifest.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2012ad7bc913..75522c649c74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Develop Branch +## 7.2.1 Tue Sep 17 2019 + ## 7.2.0 Mon Sep 8, 2019 - [#7137](https://github.com/MetaMask/metamask-extension/pull/7137): Fix validation of empty block explorer url's in custom network form - [#7128](https://github.com/MetaMask/metamask-extension/pull/7128): Support for eth_signTypedData_v4 diff --git a/app/manifest.json b/app/manifest.json index 12727302918e..6baedd0b9f4e 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "__MSG_appName__", - "version": "7.2.0", + "version": "7.2.1", "manifest_version": 2, "author": "https://metamask.io", "description": "__MSG_appDescription__", From 30e0a85f1def69477d992757b52ba192dd19dd02 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Tue, 17 Sep 2019 17:14:47 -0300 Subject: [PATCH 15/19] Add `appName` message to each locale The Chrome Web store was rejecting the build because `appName` was missing from some locales. --- app/_locales/am/messages.json | 4 ++++ app/_locales/ar/messages.json | 4 ++++ app/_locales/bg/messages.json | 4 ++++ app/_locales/bn/messages.json | 4 ++++ app/_locales/ca/messages.json | 4 ++++ app/_locales/cs/messages.json | 4 ++++ app/_locales/da/messages.json | 4 ++++ app/_locales/de/messages.json | 4 ++++ app/_locales/el/messages.json | 4 ++++ app/_locales/es/messages.json | 4 ++++ app/_locales/es_419/messages.json | 4 ++++ app/_locales/et/messages.json | 4 ++++ app/_locales/fa/messages.json | 4 ++++ app/_locales/fi/messages.json | 4 ++++ app/_locales/fil/messages.json | 4 ++++ app/_locales/fr/messages.json | 4 ++++ app/_locales/gu/messages.json | 4 ++++ app/_locales/he/messages.json | 4 ++++ app/_locales/hi/messages.json | 4 ++++ app/_locales/hr/messages.json | 4 ++++ app/_locales/ht/messages.json | 4 ++++ app/_locales/hu/messages.json | 4 ++++ app/_locales/id/messages.json | 4 ++++ app/_locales/it/messages.json | 4 ++++ app/_locales/ja/messages.json | 4 ++++ app/_locales/kn/messages.json | 4 ++++ app/_locales/lv/messages.json | 4 ++++ app/_locales/ml/messages.json | 4 ++++ app/_locales/mr/messages.json | 4 ++++ app/_locales/ms/messages.json | 4 ++++ app/_locales/nl/messages.json | 4 ++++ app/_locales/no/messages.json | 4 ++++ app/_locales/ph/messages.json | 4 ++++ app/_locales/pl/messages.json | 4 ++++ app/_locales/pt/messages.json | 4 ++++ app/_locales/pt_BR/messages.json | 4 ++++ app/_locales/pt_PT/messages.json | 4 ++++ app/_locales/ro/messages.json | 4 ++++ app/_locales/ru/messages.json | 4 ++++ app/_locales/sk/messages.json | 4 ++++ app/_locales/sl/messages.json | 4 ++++ app/_locales/sr/messages.json | 4 ++++ app/_locales/sv/messages.json | 4 ++++ app/_locales/sw/messages.json | 4 ++++ app/_locales/te/messages.json | 4 ++++ app/_locales/th/messages.json | 4 ++++ app/_locales/tr/messages.json | 4 ++++ app/_locales/uk/messages.json | 4 ++++ app/_locales/vi/messages.json | 4 ++++ app/_locales/zh_CN/messages.json | 4 ++++ app/_locales/zh_TW/messages.json | 4 ++++ 51 files changed, 204 insertions(+) diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json index c81088f623c2..e0867243c030 100644 --- a/app/_locales/am/messages.json +++ b/app/_locales/am/messages.json @@ -144,6 +144,10 @@ "message": "በማሰሺያዎ ውስጥ የ Ethereum ቋት", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "ፍቀድ" }, diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json index b3b126aa0e70..69c3bb9e26b2 100644 --- a/app/_locales/ar/messages.json +++ b/app/_locales/ar/messages.json @@ -144,6 +144,10 @@ "message": "محفظة إيثيريوم في متصفحك", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "موافق" }, diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json index ab35d138884e..44c17f366716 100644 --- a/app/_locales/bg/messages.json +++ b/app/_locales/bg/messages.json @@ -144,6 +144,10 @@ "message": "\nПортфейл за етереум в браузъра Ви", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Одобри" }, diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json index 02942ad8fb20..a1480dea6d0e 100644 --- a/app/_locales/bn/messages.json +++ b/app/_locales/bn/messages.json @@ -144,6 +144,10 @@ "message": "আপনার ব্রাউজারে একটি Ethereum ওয়ালেট", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "অনুমোদন করুন" }, diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json index 300a41d33816..6e5b4e0bf418 100644 --- a/app/_locales/ca/messages.json +++ b/app/_locales/ca/messages.json @@ -144,6 +144,10 @@ "message": "Un Moneder Ethereum al teu Navegador", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Aprovar" }, diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json index e02768cf8a4b..936d898908af 100644 --- a/app/_locales/cs/messages.json +++ b/app/_locales/cs/messages.json @@ -57,6 +57,10 @@ "message": "Ethereum rozšíření prohlížeče", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Schválit" }, diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json index 24e42e4fbd09..c34ba78edaf7 100644 --- a/app/_locales/da/messages.json +++ b/app/_locales/da/messages.json @@ -144,6 +144,10 @@ "message": "En Ethereum-pung i din browser", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Godkend" }, diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index b44b23c71936..b3d38c1d1e1a 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -141,6 +141,10 @@ "message": "Ethereum Browsererweiterung", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Genehmigen" }, diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 410ef7f226b5..9a66f7cff767 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -144,6 +144,10 @@ "message": "Ένα Πορτοφόλι Ethereum στο Πρόγραμμα Περιήγησής σας", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Έγκριση" }, diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 4b8dfaf47627..7f81ad13f345 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -141,6 +141,10 @@ "message": "Extensión del navegador para Ethereum", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Aprobar" }, diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json index 3a69d6903804..3496418d378b 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -144,6 +144,10 @@ "message": "Una billetera de Ethereum en tu navegador", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Aprobar" }, diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json index ab41be0265e3..88e892dca394 100644 --- a/app/_locales/et/messages.json +++ b/app/_locales/et/messages.json @@ -144,6 +144,10 @@ "message": "Ethereumi rahakott teie lehitsejas", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Kinnita" }, diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json index d4ef3a6e884f..8e9cadf74b91 100644 --- a/app/_locales/fa/messages.json +++ b/app/_locales/fa/messages.json @@ -144,6 +144,10 @@ "message": "یک کیف ایتریوم در براوزر شما", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "تصدیق" }, diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json index 2156a46de4b9..3dbf3793d271 100644 --- a/app/_locales/fi/messages.json +++ b/app/_locales/fi/messages.json @@ -144,6 +144,10 @@ "message": "Ethereum-kukkaro selaimessasi", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Hyväksy" }, diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json index af6a0469efe2..d8bcef5c7e14 100644 --- a/app/_locales/fil/messages.json +++ b/app/_locales/fil/messages.json @@ -132,6 +132,10 @@ "message": "Isang Ethereum Wallet sa iyong Browser", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Aprubahan" }, diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 544b9ea6411f..e45c6a662441 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -144,6 +144,10 @@ "message": "Extension Ethereum pour navigateur", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Approuver" }, diff --git a/app/_locales/gu/messages.json b/app/_locales/gu/messages.json index f91c7b3f443f..eb5cbba23bf7 100644 --- a/app/_locales/gu/messages.json +++ b/app/_locales/gu/messages.json @@ -1,4 +1,8 @@ { + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "reject": { "message": "નકારો" }, diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json index 746107236c0c..090e9a637de7 100644 --- a/app/_locales/he/messages.json +++ b/app/_locales/he/messages.json @@ -144,6 +144,10 @@ "message": "ארנק אתריום בדפדפן שלך", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "אישור" }, diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index 0af4eb346da2..2a0bb999ac6c 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -144,6 +144,10 @@ "message": "आपके ब्राउज़र में एक Ethereum वॉलेट", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "स्वीकृत " }, diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json index 4c3ddc0b4645..4cda80a5d450 100644 --- a/app/_locales/hr/messages.json +++ b/app/_locales/hr/messages.json @@ -26,6 +26,10 @@ "clearApprovalData": { "message": "Očisti podatke o privatnosti" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "reject": { "message": "Odbaci" }, diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json index f9ba12b8b74e..8d9111391716 100644 --- a/app/_locales/ht/messages.json +++ b/app/_locales/ht/messages.json @@ -72,6 +72,10 @@ "message": "Ekstansyon Navigatè Ethereum", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Apwouve" }, diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json index b4aae5ec86fa..d2f4e40f749d 100644 --- a/app/_locales/hu/messages.json +++ b/app/_locales/hu/messages.json @@ -26,6 +26,10 @@ "clearApprovalData": { "message": "Adatvédelmi adatok törlése" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "reject": { "message": "Elutasítás" }, diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index 8c89a483f3c2..93954929ff2e 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -26,6 +26,10 @@ "clearApprovalData": { "message": "Bersihkan Data Privasi" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "reject": { "message": "Tolak" }, diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index fe63e2e59a8a..685a1c2dc87c 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -141,6 +141,10 @@ "message": "Ethereum Browser Extension", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Approva" }, diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index fe3d12ced82b..6cc5c6b0819c 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -135,6 +135,10 @@ "message": "Ethereumのブラウザ・エクステンション", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "承認する" }, diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json index a18f9a628650..fee5f7aec2be 100644 --- a/app/_locales/kn/messages.json +++ b/app/_locales/kn/messages.json @@ -26,6 +26,10 @@ "clearApprovalData": { "message": "ಗೌಪ್ಯತೆ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಿ" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "reject": { "message": "ತಿರಸ್ಕರಿಸಿ" }, diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json index c3de010642d1..c041c0bbcf73 100644 --- a/app/_locales/lv/messages.json +++ b/app/_locales/lv/messages.json @@ -26,6 +26,10 @@ "clearApprovalData": { "message": "Notīrīt konfidencialitātes datus" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "reject": { "message": "Noraidīt" }, diff --git a/app/_locales/ml/messages.json b/app/_locales/ml/messages.json index 21c46808a4e6..1962ad67241d 100644 --- a/app/_locales/ml/messages.json +++ b/app/_locales/ml/messages.json @@ -1,4 +1,8 @@ { + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "reject": { "message": "നിരസിക്കുക" }, diff --git a/app/_locales/mr/messages.json b/app/_locales/mr/messages.json index 194151fc5a6d..f60f7ce1609f 100644 --- a/app/_locales/mr/messages.json +++ b/app/_locales/mr/messages.json @@ -1,4 +1,8 @@ { + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "reject": { "message": "नाकारा" }, diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json index b6737648157d..fb447ab81311 100644 --- a/app/_locales/ms/messages.json +++ b/app/_locales/ms/messages.json @@ -144,6 +144,10 @@ "message": "Dompat Ethereum di Pelayar anda", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Luluskan" }, diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json index 2e2ac395e21b..c9cc8a766b34 100644 --- a/app/_locales/nl/messages.json +++ b/app/_locales/nl/messages.json @@ -51,6 +51,10 @@ "message": "Ethereum Browser-extensie", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Goedkeuren" }, diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json index 093d7f3c9761..36507e549bc0 100644 --- a/app/_locales/no/messages.json +++ b/app/_locales/no/messages.json @@ -144,6 +144,10 @@ "message": "En Ethereum-lommebok i nettleseren din", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Godkjenn" }, diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json index 90d66e85cdc7..79bd802da31d 100644 --- a/app/_locales/ph/messages.json +++ b/app/_locales/ph/messages.json @@ -17,6 +17,10 @@ "clearApprovalData": { "message": "Tanggalin ang data ng pag-apruba" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Aprubahan" }, diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json index ce63a15016eb..7a2dc0132bb7 100644 --- a/app/_locales/pl/messages.json +++ b/app/_locales/pl/messages.json @@ -144,6 +144,10 @@ "message": "Wtyczka przeglądarki do Ethereum", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Zatwierdź" }, diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index a0d016b25c82..f6dd551d10a9 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -57,6 +57,10 @@ "message": "Extensão para o browser de Ethereum", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Aprovar" }, diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json index bbcb48eda551..ffee0bc54c15 100644 --- a/app/_locales/pt_BR/messages.json +++ b/app/_locales/pt_BR/messages.json @@ -26,6 +26,10 @@ "clearApprovalData": { "message": "Limpar Dados de Privacidade" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "reject": { "message": "Rejeitar" }, diff --git a/app/_locales/pt_PT/messages.json b/app/_locales/pt_PT/messages.json index 1f282055db63..9fe59448aad4 100644 --- a/app/_locales/pt_PT/messages.json +++ b/app/_locales/pt_PT/messages.json @@ -1,4 +1,8 @@ { + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "reject": { "message": "Rejeitar" }, diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json index fc5b01e143dd..e2c10cceb53b 100644 --- a/app/_locales/ro/messages.json +++ b/app/_locales/ro/messages.json @@ -141,6 +141,10 @@ "message": "Un portofel Ethereum în browserul dvs.", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Aprobați" }, diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 0227abcc3d37..dd459712f8a5 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -57,6 +57,10 @@ "message": "Расширение браузера для Ethereum", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Одобрить" }, diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json index a086350da23a..bb12630339cc 100644 --- a/app/_locales/sk/messages.json +++ b/app/_locales/sk/messages.json @@ -144,6 +144,10 @@ "message": "Ethereum rozšíření prohlížeče", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Schválit" }, diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json index 9fdf0a8973bc..c89689a18acd 100644 --- a/app/_locales/sl/messages.json +++ b/app/_locales/sl/messages.json @@ -144,6 +144,10 @@ "message": "Denarnica za Ethereum v brskalniku", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Potrdi" }, diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json index ad9eefb4bd2e..68d416633265 100644 --- a/app/_locales/sr/messages.json +++ b/app/_locales/sr/messages.json @@ -144,6 +144,10 @@ "message": "Ethereum novčanik u vašem pregledaču", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Odobrite" }, diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json index 441bfe368835..504b78006c70 100644 --- a/app/_locales/sv/messages.json +++ b/app/_locales/sv/messages.json @@ -26,6 +26,10 @@ "clearApprovalData": { "message": "Rensa personlig data" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "reject": { "message": "Avvisa" }, diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json index dad2436ba340..75547c897a53 100644 --- a/app/_locales/sw/messages.json +++ b/app/_locales/sw/messages.json @@ -26,6 +26,10 @@ "clearApprovalData": { "message": "Futa Data za Faragha" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "reject": { "message": "Kataa" }, diff --git a/app/_locales/te/messages.json b/app/_locales/te/messages.json index 48198ae599fe..1f8acda66ff3 100644 --- a/app/_locales/te/messages.json +++ b/app/_locales/te/messages.json @@ -1,4 +1,8 @@ { + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "reject": { "message": "తిరస్కరించు" }, diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json index 7677bb6aef11..827d7bde06b8 100644 --- a/app/_locales/th/messages.json +++ b/app/_locales/th/messages.json @@ -63,6 +63,10 @@ "message": "ส่วนขยายเบราว์เซอร์สำหรับอีเธอเรียม", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "อนุมัติ" }, diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 7dd6c710a563..20c6b1c7431b 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -57,6 +57,10 @@ "message": "Ethereum Tarayıcı Uzantısı", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Onaylamak" }, diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json index c1532301ba22..7aef59de2d9e 100644 --- a/app/_locales/uk/messages.json +++ b/app/_locales/uk/messages.json @@ -144,6 +144,10 @@ "message": "Гаманець Ethereum у вашому браузері", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Затвердити" }, diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index b7b6d798817a..abeaa8ac1dff 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -51,6 +51,10 @@ "message": "Tính năng Ethereum cho trình duyệt", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "Phê duyệt" }, diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 62ebcdbc003d..22656118811a 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -144,6 +144,10 @@ "message": "以太坊浏览器插件", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "批准" }, diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index 76d25a321dd0..40283e1583d3 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -144,6 +144,10 @@ "message": "乙太坊瀏覽器擴充插件", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, "approve": { "message": "批准" }, From 323a0dc73cfb0e6e999c5f82cce2e7842ced6105 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Tue, 17 Sep 2019 17:51:31 -0300 Subject: [PATCH 16/19] Update changelog for v7.2.1, v7.2.0, and v7.1.1 A new entry has been added for v7.2.1, and the Brave locales have been moved from v7.1.1 to v7.2.0. That feature was mistakenly included under the v7.1.1 heading - it was in fact released in v7.2.0 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75522c649c74..09711479a320 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,10 @@ ## Current Develop Branch ## 7.2.1 Tue Sep 17 2019 +- [#7180](https://github.com/MetaMask/metamask-extension/pull/7180): Add `appName` message to each locale ## 7.2.0 Mon Sep 8, 2019 +- [#7099](https://github.com/MetaMask/metamask-extension/pull/7099): Update localization from Transifex Brave - [#7137](https://github.com/MetaMask/metamask-extension/pull/7137): Fix validation of empty block explorer url's in custom network form - [#7128](https://github.com/MetaMask/metamask-extension/pull/7128): Support for eth_signTypedData_v4 - [#7110](https://github.com/MetaMask/metamask-extension/pull/7110): Adds `chaindIdChanged` event to the ethereum provider @@ -25,7 +27,6 @@ - [#7072](https://github.com/MetaMask/metamask-extension/pull/7072): Right-to-left CSS (using module for conversion) - [#6878](https://github.com/MetaMask/metamask-extension/pull/6878): Persian translation - [#7012](https://github.com/MetaMask/metamask-extension/pull/7012): Added missed phrases to RU locale -- [#7099](https://github.com/MetaMask/metamask-extension/pull/7099): Update localization from Transifex Brave ## 7.1.0 Fri Aug 16 2019 - [#7035](https://github.com/MetaMask/metamask-extension/pull/7035): Filter non-ERC-20 assets during mobile sync (#7035) From 2fc6c50de2a25a24d31dacee9f5e080e9d44723f Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Tue, 24 Sep 2019 15:50:32 +0000 Subject: [PATCH 17/19] Version v7.2.2 --- CHANGELOG.md | 2 ++ app/manifest.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09711479a320..e835ad77c638 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Develop Branch +## 7.2.2 Tue Sep 24 2019 + ## 7.2.1 Tue Sep 17 2019 - [#7180](https://github.com/MetaMask/metamask-extension/pull/7180): Add `appName` message to each locale diff --git a/app/manifest.json b/app/manifest.json index 6baedd0b9f4e..7a412691b09b 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "__MSG_appName__", - "version": "7.2.1", + "version": "7.2.2", "manifest_version": 2, "author": "https://metamask.io", "description": "__MSG_appDescription__", From 288553f300fcab073e0b3201b813db482a050ceb Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Tue, 24 Sep 2019 12:49:24 -0300 Subject: [PATCH 18/19] Update minimum Firefox verison to 56.0 (#7213) The previous minimum version of 56.2 resulted in the build failing validation when it was uploaded to the Firefox web store, because that version doesn't exist. It was set to that version because a Firefox fork uses it. Instead the minimum version has been reduced so that we pass validation. Unfortunately this will mean that a single incompatible version of Firefox Mobile will allow the extension to be installed (in theory), but there was no other way to avoid cutting off support to WaterFox (the Firefox fork). The warning about this from the addons linter can be ignored for now. --- app/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/manifest.json b/app/manifest.json index 7a412691b09b..3740a957a61b 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -22,7 +22,7 @@ "applications": { "gecko": { "id": "webextension@metamask.io", - "strict_min_version": "56.2" + "strict_min_version": "56.0" } }, "default_locale": "en", From 1375a86eaf007ab288348fff6aefffa94932ad79 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Tue, 24 Sep 2019 09:57:51 -0600 Subject: [PATCH 19/19] Add v7.2.2 to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e835ad77c638..5c3f2ca74c10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Current Develop Branch ## 7.2.2 Tue Sep 24 2019 +- [#7213](https://github.com/MetaMask/metamask-extension/pull/7213): Update minimum Firefox verison to 56.0 ## 7.2.1 Tue Sep 17 2019 - [#7180](https://github.com/MetaMask/metamask-extension/pull/7180): Add `appName` message to each locale