m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Tighten up data loading code

Browse Source
This commit is contained in:
Dan Finlay 2018-03-07 14:42:59 -08:00
parent b97ac5106f
commit 64fcd27102
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/scripts/background.js
View File

@ -68,10 +68,10 @@ async function initialize () {
async function loadStateFromPersistence () { async function loadStateFromPersistence () {
// migrations // migrations
const migrator = new Migrator({ migrations }) const migrator = new Migrator({ migrations })
// read from disk
versionedData = diskStore.getState() || migrator.generateInitialState(firstTimeState)
// fetch from extension store and merge in data
// read from disk
// first from preferred, async API:
let localStoreData
if (localStore.isSupported) { if (localStore.isSupported) {
let localData let localData
try { try {
@ -82,10 +82,14 @@ async function loadStateFromPersistence () {
// If localStore is supported but has not been written to yet, ignore: // If localStore is supported but has not been written to yet, ignore:
if (Object.keys(localData).length > 0) { if (Object.keys(localData).length > 0) {
versionedData = localData localStoreData = localData
} }
} }
versionedData = localStoreData ||
diskStore.getState() ||
migrator.generateInitialState(firstTimeState)
// migrate data // migrate data
versionedData = await migrator.migrateData(versionedData) versionedData = await migrator.migrateData(versionedData)