From 3997db00de67cf4f40d06373fd57cd69fcb5cc44 Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Mon, 27 Jan 2020 14:01:09 -0400
Subject: [PATCH] Replace `deep-extend` with `merge` from `lodash` (#7908)

The `merge` function from `deep-extend` is at least mostly equivalent
to `merge` from `lodash` - certainly in how we're using it.
---
 app/scripts/migrations/009.js | 2 +-
 app/scripts/migrations/010.js | 2 +-
 package.json                  | 3 +--
 yarn.lock                     | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/scripts/migrations/009.js b/app/scripts/migrations/009.js
index 2d359fb684d7..103321522978 100644
--- a/app/scripts/migrations/009.js
+++ b/app/scripts/migrations/009.js
@@ -6,7 +6,7 @@ This migration breaks out the CurrencyController substate
 
 */
 
-import merge from 'deep-extend'
+import { merge } from 'lodash'
 
 import clone from 'clone'
 
diff --git a/app/scripts/migrations/010.js b/app/scripts/migrations/010.js
index cc92a5f81272..b97dd04d906b 100644
--- a/app/scripts/migrations/010.js
+++ b/app/scripts/migrations/010.js
@@ -6,7 +6,7 @@ This migration breaks out the ShapeShiftController substate
 
 */
 
-import merge from 'deep-extend'
+import { merge } from 'lodash'
 
 import clone from 'clone'
 
diff --git a/package.json b/package.json
index d8f9cefd3db9..3568389c75ce 100644
--- a/package.json
+++ b/package.json
@@ -97,8 +97,8 @@
     "bip39": "^2.2.0",
     "bn.js": "^4.11.7",
     "browserify-derequire": "^0.9.4",
-    "cfx-fc-abi": "^1.0.0",
     "c3": "^0.7.10",
+    "cfx-fc-abi": "^1.0.0",
     "classnames": "^2.2.6",
     "clone": "^2.1.2",
     "content-hash": "^2.5.0",
@@ -107,7 +107,6 @@
     "d3": "^5.15.0",
     "debounce": "1.1.0",
     "debounce-stream": "^2.0.0",
-    "deep-extend": "^0.5.1",
     "deep-freeze-strict": "1.1.1",
     "detect-node": "^2.0.3",
     "dnode": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index 9e67097460b2..b0c16b8526e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9116,7 +9116,7 @@ deep-equal@^1.1.0:
     object-keys "^1.1.1"
     regexp.prototype.flags "^1.2.0"
 
-deep-extend@^0.5.0, deep-extend@^0.5.1:
+deep-extend@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f"
   integrity sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==