Merge pull request #11052 from MetaMask/Version-v9.5.1

Version v9.5.1 RC

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [9.5.1]
+### Fixed
+- [#11048](https://github.com/MetaMask/metamask-extension/pull/11048): Fixed icon on approval screen
+- [#11036](https://github.com/MetaMask/metamask-extension/pull/11036): Fixed broken app state for some users with Chinese, Portugese or Spanish browser language settings.
+
 ## [9.5.0] - 2021-04-28
 ### Added
 - [#10583](https://github.com/MetaMask/metamask-extension/pull/10583): Adding popup display to show new MetaMask notifications
@@ -2221,9 +2226,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Uncategorized
 - Added the ability to restore accounts from seed words.
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v9.4.0...HEAD
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v9.3.0...HEAD
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v9.5.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v9.5.1...HEAD
+[9.5.1]: https://github.com/MetaMask/metamask-extension/compare/v9.5.0...v9.5.1
 [9.5.0]: https://github.com/MetaMask/metamask-extension/compare/v9.4.0...v9.5.0
 [9.4.0]: https://github.com/MetaMask/metamask-extension/compare/v9.3.0...v9.4.0
 [9.3.0]: https://github.com/MetaMask/metamask-extension/compare/v9.2.1...v9.3.0

app/manifest/_base.json

@@ -71,6 +71,6 @@
     "notifications"
   ],
   "short_name": "__MSG_appName__",
-  "version": "9.5.0",
+  "version": "9.5.1",
   "web_accessible_resources": ["inpage.js", "phishing.html"]
 }

development/sentry-upload-artifacts.sh

@@ -27,33 +27,10 @@ Options:
 EOF
 }
 
-function upload_bundles {
-  local release="${1}"; shift
-
-  for filepath in ./dist/chrome/*.js
-  do
-    if [[ -f $filepath ]]
-    then
-      upload_bundle "${release}" "${filepath}"
-    fi
-  done
-}
-
-function upload_bundle {
-  local release="${1}"; shift
-  local filepath="${1}"; shift
-  local filename
-
-  filename="$( basename "${filepath}" )"
-
-  printf 'Uploading %s\n' "${filename}"
-  sentry-cli releases --org 'metamask' --project 'metamask' files "${release}" upload "${filepath}" "metamask/${filename}"
-}
-
 function upload_sourcemaps {
   local release="${1}"; shift
 
-  sentry-cli releases --org 'metamask' --project 'metamask' files "${release}" upload-sourcemaps ./dist/sourcemaps/ --url-prefix 'sourcemaps'
+  sentry-cli releases --org 'metamask' --project 'metamask' files "${release}" upload-sourcemaps ./dist/chrome/*.js ./dist/sourcemaps/ --rewrite --url-prefix 'metamask'
 }
 
 function main {
@@ -87,9 +64,7 @@ function main {
     die 'Required parameter "release" missing; either include parameter or set VERSION environment variable'
   fi
 
-  printf 'uploading source files Sentry release "%s"...\n' "${release}"
-  upload_bundles "${release}"
-  printf 'uploading sourcemaps Sentry release "%s"...\n' "${release}"
+  printf 'uploading source files and sourcemaps for Sentry release "%s"...\n' "${release}"
   upload_sourcemaps "${release}"
   printf 'all done!\n'
 }

package.json

@@ -73,11 +73,12 @@
     "**/redux-devtools-instrument/symbol-observable": "^2.0.3",
     "**/rxjs/symbol-observable": "^2.0.3",
     "**/xmlhttprequest-ssl": "^1.6.2",
-    "3box/ipfs/ipld-zcash/zcash-bitcore-lib/lodash": "^4.17.19",
+    "3box/ipfs/ipld-zcash/zcash-bitcore-lib/lodash": "^4.17.21",
     "3box/ipfs/ipld-zcash/zcash-bitcore-lib/elliptic": "^6.5.4",
     "3box/**/libp2p-crypto/node-forge": "^0.10.0",
     "3box/**/libp2p-keychain/node-forge": "^0.10.0",
     "analytics-node/axios": "^0.21.1",
+    "ganache-core/lodash": "^4.17.21",
     "netmask": "^2.0.1",
     "pull-ws": "^3.3.2"
   },
@@ -150,7 +151,7 @@
     "jsonschema": "^1.2.4",
     "labeled-stream-splicer": "^2.0.2",
     "localforage": "^1.9.0",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.21",
     "loglevel": "^1.4.1",
     "luxon": "^1.26.0",
     "nanoid": "^2.1.6",

