Resolve merge conflicts

1 files changed, 4 insertions, 3 deletions

diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js
index cedb14f6e..61b38897e 100644
--- a/test/integration/lib/first-time.js
+++ b/test/integration/lib/first-time.js
@@ -1,4 +1,5 @@
 const PASSWORD = 'password123'
+const runMascaraFirstTimeTest = require('./mascara-first-time')
 
 QUnit.module('first time usage')
 
@@ -11,9 +12,9 @@ QUnit.test('render init screen', (assert) => {
 })
 
 async function runFirstTimeUsageTest(assert, done) {
-  let waitTime = 0
-  if (window.METAMASK_PLATFORM_TYPE === 'mascara') waitTime = 4000
-  await timeout(waitTime)
+  if (window.METAMASK_PLATFORM_TYPE === 'mascara') {
+    return runMascaraFirstTimeTest(assert, done)
+  }
 
   const app = $('#app-content')