aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/migrations
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-02-04 07:36:45 +0800
committerGitHub <noreply@github.com>2017-02-04 07:36:45 +0800
commiteb08a4f41f3fc341bfd3eaf8fafe9309129e97e4 (patch)
treee14cff922e86f97423e07acfe3d17556e99e1005 /app/scripts/migrations
parent66be5ff2756e611c7af6973e704d27ce9bbd0d45 (diff)
parente1719191f488ab1d842a5e55ddd9f70038329f09 (diff)
downloadtangerine-wallet-browser-eb08a4f41f3fc341bfd3eaf8fafe9309129e97e4.tar.gz
tangerine-wallet-browser-eb08a4f41f3fc341bfd3eaf8fafe9309129e97e4.tar.zst
tangerine-wallet-browser-eb08a4f41f3fc341bfd3eaf8fafe9309129e97e4.zip
Merge pull request #1086 from MetaMask/kumavis-refactor7
Refactor round 7
Diffstat (limited to 'app/scripts/migrations')
-rw-r--r--app/scripts/migrations/009.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/migrations/009.js b/app/scripts/migrations/009.js
index 61b8b7fa2..38e6dcc09 100644
--- a/app/scripts/migrations/009.js
+++ b/app/scripts/migrations/009.js
@@ -6,7 +6,7 @@ This migration breaks out the CurrencyController substate
*/
-const merge = require('deep-merge')
+const merge = require('deep-extend')
module.exports = {
version,
@@ -25,7 +25,7 @@ module.exports = {
}
function transformState (state) {
- const newState = merge(state, {
+ const newState = merge({}, state, {
CurrencyController: {
currentCurrency: state.currentFiat || 'USD',
conversionRate: state.conversionRate,