diff options
Diffstat (limited to 'ui/app')
-rw-r--r-- | ui/app/app.js | 2 | ||||
-rw-r--r-- | ui/app/components/account-menu/account-menu.component.js | 1 | ||||
-rw-r--r-- | ui/app/components/menu-bar/menu-bar.component.js | 47 | ||||
-rw-r--r-- | ui/app/components/menu-bar/menu-bar.container.js | 3 | ||||
-rw-r--r-- | ui/app/components/pages/unlock-page/unlock-page.component.js | 2 | ||||
-rw-r--r-- | ui/app/reducers/metamask.js | 2 | ||||
-rw-r--r-- | ui/app/util.js | 3 |
7 files changed, 27 insertions, 33 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index b9f6cafe7..efec4e49a 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -312,7 +312,6 @@ App.propTypes = { sidebar: PropTypes.object, alertOpen: PropTypes.bool, hideSidebar: PropTypes.func, - isMascara: PropTypes.bool, isOnboarding: PropTypes.bool, isUnlocked: PropTypes.bool, networkDropdownOpen: PropTypes.bool, @@ -388,7 +387,6 @@ function mapStateToProps (state) { currentView: state.appState.currentView, activeAddress: state.appState.activeAddress, transForward: state.appState.transForward, - isMascara: state.metamask.isMascara, isOnboarding: Boolean(!noActiveNotices || seedWords || !isInitialized), isPopup: state.metamask.isPopup, seedWords: state.metamask.seedWords, diff --git a/ui/app/components/account-menu/account-menu.component.js b/ui/app/components/account-menu/account-menu.component.js index ce7482108..f7c962874 100644 --- a/ui/app/components/account-menu/account-menu.component.js +++ b/ui/app/components/account-menu/account-menu.component.js @@ -28,6 +28,7 @@ export default class AccountMenu extends PureComponent { history: PropTypes.object, identities: PropTypes.object, isAccountMenuOpen: PropTypes.bool, + prevIsAccountMenuOpen: PropTypes.bool, keyrings: PropTypes.array, lockMetamask: PropTypes.func, selectedAddress: PropTypes.string, diff --git a/ui/app/components/menu-bar/menu-bar.component.js b/ui/app/components/menu-bar/menu-bar.component.js index dfc977d3c..29c56953d 100644 --- a/ui/app/components/menu-bar/menu-bar.component.js +++ b/ui/app/components/menu-bar/menu-bar.component.js @@ -12,7 +12,6 @@ export default class MenuBar extends PureComponent { static propTypes = { hideSidebar: PropTypes.func, - isMascara: PropTypes.bool, sidebarOpen: PropTypes.bool, showSidebar: PropTypes.func, } @@ -21,7 +20,7 @@ export default class MenuBar extends PureComponent { render () { const { t } = this.context - const { isMascara, sidebarOpen, hideSidebar, showSidebar } = this.props + const { sidebarOpen, hideSidebar, showSidebar } = this.props const { accountDetailsMenuOpen } = this.state return ( @@ -45,29 +44,27 @@ export default class MenuBar extends PureComponent { /> </Tooltip> <SelectedAccount /> - { - !isMascara && ( - <Tooltip - title={t('accountOptions')} - position="bottom" - > - <div - className="fa fa-ellipsis-h fa-lg menu-bar__open-in-browser" - onClick={() => { - this.context.metricsEvent({ - eventOpts: { - category: 'Navigation', - action: 'Home', - name: 'Opened Account Options', - }, - }) - this.setState({ accountDetailsMenuOpen: true }) - }} - > - </div> - </Tooltip> - ) - } + + <Tooltip + title={t('accountOptions')} + position="bottom" + > + <div + className="fa fa-ellipsis-h fa-lg menu-bar__open-in-browser" + onClick={() => { + this.context.metricsEvent({ + eventOpts: { + category: 'Navigation', + action: 'Home', + name: 'Opened Account Options', + }, + }) + this.setState({ accountDetailsMenuOpen: true }) + }} + > + </div> + </Tooltip> + { accountDetailsMenuOpen && ( <AccountDetailsDropdown diff --git a/ui/app/components/menu-bar/menu-bar.container.js b/ui/app/components/menu-bar/menu-bar.container.js index 4c5276402..0305f17d3 100644 --- a/ui/app/components/menu-bar/menu-bar.container.js +++ b/ui/app/components/menu-bar/menu-bar.container.js @@ -4,11 +4,10 @@ import MenuBar from './menu-bar.component' import { showSidebar, hideSidebar } from '../../actions' const mapStateToProps = state => { - const { appState: { sidebar: { isOpen }, isMascara } } = state + const { appState: { sidebar: { isOpen } } } = state return { sidebarOpen: isOpen, - isMascara, } } diff --git a/ui/app/components/pages/unlock-page/unlock-page.component.js b/ui/app/components/pages/unlock-page/unlock-page.component.js index 3ba870885..cc86d5872 100644 --- a/ui/app/components/pages/unlock-page/unlock-page.component.js +++ b/ui/app/components/pages/unlock-page/unlock-page.component.js @@ -19,6 +19,8 @@ export default class UnlockPage extends Component { onImport: PropTypes.func, onRestore: PropTypes.func, onSubmit: PropTypes.func, + forceUpdateMetamaskState: PropTypes.func, + showOptInModal: PropTypes.func, } constructor (props) { diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index c1aa20bf7..d4b920748 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -1,6 +1,5 @@ const extend = require('xtend') const actions = require('../actions') -const MetamascaraPlatform = require('../../../app/scripts/platforms/window') const { getEnvironmentType } = require('../../../app/scripts/lib/util') const { ENVIRONMENT_TYPE_POPUP } = require('../../../app/scripts/lib/enums') const { OLD_UI_NETWORK_TYPE } = require('../../../app/scripts/controllers/network/enums') @@ -15,7 +14,6 @@ function reduceMetamask (state, action) { isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, - isMascara: window.platform instanceof MetamascaraPlatform, isPopup: getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: {}, diff --git a/ui/app/util.js b/ui/app/util.js index e27956a45..3237e5feb 100644 --- a/ui/app/util.js +++ b/ui/app/util.js @@ -95,7 +95,6 @@ function miniAddressSummary (address) { function isValidAddress (address, network) { var prefixed = ethUtil.addHexPrefix(address) if (address === '0x0000000000000000000000000000000000000000') return false - if (!isEthNetwork(network)) return (ethUtil.isValidAddress(prefixed) && address === address.toLowerCase()) return (isAllOneCase(prefixed) && ethUtil.isValidAddress(prefixed)) || ethUtil.isValidChecksumAddress(prefixed) } @@ -315,7 +314,7 @@ function getTokenAddressFromTokenObject (token) { */ function checksumAddress (address, network) { const checksummed = address ? ethUtil.toChecksumAddress(address) : '' - return checksummed && network && !isEthNetwork(network) ? checksummed.toLowerCase() : checksummed + return checksummed } function addressSlicer (address = '') { |