From 19748762a59cb49911dc1e6447d28ed9b9b229b8 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 12 Apr 2021 15:27:10 +0100
Subject: [PATCH] Upgrade matrix-react-sdk to 3.18.0

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

diff --git a/package.json b/package.json
index 72f1c1f81b..f49fb9b0de 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",
-    "matrix-react-sdk": "3.18.0-rc.1",
+    "matrix-react-sdk": "3.18.0",
     "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 4c262f9166..e4ae37fe2c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7521,21 +7521,6 @@ matrix-js-sdk@9.11.0:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
-matrix-js-sdk@9.11.0-rc.1:
-  version "9.11.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.11.0-rc.1.tgz#c1bcc5d749ef6b78673ab48e2db30f4e8b56768d"
-  integrity sha512-1U7l9FgWVWghTRRhU0A7zdniXS7mZ2Zr7H/lFUp5V3SVK62K7s3mKmFlGnuBNODnWYv4ZVKvlkCNaYYLSGw6/g==
-  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"
@@ -7544,10 +7529,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-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==
+matrix-react-sdk@3.18.0:
+  version "3.18.0"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.18.0.tgz#119b0a908974e46ad9973aa7c4ea10ee06fab2b4"
+  integrity sha512-RkivwI4Rv+l93tmj3GK1XDK9hGAoIILcQZ+rr1cQ1AymmFSwF/mQLVJICewLZCcp2FP9osJg75/JbmPBaurxdw==
   dependencies:
     "@babel/runtime" "^7.12.5"
     await-lock "^2.1.0"
@@ -7575,7 +7560,7 @@ matrix-react-sdk@3.18.0-rc.1:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "9.11.0-rc.1"
+    matrix-js-sdk "9.11.0"
     matrix-widget-api "^0.1.0-beta.13"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"