Adds deep merge for state migration

Auditors: @bbondy @bsclifton
brave · Nov 8, 2017 · 6594a55 · 6594a55
1 parent 145f454
commit 6594a55
Show file tree

Hide file tree

Showing 4 changed files with 1,213 additions and 169 deletions.
diff --git a/app/sessionStore.js b/app/sessionStore.js
@@ -18,6 +18,7 @@ const assert = require('assert')
 const Immutable = require('immutable')
 const app = electron.app
 const compareVersions = require('compare-versions')
+const merge = require('deepmerge')
 
 // Constants
 const UpdateStatus = require('../js/constants/updateStatus')
@@ -850,7 +851,7 @@ module.exports.loadAppState = () => {
  data = {}
  }
 
- data = Object.assign({}, module.exports.defaultAppState(), data)
+ data = merge(module.exports.defaultAppState(), data)
  data = module.exports.runImportDefaultSettings(data)
  if (loaded) {
  data = module.exports.runPreMigrations(data)