diff options
author | kumavis <kumavis@users.noreply.github.com> | 2019-03-12 21:47:21 +0800 |
---|---|---|
committer | Whymarrh Whitby <whymarrh.whitby@gmail.com> | 2019-03-12 21:47:21 +0800 |
commit | 48047f81947c28cc21f0fb93fe98a2d308078714 (patch) | |
tree | fb7a60317d331fadc640149bea15a257b9dd8d06 /ui/app/components/menu-bar | |
parent | 70e7e592aee53c672639841f029c963331cfae81 (diff) | |
download | tangerine-wallet-browser-48047f81947c28cc21f0fb93fe98a2d308078714.tar.gz tangerine-wallet-browser-48047f81947c28cc21f0fb93fe98a2d308078714.tar.zst tangerine-wallet-browser-48047f81947c28cc21f0fb93fe98a2d308078714.zip |
mascara - remove from project (#6283)
Diffstat (limited to 'ui/app/components/menu-bar')
-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 |
2 files changed, 23 insertions, 27 deletions
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, } } |