Merge pull request #7405 from MetaMask/Version-v7.5.1

Version v7.5.1 RC

.circleci/config.yml

@@ -14,9 +14,6 @@ workflows:
       - prep-build:
           requires:
             - prep-deps
-      - prep-build-test:
-          requires:
-            - prep-deps
       # - prep-docs:
       #    requires:
       #      - prep-deps
@@ -28,10 +25,10 @@ workflows:
             - prep-deps
       - test-e2e-chrome:
           requires:
-            - prep-build-test
+            - prep-deps
       - test-e2e-firefox:
           requires:
-            - prep-build-test
+            - prep-deps
       - test-unit:
           requires:
             - prep-deps
@@ -129,24 +126,6 @@ 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
@@ -213,12 +192,9 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run:
-          name: Move test build to dist
-          command: mv ./dist-test ./dist
       - run:
           name: test:e2e:chrome
-          command: yarn test:e2e:chrome
+          command: yarn build:test && yarn test:e2e:chrome
           no_output_timeout: 20m
       - store_artifacts:
           path: test-artifacts
@@ -234,12 +210,9 @@ 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 test:e2e:firefox
+          command: yarn build:test && yarn test:e2e:firefox
           no_output_timeout: 20m
       - store_artifacts:
           path: test-artifacts

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Current Develop Branch
 
+## 7.5.1 Tuesday Nov 13 2019
+- [#7402](https://github.com/MetaMask/metamask-extension/pull/7402): Fix regression for signed types data screens
+- [#7390](https://github.com/MetaMask/metamask-extension/pull/7390): Update json-rpc-engine
+- [#7401](https://github.com/MetaMask/metamask-extension/pull/7401): Reject connection request on window close
+
 ## 7.5.0 Mon Nov 04 2019
 - [#7328](https://github.com/MetaMask/metamask-extension/pull/7328): ignore known transactions on first broadcast and continue with normal flow
 - [#7327](https://github.com/MetaMask/metamask-extension/pull/7327): eth_getTransactionByHash will now check metamask's local history for pending transactions

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "7.5.0",
+  "version": "7.5.1",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "__MSG_appDescription__",

package.json

@@ -117,7 +117,7 @@
     "gaba": "^1.8.0",
     "human-standard-token-abi": "^2.0.0",
     "jazzicon": "^1.2.0",
-    "json-rpc-engine": "^5.1.4",
+    "json-rpc-engine": "^5.1.5",
     "json-rpc-middleware-stream": "^2.1.1",
     "jsonschema": "^1.2.4",
     "lodash.debounce": "^4.0.8",

ui/app/components/app/provider-page-container/provider-page-container.component.js

@@ -34,7 +34,7 @@ export default class ProviderPageContainer extends PureComponent {
     })
   }
 
-  _beforeUnload () {
+  _beforeUnload = () => {
     const { origin, rejectProviderRequestByOrigin } = this.props
     this.context.metricsEvent({
       eventOpts: {

ui/app/components/app/signature-request/signature-request.component.js

@@ -54,7 +54,7 @@ export default class SignatureRequest extends PureComponent {
       cancel,
       sign,
     } = this.props
-    const { message } = JSON.parse(data)
+    const { message, domain = {} } = JSON.parse(data)
 
     return (
       <div className="signature-request page-container">
@@ -62,14 +62,14 @@ export default class SignatureRequest extends PureComponent {
         <div className="signature-request-content">
           <div className="signature-request-content__title">{this.context.t('sigRequest')}</div>
           <div className="signature-request-content__identicon-container">
-            <div className="signature-request-content__identicon-initial" >{ message.from.name && message.from.name[0] }</div>
+            <div className="signature-request-content__identicon-initial" >{ domain.name && domain.name[0] }</div>
             <div className="signature-request-content__identicon-border" />
             <Identicon
-              address={message.from.wallet}
+              address={senderWallet}
               diameter={70}
             />
           </div>
-          <div className="signature-request-content__info--bolded">{message.from.name}</div>
+          <div className="signature-request-content__info--bolded">{domain.name}</div>
           <div className="signature-request-content__info">{origin}</div>
           <div className="signature-request-content__info">{this.formatWallet(senderWallet)}</div>
         </div>

yarn.lock

@@ -9715,6 +9715,13 @@ eth-json-rpc-errors@^1.0.1, eth-json-rpc-errors@^1.1.0:
   dependencies:
     fast-safe-stringify "^2.0.6"
 
+eth-json-rpc-errors@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eth-json-rpc-errors/-/eth-json-rpc-errors-2.0.0.tgz#bdc19df8b80a820844709193372f0d75fb74fed8"
+  integrity sha512-casdSTVOxbC3ptfUdclJRvU0Sgmdm/QtezLku8l4iVR5wNFe+KF+tfnlm2I84xxpx7mkyyHeeUxmRkcB5Os6mw==
+  dependencies:
+    fast-safe-stringify "^2.0.6"
+
 eth-json-rpc-filters@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-4.1.1.tgz#15277c66790236d85f798f4d7dc6bab99a798cd2"
@@ -15476,23 +15483,13 @@ json-rpc-engine@^3.4.0, json-rpc-engine@^3.6.0:
     promise-to-callback "^1.0.0"
     safe-event-emitter "^1.0.1"
 
-json-rpc-engine@^5.1.3:
+json-rpc-engine@^5.1.3, json-rpc-engine@^5.1.5:
-  version "5.1.3"
+  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-5.1.3.tgz#d7410b649e107ed3437db33797f44c51d507002c"
+  resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-5.1.5.tgz#a5f9915356ea916d5305716354080723c63dede7"
-  integrity sha512-/rQm6uts6JtjOVEaeSDCJgHDTlbfKDdoR1Uh3f+6za2SwhJyz+jL9iED2aapU9Yx7decLlI7wjVUIwxRg/R7WQ==
+  integrity sha512-HTT9HixG4j8vHYrmJIckgbISW9Q8tCkySv7x7Q8zjMpcw10wSe/dZSQ0w08VkDm3y195K4074UlvD3hxaznvlw==
-  dependencies:
-    async "^2.0.1"
-    eth-json-rpc-errors "^1.0.1"
-    promise-to-callback "^1.0.0"
-    safe-event-emitter "^1.0.1"
-
-json-rpc-engine@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-5.1.4.tgz#c18d1959eb175049fa7301d4866931ae2f879e47"
-  integrity sha512-nBFWYJ1mvlZL7gqq0M9230SxedL9CbSYO1WgrFi/C1Zo+ZrHUZWLRbr7fUdlLt9TC0G+sf/aEUeuJjR2lHsMvA==
   dependencies:
     async "^2.0.1"
-    eth-json-rpc-errors "^1.1.0"
+    eth-json-rpc-errors "^2.0.0"
     promise-to-callback "^1.0.0"
     safe-event-emitter "^1.0.1"