Merge pull request #6969 from MetaMask/developv7.0.0

Master Version Bump

1 files changed, 16 insertions, 78 deletions

diff --git a/ui/app/pages/routes/index.js b/ui/app/pages/routes/index.js
index 9eeac2da2..2f7caf3bf 100644
--- a/ui/app/pages/routes/index.js
+++ b/ui/app/pages/routes/index.js
@@ -6,7 +6,8 @@ import { compose } from 'recompose'
 import actions from '../../store/actions'
 import log from 'loglevel'
 import IdleTimer from 'react-idle-timer'
-import {getMetaMaskAccounts, getNetworkIdentifier, preferencesSelector} from '../../selectors/selectors'
+import {getNetworkIdentifier, preferencesSelector} from '../../selectors/selectors'
+import classnames from 'classnames'
 
 // init
 import FirstTimeFlow from '../first-time-flow'
@@ -24,7 +25,6 @@ import Settings from '../settings'
 import Authenticated from '../../helpers/higher-order-components/authenticated'
 import Initialized from '../../helpers/higher-order-components/initialized'
 import Lock from '../lock'
-import UiMigrationAnnouncement from '../../components/app/ui-migration-annoucement'
 const RestoreVaultPage = require('../keychains/restore-vault').default
 const RevealSeedConfirmation = require('../keychains/reveal-seed')
 const MobileSyncPage = require('../mobile-sync')
@@ -178,12 +178,21 @@ class Routes extends Component {
       setMouseUserState,
       sidebar,
       submittedPendingTransactions,
+      isMouseUser,
     } = this.props
     const isLoadingNetwork = network === 'loading' && currentView.name !== 'config'
     const loadMessage = loadingMessage || isLoadingNetwork ?
       this.getConnectingLabel(loadingMessage) : null
     log.debug('Main ui render function')
 
