aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-09-16 02:33:37 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-09-16 02:57:25 +0800
commitc5a2527c17f9c7f47645dc4d99694645d1985022 (patch)
tree04b1f6048c6d10a245d237d0fa6ccac43e8c0f79
parent7bcca782cbea545fedabf33d73311c0e361690c2 (diff)
downloadtangerine-wallet-browser-c5a2527c17f9c7f47645dc4d99694645d1985022.tar.gz
tangerine-wallet-browser-c5a2527c17f9c7f47645dc4d99694645d1985022.tar.zst
tangerine-wallet-browser-c5a2527c17f9c7f47645dc4d99694645d1985022.zip
set time if platform is mascara
-rw-r--r--mascara/src/ui.js1
-rw-r--r--test/integration/lib/first-time.js6
2 files changed, 5 insertions, 2 deletions
diff --git a/mascara/src/ui.js b/mascara/src/ui.js
index 05521d095..d70dca724 100644
--- a/mascara/src/ui.js
+++ b/mascara/src/ui.js
@@ -15,6 +15,7 @@ const container = document.getElementById('app-content')
var name = 'popup'
window.METAMASK_UI_TYPE = name
+window.METAMASK_PLATFORM_TYPE = 'mascara'
let intervalDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000
diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js
index 3f0fe165b..e84a51c64 100644
--- a/test/integration/lib/first-time.js
+++ b/test/integration/lib/first-time.js
@@ -11,8 +11,10 @@ QUnit.test('render init screen', (assert) => {
})
async function runFirstTimeUsageTest(assert, done) {
-
- await timeout()
+ let waitTime = 0
+ window.METAMASK_SKIP_RELOAD = true
+ if (window.METAMASK_PLATFORM_TYPE === 'mascara') waitTime = 1000
+ await timeout(waitTime)
const app = $('#app-content')