aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib/is-popup-or-notification.js
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-04-10 17:49:01 +0800
committerDan <danjm.com@gmail.com>2018-04-10 17:49:01 +0800
commitf4d8da927734b2dcd597d1cc833f9fe6ac59cc77 (patch)
tree24984f09e1a0a86b8187ffee5197e3857a2b10cc /app/scripts/lib/is-popup-or-notification.js
parent284dd85a99f538b77fd477f4952117d1792f64a5 (diff)
parent29dab1e9e00c1c1e6ad834026df51b2839d3171d (diff)
downloadtangerine-wallet-browser-f4d8da927734b2dcd597d1cc833f9fe6ac59cc77.tar
tangerine-wallet-browser-f4d8da927734b2dcd597d1cc833f9fe6ac59cc77.tar.gz
tangerine-wallet-browser-f4d8da927734b2dcd597d1cc833f9fe6ac59cc77.tar.bz2
tangerine-wallet-browser-f4d8da927734b2dcd597d1cc833f9fe6ac59cc77.tar.lz
tangerine-wallet-browser-f4d8da927734b2dcd597d1cc833f9fe6ac59cc77.tar.xz
tangerine-wallet-browser-f4d8da927734b2dcd597d1cc833f9fe6ac59cc77.tar.zst
tangerine-wallet-browser-f4d8da927734b2dcd597d1cc833f9fe6ac59cc77.zip
Merge branch 'master' into i3725-refactor-send-component
Diffstat (limited to 'app/scripts/lib/is-popup-or-notification.js')
-rw-r--r--app/scripts/lib/is-popup-or-notification.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/lib/is-popup-or-notification.js b/app/scripts/lib/is-popup-or-notification.js
index e2999411f..ad3e825c0 100644
--- a/app/scripts/lib/is-popup-or-notification.js
+++ b/app/scripts/lib/is-popup-or-notification.js
@@ -3,7 +3,8 @@ module.exports = function isPopupOrNotification () {
// if (url.match(/popup.html$/) || url.match(/home.html$/)) {
// Below regexes needed for feature toggles (e.g. see line ~340 in ui/app/app.js)
// Revert below regexes to above commented out regexes before merge to master
- if (url.match(/popup.html(?:\?.+)*$/) || url.match(/home.html(?:\?.+)*$/)) {
+ if (url.match(/popup.html(?:\?.+)*$/) ||
+ url.match(/home.html(?:\?.+)*$/) || url.match(/home.html(?:#.*)*$/)) {
return 'popup'
} else {
return 'notification'