Fix first install flow

2 files changed, 4 insertions, 11 deletions

diff --git a/mascara/src/background.js b/mascara/src/background.js
index dd0e13239..fbfffa9b8 100644
--- a/mascara/src/background.js
+++ b/mascara/src/background.js
@@ -1,5 +1,4 @@
 global.window = global
-const asyncQ = require('async-q')
 const pipe = require('pump')
 
 const SwGlobalListener = require('sw-stream/lib/sw-global-listener.js')
@@ -39,18 +38,12 @@ console.log('inside:open')
 let diskStore
 const dbController = new DbController({
   key: STORAGE_KEY,
-  global: self,
   version: 2,
 })
-asyncQ.waterfall([
-  () => loadStateFromPersistence(),
-  (initState) => setupController(initState),
-])
+loadStateFromPersistence()
+.then((initState) => setupController(initState))
 .then(() => console.log('MetaMask initialization complete.'))
-.catch((err) => {
-  console.log('WHILE SETTING UP:')
-  console.error(err)
-})
+.catch((err) => console.error('WHILE SETTING UP:', err))
 
 // initialization flow
 
diff --git a/mascara/src/lib/index-db-controller.js b/mascara/src/lib/index-db-controller.js
index 041ddae2e..8db1d5d21 100644
--- a/mascara/src/lib/index-db-controller.js
+++ b/mascara/src/lib/index-db-controller.js
@@ -38,7 +38,7 @@ module.exports = class IndexDbController extends EventEmitter {
       if (!data) {
         return this._add('dataStore', this.initialState)
           .then(() => this.get('dataStore'))
-          .then((versionedData) => Promise.resolve(versionedData.data))
+          .then((versionedData) => Promise.resolve(versionedData))
       }
       return Promise.resolve(data)
     })