Merge pull request #9720 from MetaMask/Version-v8.1.3

Version v8.1.3 RC
MetaMask · Oct 29, 2020 · 11781e8 · 11781e8
2 parents 074ed8d + af704db
commit 11781e8
Show file tree

Hide file tree

Showing 86 changed files with 2,382 additions and 1,910 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -122,6 +122,8 @@ jobs:
   prep-build:
     docker:
       - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
+    environment:
+      NODE_OPTIONS: --max_old_space_size=1024
     steps:
       - checkout
       - attach_workspace:
@@ -141,6 +143,8 @@ jobs:
   prep-build-test:
     docker:
       - image: circleci/node@sha256:e16740707de2ebed45c05d507f33ef204902349c7356d720610b5ec6a35d3d88
+    environment:
+      NODE_OPTIONS: --max_old_space_size=1024
     steps:
       - checkout
       - attach_workspace:

diff --git a/.circleci/scripts/release-create-release-pr b/.circleci/scripts/release-create-release-pr
@@ -45,6 +45,7 @@ install_github_cli
 printf '%s\n' "Creating a Pull Request for $version on GitHub"
 
 if ! hub pull-request \
+    --draft \
     --message "${CIRCLE_BRANCH/-/ } RC" --message ':package: :rocket:' \
     --base "$CIRCLE_PROJECT_USERNAME:$base_branch" \
     --head "$CIRCLE_PROJECT_USERNAME:$CIRCLE_BRANCH";

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,6 +1,6 @@
 module.exports = {
   root: true,
-  parser: 'babel-eslint',
+  parser: '@babel/eslint-parser',
   parserOptions: {
     'sourceType': 'module',
     'ecmaVersion': 2017,
@@ -39,7 +39,7 @@ module.exports = {
   ],
 
   plugins: [
-    'babel',
+    '@babel',
     'react',
     'import',
   ],
@@ -82,10 +82,16 @@ module.exports = {
     }],
 
     'no-invalid-this': 'off',
-    'babel/no-invalid-this': 'error',
+    '@babel/no-invalid-this': 'error',
 
-    'babel/semi': ['error', 'never'],
+    '@babel/semi': ['error', 'never'],
     'mocha/no-setup-in-describe': 'off',
+    'node/no-process-env': 'off',
+
+    // TODO: re-enable these rules
+    'node/no-sync': 'off',
+    'node/no-unpublished-import': 'off',
+    'node/no-unpublished-require': 'off',
   },
 
   overrides: [{
@@ -108,7 +114,7 @@ module.exports = {
       'app/scripts/migrations/*.js',
     ],
     rules: {
-      'global-require': 'off',
+      'node/global-require': 'off',
     },
   }, {
     files: [
@@ -117,7 +123,7 @@ module.exports = {
     ],
     rules: {
       // Mocha will re-assign `this` in a test context
-      'babel/no-invalid-this': 'off',
+      '@babel/no-invalid-this': 'off',
     },
   }, {
     files: [
@@ -126,7 +132,8 @@ module.exports = {
       'test/helper.js',
     ],
     rules: {
-      'no-process-exit': 'off',
+      'node/no-process-exit': 'off',
+      'node/shebang': 'off',
     },
   }, {
     files: [

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
+Fixes: #
+
+Explanation:  
+
+Manual testing steps:  
+  - 
+  - 
+  - 
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    allow:
+      - dependency-name: "@metamask/*"
+      - dependency-name: "eth-contract-metadata"
+    versioning-strategy: "lockfile-only"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,25 @@
 # Changelog
 
 ## Current Develop Branch
+- [#9612](https://github.com/MetaMask/metamask-extension/pull/9612): Update main-quote-summary designs/styles
+
+## 8.1.3 Mon Oct 26 2020
+- [#9642](https://github.com/MetaMask/metamask-extension/pull/9642) Prevent excessive overflow from swap dropdowns
+- [#9658](https://github.com/MetaMask/metamask-extension/pull/9658): Fix sorting Quote Source column of quote sort list
+- [#9667](https://github.com/MetaMask/metamask-extension/pull/9667): Fix adding contact with QR code
+- [#9674](https://github.com/MetaMask/metamask-extension/pull/9674): Fix ENS resolution of `.eth` URLs with query strings
+- [#9691](https://github.com/MetaMask/metamask-extension/pull/9691): Bump @metamask/inpage-provider from 6.1.0 to 6.3.0
+- [#9700](https://github.com/MetaMask/metamask-extension/pull/9700): Provide image sizing so there's no jump when opening the swaps token search
+- [#9568](https://github.com/MetaMask/metamask-extension/pull/9568): Add ses lockdown to build system
+- [#9705](https://github.com/MetaMask/metamask-extension/pull/9705): Prevent memory leak from selected account copy tooltip
+- [#9671](https://github.com/MetaMask/metamask-extension/pull/9671): Prevent old fetches from polluting the swap state
+- [#9702](https://github.com/MetaMask/metamask-extension/pull/9702): Keyboard navigation for swaps dropdowns
+- [#9646](https://github.com/MetaMask/metamask-extension/pull/9646): Switch from Matomo to Segment
+- [#9745](https://github.com/MetaMask/metamask-extension/pull/9745): Fix fetching swaps when initial network not Mainnet
+- [#9621](https://github.com/MetaMask/metamask-extension/pull/9621): Include aggregator fee as part of displayed network fees
+- [#9736](https://github.com/MetaMask/metamask-extension/pull/9736): Bump eth-contract-metadata from 1.16.0 to 1.17.0
+- [#9743](https://github.com/MetaMask/metamask-extension/pull/9743): Fix "+-" prefix on swap token amount
+- [#9715](https://github.com/MetaMask/metamask-extension/pull/9715): Focus on wallet address in buy workflow
 
 ## 8.1.2 Mon Oct 19 2020
 - [#9608](https://github.com/MetaMask/metamask-extension/pull/9608): Ensure QR code scanner works

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
@@ -82,6 +82,9 @@
   "affirmAgree": {
     "message": "I Agree"
   },
+  "aggregatorFeeCost": {
+    "message": "Aggregator network fee"
+  },
   "alertDisableTooltip": {
     "message": "This can be changed in \"Settings > Alerts\""
   },
@@ -129,6 +132,9 @@
     "message": "MetaMask",
     "description": "The name of the application"
   },
+  "approvalAndAggregatorTxFeeCost": {
+    "message": "Approval and aggregator network fee"
+  },
   "approvalTxGasCost": {
     "message": "Approval Tx Gas Cost"
   },
@@ -1685,9 +1691,6 @@
   "swapFinalizing": {
     "message": "Finalizing..."
   },
-  "swapGasFeeSummary": {
-    "message": "The gas fee covers the cost of processing your swap and storing it on the Ethereum network. MetaMask does not profit from this fee."
-  },
   "swapGetQuotes": {
     "message": "Get quotes"
   },
@@ -1736,6 +1739,9 @@
     "message": "$1 quotes available",
     "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
   },
+  "swapNetworkFeeSummary": {
+    "message": "The network fee covers the cost of processing your swap and storing it on the Ethereum network. MetaMask does not profit from this fee."
+  },
   "swapNewQuoteIn": {
     "message": "New quotes in $1",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"

diff --git a/app/manifest/_base.json b/app/manifest/_base.json
@@ -68,6 +68,6 @@
     "notifications"
   ],
   "short_name": "__MSG_appName__",
-  "version": "8.1.2",
+  "version": "8.1.3",
   "web_accessible_resources": ["inpage.js", "phishing.html"]
 }
diff --git a/app/scripts/controllers/detect-tokens.js b/app/scripts/controllers/detect-tokens.js
@@ -86,6 +86,7 @@ export default class DetectTokensController {
     this.interval = DEFAULT_INTERVAL
   }
 
+  /* eslint-disable accessor-pairs */
   /**
    * @type {Number}
    */
@@ -162,4 +163,5 @@ export default class DetectTokensController {
   get isActive () {
     return this.isOpen && this.isUnlocked
   }
+  /* eslint-enable accessor-pairs */
 }
diff --git a/app/scripts/controllers/ens/index.js b/app/scripts/controllers/ens/index.js
@@ -1,4 +1,4 @@
-import punycode from 'punycode'
+import punycode from 'punycode/punycode'
 import ethUtil from 'ethereumjs-util'
 import ObservableStore from 'obs-store'
 import log from 'loglevel'

diff --git a/app/scripts/controllers/permissions/permissionsMethodMiddleware.js b/app/scripts/controllers/permissions/permissionsMethodMiddleware.js
@@ -111,7 +111,7 @@ export default function createPermissionsMethodMiddleware ({
     }
 
     // when this promise resolves, the response is on its way back
-    // eslint-disable-next-line callback-return
+    // eslint-disable-next-line node/callback-return
     await next()
 
     if (responseHandler) {