aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorbrunobar79 <brunobar79@gmail.com>2018-07-03 03:14:57 +0800
committerbrunobar79 <brunobar79@gmail.com>2018-07-03 03:14:57 +0800
commit86a8c98148447916915da99962d82ec5c5dd6cb7 (patch)
tree1a46b130f0183b72e31619c11146496cc265f666 /ui
parent317c3084df9d81d372c3326aa8db1e1e6f0255e3 (diff)
downloadtangerine-wallet-browser-86a8c98148447916915da99962d82ec5c5dd6cb7.tar
tangerine-wallet-browser-86a8c98148447916915da99962d82ec5c5dd6cb7.tar.gz
tangerine-wallet-browser-86a8c98148447916915da99962d82ec5c5dd6cb7.tar.bz2
tangerine-wallet-browser-86a8c98148447916915da99962d82ec5c5dd6cb7.tar.lz
tangerine-wallet-browser-86a8c98148447916915da99962d82ec5c5dd6cb7.tar.xz
tangerine-wallet-browser-86a8c98148447916915da99962d82ec5c5dd6cb7.tar.zst
tangerine-wallet-browser-86a8c98148447916915da99962d82ec5c5dd6cb7.zip
always open connect hardware in full screen mode
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/account-menu/index.js10
1 files changed, 9 insertions, 1 deletions
diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js
index 629669dac..be6963ac4 100644
--- a/ui/app/components/account-menu/index.js
+++ b/ui/app/components/account-menu/index.js
@@ -9,6 +9,10 @@ const actions = require('../../actions')
const { Menu, Item, Divider, CloseArea } = require('../dropdowns/components/menu')
const Identicon = require('../identicon')
const { formatBalance } = require('../../util')
+const { ENVIRONMENT_TYPE_POPUP } = require('../../../../app/scripts/lib/enums')
+const { getEnvironmentType } = require('../../../../app/scripts/lib/util')
+
+
const {
SETTINGS_ROUTE,
INFO_ROUTE,
@@ -110,7 +114,11 @@ AccountMenu.prototype.render = function () {
h(Item, {
onClick: () => {
toggleAccountMenu()
- history.push(CONNECT_HARDWARE_ROUTE)
+ if (getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP) {
+ global.platform.openExtensionInBrowser(CONNECT_HARDWARE_ROUTE)
+ } else {
+ history.push(CONNECT_HARDWARE_ROUTE)
+ }
},
icon: h('img.account-menu__item-icon', { src: 'images/connect-icon.svg' }),
text: this.context.t('connectHardware'),