From 387fa75da8835ad1d82bde0efd4d55395c3c0282 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 12 Aug 2019 17:41:36 +0100
Subject: [PATCH 1/2] Bump matrix-react-test-utils for React 16 compatibility

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 package.json |  2 +-
 yarn.lock    | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 8e1a1fa668..ffd701a233 100644
--- a/package.json
+++ b/package.json
@@ -148,7 +148,7 @@
     "karma-summary-reporter": "^1.5.1",
     "karma-webpack": "^4.0.0-beta.0",
     "matrix-mock-request": "^1.2.3",
-    "matrix-react-test-utils": "^0.1.1",
+    "matrix-react-test-utils": "^0.2.2",
     "mocha": "^5.0.5",
     "react-addons-test-utils": "^15.4.0",
     "require-json": "0.0.1",
diff --git a/yarn.lock b/yarn.lock
index f6ae81d6e9..4fd19e19d5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5061,13 +5061,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-test-utils@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.1.1.tgz#b548844d0ebe338ea1b9c8f16474c30d17c3bdf4"
-  integrity sha1-tUiETQ6+M46hucjxZHTDDRfDvfQ=
-  dependencies:
-    react "^15.6.1"
-    react-dom "^15.6.1"
+matrix-react-test-utils@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.2.tgz#c87144d3b910c7edc544a6699d13c7c2bf02f853"
+  integrity sha512-49+7gfV6smvBIVbeloql+37IeWMTD+fiywalwCqk8Dnz53zAFjKSltB3rmWHso1uecLtQEcPtCijfhzcLXAxTQ==
 
 md5.js@^1.3.4:
   version "1.3.5"
@@ -6373,7 +6370,7 @@ react-beautiful-dnd@^4.0.1:
     redux-thunk "^2.2.0"
     reselect "^3.0.1"
 
-react-dom@^15.6.0, react-dom@^15.6.1:
+react-dom@^15.6.0:
   version "15.6.2"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
   integrity sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=
@@ -6397,7 +6394,7 @@ react-dom@^16.4.2:
   version "2.1.5"
   resolved "https://codeload.github.com/matrix-org/react-gemini-scrollbar/tar.gz/f64452388011d37d8a4427ba769153c30700ab8c"
   dependencies:
-    gemini-scrollbar matrix-org/gemini-scrollbar#91e1e566
+    gemini-scrollbar matrix-org/gemini-scrollbar#b302279
 
 react-immutable-proptypes@^2.1.0:
   version "2.1.0"
@@ -6436,7 +6433,7 @@ react-redux@^5.0.6:
     react-is "^16.6.0"
     react-lifecycles-compat "^3.0.0"
 
-react@^15.6.0, react@^15.6.1:
+react@^15.6.0:
   version "15.6.2"
   resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
   integrity sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=

From 7145d0e1a6cf6121fdcffa99733d07ef8506833f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 12 Aug 2019 18:06:37 +0100
Subject: [PATCH 2/2] Hit yarn with a hammer until it works

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 4fd19e19d5..b9341b2a0e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6394,7 +6394,7 @@ react-dom@^16.4.2:
   version "2.1.5"
   resolved "https://codeload.github.com/matrix-org/react-gemini-scrollbar/tar.gz/f64452388011d37d8a4427ba769153c30700ab8c"
   dependencies:
-    gemini-scrollbar matrix-org/gemini-scrollbar#b302279
+    gemini-scrollbar matrix-org/gemini-scrollbar#91e1e566
 
 react-immutable-proptypes@^2.1.0:
   version "2.1.0"