handle situation where storage.sync is disabled in certain versions of firefox

1 files changed, 2 insertions, 3 deletions

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 45da2f6d0..732f47590 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -47,11 +47,10 @@ async function initialize () {
 async function loadStateFromPersistence () {
   // migrations
   const migrator = new Migrator({ migrations })
-  // fetch from extension store
-  const extensionData = await extensionStore.fetch() // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError)
   // read from disk
   let versionedData = diskStore.getState() || migrator.generateInitialState(firstTimeState)
-  // merge extension and versioned data
+  // fetch from extension store and merge in data
+  const extensionData = await extensionStore.fetch() // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError)
   versionedData = { ...versionedData, ...extensionData }
   // migrate data
   versionedData = await migrator.migrateData(versionedData)