Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/input-fees-rounding

1 files changed, 8 insertions, 1 deletions

diff --git a/yarn.lock b/yarn.lock
index aeddefa31..d4991290e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6776,7 +6776,7 @@ ganache-core@0xProject/ganache-core#monorepo-dep:
     ethereumjs-tx "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default"
     ethereumjs-util "^5.2.0"
     ethereumjs-vm "2.3.5"
-    ethereumjs-wallet "~0.6.0"
+    ethereumjs-wallet "0.6.0"
     fake-merkle-patricia-tree "~1.0.1"
     heap "~0.2.6"
     js-scrypt "^0.2.0"
@@ -12579,6 +12579,13 @@ react-scroll@0xproject/react-scroll#pr-330-and-replace-state:
     lodash.throttle "^4.1.1"
     prop-types "^15.5.8"
 
+react-scroll@0xproject/react-scroll#similar-to-pr-330-but-with-replace-state:
+  version "1.7.10"
+  resolved "https://codeload.github.com/0xproject/react-scroll/tar.gz/0f625b270d7e966313cac8b811c0ae807b37e170"
+  dependencies:
+    lodash.throttle "^4.1.1"
+    prop-types "^15.5.8"
+
 react-side-effect@^1.0.2, react-side-effect@^1.1.0:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-1.1.5.tgz#f26059e50ed9c626d91d661b9f3c8bb38cd0ff2d"