diff options
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | ui/app/components/app/multiple-notifications/index.scss | 2 | ||||
| -rw-r--r-- | ui/app/components/app/multiple-notifications/multiple-notifications.component.js | 32 |
4 files changed, 28 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f1056c2c3..b96fab508 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,15 @@ # Changelog ## Current Develop Branch + +## 7.0.0 Fri Aug 02 2019 - [#6828](https://github.com/MetaMask/metamask-extension/pull/6828): Capitalized speed up label to match rest of UI -- [#6833](https://github.com/MetaMask/metamask-extension/pull/6833): Fix "npm install" failing due to pinned sub-dependency +- [#6874](https://github.com/MetaMask/metamask-extension/pull/6928): Allows skipping of seed phrase challenge during onboarding, and completing it at a later time +- [#6900](https://github.com/MetaMask/metamask-extension/pull/6900): Prevent opening of asset dropdown if no tokens in account +- [#6904](https://github.com/MetaMask/metamask-extension/pull/6904): Set privacy mode as default +- [#6914](https://github.com/MetaMask/metamask-extension/pull/6914): Adds Address Book feature +- [#6928](https://github.com/MetaMask/metamask-extension/pull/6928): Disable Copy Tx ID and block explorer link for transactions without hash +- [#6967](https://github.com/MetaMask/metamask-extension/pull/6967): Fix mobile sync ## 6.7.3 Thu Jul 18 2019 diff --git a/app/manifest.json b/app/manifest.json index 17c12493f..1ca2215eb 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "__MSG_appName__", - "version": "6.7.3", + "version": "7.0.0", "manifest_version": 2, "author": "https://metamask.io", "description": "__MSG_appDescription__", diff --git a/ui/app/components/app/multiple-notifications/index.scss b/ui/app/components/app/multiple-notifications/index.scss index e3ee39a74..e8d064bc0 100644 --- a/ui/app/components/app/multiple-notifications/index.scss +++ b/ui/app/components/app/multiple-notifications/index.scss @@ -3,7 +3,6 @@ display: flex; flex-direction: column; width: 472px; - height: 116px; position: absolute; bottom: 0; right: 0; @@ -37,7 +36,6 @@ } .home-notification-wrapper--show-all { - height: 356px;; justify-content: flex-end; margin-bottom: 0; diff --git a/ui/app/components/app/multiple-notifications/multiple-notifications.component.js b/ui/app/components/app/multiple-notifications/multiple-notifications.component.js index 09020c467..040890e18 100644 --- a/ui/app/components/app/multiple-notifications/multiple-notifications.component.js +++ b/ui/app/components/app/multiple-notifications/multiple-notifications.component.js @@ -18,21 +18,27 @@ export default class MultipleNotifications extends PureComponent { const notificationsToBeRendered = notifications.filter(notificationConfig => notificationConfig.shouldBeRendered) - return (<div - className={classnames(...classNames, { - 'home-notification-wrapper--show-all': showAll, - 'home-notification-wrapper--show-first': !showAll, - })} - > - { notificationsToBeRendered.map(notificationConfig => notificationConfig.component) } + if (notificationsToBeRendered.length === 0) { + return null + } + + return ( <div - className="home-notification-wrapper__i-container" - onClick={() => this.setState({ showAll: !showAll })} + className={classnames(...classNames, { + 'home-notification-wrapper--show-all': showAll, + 'home-notification-wrapper--show-first': !showAll, + })} > - {notificationsToBeRendered.length > 1 ? <i className={classnames('fa fa-sm fa-sort-amount-asc', { - 'flipped': !showAll, - })} /> : null} + { notificationsToBeRendered.map(notificationConfig => notificationConfig.component) } + <div + className="home-notification-wrapper__i-container" + onClick={() => this.setState({ showAll: !showAll })} + > + {notificationsToBeRendered.length > 1 ? <i className={classnames('fa fa-sm fa-sort-amount-asc', { + 'flipped': !showAll, + })} /> : null} + </div> </div> - </div>) + ) } } |