diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-04-28 05:50:19 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-04-28 05:50:19 +0800 |
| commit | d1a10691802fc7eef65f13126c684b6cdf13d461 (patch) | |
| tree | 9143b42107d8aeb75fa58f8de45c5730bb8621dd /app/scripts/background.js | |
| parent | b0919ba7296553200161913ab413f214aa58e741 (diff) | |
| parent | a90b010de891f7936bc17c09c5fd27c61fc0610d (diff) | |
| download | tangerine-wallet-browser-d1a10691802fc7eef65f13126c684b6cdf13d461.tar.gz tangerine-wallet-browser-d1a10691802fc7eef65f13126c684b6cdf13d461.tar.zst tangerine-wallet-browser-d1a10691802fc7eef65f13126c684b6cdf13d461.zip | |
Merge branch 'master' into rinkeby
Diffstat (limited to 'app/scripts/background.js')
| -rw-r--r-- | app/scripts/background.js | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index 7211f1e0c..58f8e7556 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -41,10 +41,10 @@ asyncQ.waterfall([ // State and Persistence // -function loadStateFromPersistence() { +function loadStateFromPersistence () { // migrations - let migrator = new Migrator({ migrations }) - let initialState = migrator.generateInitialState(firstTimeState) + const migrator = new Migrator({ migrations }) + const initialState = migrator.generateInitialState(firstTimeState) return asyncQ.waterfall([ // read from disk () => Promise.resolve(diskStore.getState() || initialState), @@ -61,7 +61,6 @@ function loadStateFromPersistence() { } function setupController (initState) { - // // MetaMask Controller // @@ -85,8 +84,8 @@ function setupController (initState) { diskStore ) - function versionifyData(state) { - let versionedData = diskStore.getState() + function versionifyData (state) { + const versionedData = diskStore.getState() versionedData.data = state return versionedData } @@ -138,7 +137,6 @@ function setupController (initState) { } return Promise.resolve() - } // |