shared/notifications/index.js

@@ -16,17 +16,18 @@ export const UI_NOTIFICATIONS = {
   },
   3: {
     id: 3,
-    date: '2021-03-8',
+    date: '2021-03-08',
   },
 };
 
 export const getTranslatedUINoficiations = (t, locale) => {
+  const formattedLocale = locale.replace('_', '-');
   return {
     1: {
       ...UI_NOTIFICATIONS[1],
       title: t('notifications1Title'),
       description: t('notifications1Description'),
-      date: new Intl.DateTimeFormat(locale).format(
+      date: new Intl.DateTimeFormat(formattedLocale).format(
         new Date(UI_NOTIFICATIONS[1].date),
       ),
     },
@@ -35,7 +36,7 @@ export const getTranslatedUINoficiations = (t, locale) => {
       title: t('notifications2Title'),
       description: t('notifications2Description'),
       actionText: t('notifications2ActionText'),
-      date: new Intl.DateTimeFormat(locale).format(
+      date: new Intl.DateTimeFormat(formattedLocale).format(
         new Date(UI_NOTIFICATIONS[2].date),
       ),
     },
@@ -44,7 +45,7 @@ export const getTranslatedUINoficiations = (t, locale) => {
       title: t('notifications3Title'),
       description: t('notifications3Description'),
       actionText: t('notifications3ActionText'),
-      date: new Intl.DateTimeFormat(locale).format(
+      date: new Intl.DateTimeFormat(formattedLocale).format(
         new Date(UI_NOTIFICATIONS[3].date),
       ),
     },

ui/app/pages/add-token/add-token.component.js

@@ -1,7 +1,9 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { isValidAddress } from 'ethereumjs-util';
-import { checkExistingAddresses } from '../../helpers/utils/util';
+import {
+  checkExistingAddresses,
+  isValidAddress,
+} from '../../helpers/utils/util';
 import { tokenInfoGetter } from '../../helpers/utils/token-util';
 import { CONFIRM_ADD_TOKEN_ROUTE } from '../../helpers/constants/routes';
 import TextField from '../../components/ui/text-field';

ui/app/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import Identicon from '../../../components/ui/identicon';
+import UrlIcon from '../../../components/ui/url-icon';
 import { addressSummary } from '../../../helpers/utils/util';
 import { formatCurrency } from '../../../helpers/utils/confirm-tx.util';
 import { ConfirmPageContainerWarning } from '../../../components/app/confirm-page-container/confirm-page-container-content';
@@ -253,11 +253,11 @@ export default class ConfirmApproveContent extends Component {
           </div>
         )}
         <div className="confirm-approve-content__identicon-wrapper">
-          <Identicon
+          <UrlIcon
             className="confirm-approve-content__identicon"
-            diameter={48}
-            address={origin}
-            image={siteImage}
+            fallbackClassName="confirm-approve-content__identicon"
+            name={origin ? new URL(origin).hostname : ''}
+            url={siteImage}
           />
         </div>
         <div className="confirm-approve-content__title">

ui/app/pages/confirm-approve/confirm-approve-content/index.scss

@@ -15,6 +15,11 @@
     padding-right: 24px;
   }
 
+  &__identicon {
+    width: 48px;
+    height: 48px;
+  }
+
   &__full-tx-content {
     display: flex;
     flex-flow: column;

ui/app/pages/send/send.component.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { isValidAddress } from 'ethereumjs-util';
 import { debounce } from 'lodash';
+import { isValidAddress } from '../../helpers/utils/util';
 import {
   getAmountErrorObject,
   getGasFeeErrorObject,

ui/lib/icon-factory.js

@@ -1,6 +1,5 @@
-import { isValidAddress } from 'ethereumjs-util';
 import contractMap from '@metamask/contract-metadata';
-import { checksumAddress } from '../app/helpers/utils/util';
+import { isValidAddress, checksumAddress } from '../app/helpers/utils/util';
 
 let iconFactory;
 

yarn.lock

@@ -17612,12 +17612,7 @@ lodash.uniqby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
   integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
 
-lodash@4.17.20, lodash@=3.10.1, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.2:
-  version "4.17.20"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
-
-lodash@^4.17.21, lodash@^4.7.0:
+lodash@4.17.20, lodash@=3.10.1, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.2:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==