aboutsummaryrefslogtreecommitdiffstats
path: root/mascara/src
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-09-14 11:25:27 +0800
committerkumavis <aaron@kumavis.me>2017-09-14 11:25:27 +0800
commitb53d04c40975adc0fadf20bc6ca875bd9c39e595 (patch)
tree8bd46765152728172314bed921e498cf346f3b35 /mascara/src
parent610f09262d8686cf975b25ffb6e2b5371e3d55c0 (diff)
downloadtangerine-wallet-browser-b53d04c40975adc0fadf20bc6ca875bd9c39e595.tar
tangerine-wallet-browser-b53d04c40975adc0fadf20bc6ca875bd9c39e595.tar.gz
tangerine-wallet-browser-b53d04c40975adc0fadf20bc6ca875bd9c39e595.tar.bz2
tangerine-wallet-browser-b53d04c40975adc0fadf20bc6ca875bd9c39e595.tar.lz
tangerine-wallet-browser-b53d04c40975adc0fadf20bc6ca875bd9c39e595.tar.xz
tangerine-wallet-browser-b53d04c40975adc0fadf20bc6ca875bd9c39e595.tar.zst
tangerine-wallet-browser-b53d04c40975adc0fadf20bc6ca875bd9c39e595.zip
tests - integration - get flat and mascara tests closer to compatible
Diffstat (limited to 'mascara/src')
-rw-r--r--mascara/src/ui.js8
1 files changed, 3 insertions, 5 deletions
diff --git a/mascara/src/ui.js b/mascara/src/ui.js
index 5662270c1..7506532d2 100644
--- a/mascara/src/ui.js
+++ b/mascara/src/ui.js
@@ -2,8 +2,6 @@ const injectCss = require('inject-css')
const SWcontroller = require('client-sw-ready-event/lib/sw-client.js')
const SwStream = require('sw-stream/lib/sw-stream.js')
const MetaMaskUiCss = require('../../ui/css')
-const setupIframe = require('./lib/setup-iframe.js')
-const MetamaskInpageProvider = require('../../app/scripts/lib/inpage-provider.js')
const MetamascaraPlatform = require('../../app/scripts/platforms/window')
const startPopup = require('../../app/scripts/popup-core')
@@ -32,7 +30,7 @@ const connectApp = function (readSw) {
serviceWorker: background.controller,
context: name,
})
- startPopup({container, connectionStream}, (err, store) => {
+ startPopup({ container, connectionStream }, (err, store) => {
if (err) return displayCriticalError(err)
store.subscribe(() => {
const state = store.getState()
@@ -49,8 +47,8 @@ background.on('updatefound', windowReload)
background.startWorker()
.then(() => {
setTimeout(() => {
- const appContent = document.getElementById(`app-content`)
- if (!appContent.children.length) windowReload()
+ const container = document.getElementById(`app-content`)
+ if (!container.children.length) windowReload()
}, 2000)
})
console.log('hello from MetaMascara ui!')