+    const {
+      isOpen: sidebarIsOpen,
+      transitionName: sidebarTransitionName,
+      type: sidebarType,
+      props,
+    } = sidebar
+    const { transaction: sidebarTransaction } = props || {}
+
     const sidebarOnOverlayClose = sidebarType === WALLET_VIEW_SIDEBAR
       ? () => {
         this.context.metricsEvent({
@@ -196,17 +205,9 @@ class Routes extends Component {
       }
       : null
 
-    const {
-      isOpen: sidebarIsOpen,
-      transitionName: sidebarTransitionName,
-      type: sidebarType,
-      props,
-    } = sidebar
-    const { transaction: sidebarTransaction } = props || {}
-
     return (
       <div
-        className="app"
+        className={classnames('app', { 'mouse-user-styles': isMouseUser})}
         onClick={() => setMouseUserState(true)}
         onKeyDown={e => {
           if (e.keyCode === 9) {
@@ -214,7 +215,6 @@ class Routes extends Component {
           }
         }}
       >
-        <UiMigrationAnnouncement />
         <Modal />
         <Alert
           visible={this.props.alertOpen}
@@ -259,7 +259,7 @@ class Routes extends Component {
       passwordBox.focus()
     } else {
       // currently active: deactivate
-      this.props.dispatch(actions.lockMetamask(false))
+      this.props.lockMetaMask()
     }
   }
 
@@ -330,32 +330,14 @@ Routes.propTypes = {
   sidebar: PropTypes.object,
   alertOpen: PropTypes.bool,
   hideSidebar: PropTypes.func,
-  isOnboarding: PropTypes.bool,
   isUnlocked: PropTypes.bool,
-  networkDropdownOpen: PropTypes.bool,
-  showNetworkDropdown: PropTypes.func,
-  hideNetworkDropdown: PropTypes.func,
   setLastActiveTime: PropTypes.func,
   history: PropTypes.object,
   location: PropTypes.object,
-  dispatch: PropTypes.func,
-  toggleAccountMenu: PropTypes.func,
-  selectedAddress: PropTypes.string,
-  lostAccounts: PropTypes.array,
-  isInitialized: PropTypes.bool,
-  forgottenPassword: PropTypes.bool,
-  activeAddress: PropTypes.string,
-  unapprovedTxs: PropTypes.object,
-  seedWords: PropTypes.string,
+  lockMetaMask: PropTypes.func,
   submittedPendingTransactions: PropTypes.array,
-  unapprovedMsgCount: PropTypes.number,
-  unapprovedPersonalMsgCount: PropTypes.number,
-  unapprovedTypedMessagesCount: PropTypes.number,
-  welcomeScreenSeen: PropTypes.bool,
-  isPopup: PropTypes.bool,
   isMouseUser: PropTypes.bool,
   setMouseUserState: PropTypes.func,
-  t: PropTypes.func,
   providerId: PropTypes.string,
   providerRequests: PropTypes.array,
   autoLogoutTimeLimit: PropTypes.number,
@@ -364,7 +346,6 @@ Routes.propTypes = {
 function mapStateToProps (state) {
   const { appState, metamask } = state
   const {
-    networkDropdownOpen,
     sidebar,
     alertOpen,
     alertMessage,
@@ -372,77 +353,34 @@ function mapStateToProps (state) {
     loadingMessage,
   } = appState
 
-  const accounts = getMetaMaskAccounts(state)
   const { autoLogoutTimeLimit = 0 } = preferencesSelector(state)
 
-  const {
-    identities,
-    address,
-    keyrings,
-    isInitialized,
-    seedWords,
-    unapprovedTxs,
-    lostAccounts,
-    unapprovedMsgCount,
-    unapprovedPersonalMsgCount,
-    unapprovedTypedMessagesCount,
-    providerRequests,
-  } = metamask
-  const selected = address || Object.keys(accounts)[0]
-
   return {
     // state from plugin
-    networkDropdownOpen,
     sidebar,
     alertOpen,
     alertMessage,
     isLoading,
     loadingMessage,
-    isInitialized,
     isUnlocked: state.metamask.isUnlocked,
-    selectedAddress: state.metamask.selectedAddress,
     currentView: state.appState.currentView,
-    activeAddress: state.appState.activeAddress,
-    transForward: state.appState.transForward,
-    isOnboarding: Boolean(seedWords || !isInitialized),
-    isPopup: state.metamask.isPopup,
-    seedWords: state.metamask.seedWords,
     submittedPendingTransactions: submittedPendingTransactionsSelector(state),
-    unapprovedTxs,
-    unapprovedMsgs: state.metamask.unapprovedMsgs,
-    unapprovedMsgCount,
-    unapprovedPersonalMsgCount,
-    unapprovedTypedMessagesCount,
-    menuOpen: state.appState.menuOpen,
     network: state.metamask.network,
     provider: state.metamask.provider,
-    forgottenPassword: state.appState.forgottenPassword,
-    lostAccounts,
     frequentRpcListDetail: state.metamask.frequentRpcListDetail || [],
     currentCurrency: state.metamask.currentCurrency,
     isMouseUser: state.appState.isMouseUser,
-    isRevealingSeedWords: state.metamask.isRevealingSeedWords,
-    Qr: state.appState.Qr,
-    welcomeScreenSeen: state.metamask.welcomeScreenSeen,
     providerId: getNetworkIdentifier(state),
     autoLogoutTimeLimit,
-
-    // state needed to get account dropdown temporarily rendering from app bar
-    identities,
-    selected,
-    keyrings,
-    providerRequests,
+    providerRequests: metamask.providerRequests,
   }
 }
 
 function mapDispatchToProps (dispatch) {
   return {
-    dispatch,
+    lockMetaMask: () => dispatch(actions.lockMetamask(false)),
     hideSidebar: () => dispatch(actions.hideSidebar()),
-    showNetworkDropdown: () => dispatch(actions.showNetworkDropdown()),
-    hideNetworkDropdown: () => dispatch(actions.hideNetworkDropdown()),
     setCurrentCurrencyToUSD: () => dispatch(actions.setCurrentCurrency('usd')),
-    toggleAccountMenu: () => dispatch(actions.toggleAccountMenu()),
     setMouseUserState: (isMouseUser) => dispatch(actions.setMouseUserState(isMouseUser)),
     setLastActiveTime: () => dispatch(actions.setLastActiveTime()),
   }