From c7d34ae92642dfe7c0aad01299359373deb325d4 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 7 Apr 2021 13:09:19 +0100
Subject: [PATCH] Upgrade matrix-react-sdk to 3.18.0-rc.1

---
 package.json |  2 +-
 yarn.lock    | 23 +++++------------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index a903ae0638..c35b307e91 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
     "matrix-js-sdk": "9.11.0-rc.1",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-react-sdk": "3.18.0-rc.1",
     "matrix-widget-api": "^0.1.0-beta.13",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index e9e9328676..c1e2ee35da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7521,20 +7521,6 @@ matrix-js-sdk@9.11.0-rc.1:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "9.10.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/4204b2170a1e04f20067b87636bb2eddf95194c4"
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^4.0.1"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    qs "^6.9.6"
-    request "^2.88.2"
-    unhomoglyph "^1.0.6"
-
 matrix-mock-request@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8"
@@ -7543,9 +7529,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "3.17.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/5df4ad2db0fed4bd96c73fa5b13cd4994c3a96c7"
+matrix-react-sdk@3.18.0-rc.1:
+  version "3.18.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.18.0-rc.1.tgz#2a41f302d898ca02b97da027b9c60d8b24722215"
+  integrity sha512-tIZniXw/2fHdBrSNzy6DmXVNE0+uko5svajQHM0a9wteBhNTap+MtoAbV0QWCpF6/NsLMsjmpxbUUfRkhFZzzQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     await-lock "^2.1.0"
@@ -7573,7 +7560,7 @@ matrix-mock-request@^1.2.3:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "9.11.0-rc.1"
     matrix-widget-api "^0.1.0-beta.13"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"