From 3ab9bb72e24e81545c972f3075a6200c8aa01d2f Mon Sep 17 00:00:00 2001
From: Robin <robin@robin.town>
Date: Wed, 20 Nov 2024 10:22:42 -0500
Subject: [PATCH 1/2] Revert "Init client with a memory store (for MSC4222)
 (#2764)"

This reverts commit 83fa9661cf97fb5c30a82765f440cb752f11d4a9. We won't need this hack once we're no longer using a matrix-js-sdk branch with MSC4222 support.
---
 src/utils/matrix.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/matrix.ts b/src/utils/matrix.ts
index 4b966429..d3821a3f 100644
--- a/src/utils/matrix.ts
+++ b/src/utils/matrix.ts
@@ -123,7 +123,6 @@ export async function initClient(
     localTimeoutMs: 5000,
     useE2eForGroupCall: e2eEnabled,
     fallbackICEServerAllowed: fallbackICEServerAllowed,
-    store: new MemoryStore(),
   });
 
   // In case of logging in a new matrix account but there is still crypto local store. This is needed for:

From 8830bd74cbc766e6a7d0287bce4ab5d89a98d412 Mon Sep 17 00:00:00 2001
From: Robin <robin@robin.town>
Date: Wed, 20 Nov 2024 10:40:08 -0500
Subject: [PATCH 2/2] Update matrix-js-sdk

Return matrix-js-sdk to the develop branch.
---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 6238571c..d6df23cf 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "livekit-client": "^2.5.7",
     "lodash-es": "^4.17.21",
     "loglevel": "^1.9.1",
-    "matrix-js-sdk": "matrix-org/matrix-js-sdk#8e9a04cdec0f88fc876bbbf406db55b0677f005d",
+    "matrix-js-sdk": "matrix-org/matrix-js-sdk#2210255d6ffc909c574fb8ef16f92140b2fb7797",
     "matrix-widget-api": "^1.10.0",
     "normalize.css": "^8.0.1",
     "observable-hooks": "^4.2.3",
diff --git a/yarn.lock b/yarn.lock
index 3bf30b5e..7c883a6c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6209,9 +6209,9 @@ matrix-events-sdk@0.0.1:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
-matrix-js-sdk@matrix-org/matrix-js-sdk#8e9a04cdec0f88fc876bbbf406db55b0677f005d:
-  version "34.10.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/8e9a04cdec0f88fc876bbbf406db55b0677f005d"
+matrix-js-sdk@matrix-org/matrix-js-sdk#2210255d6ffc909c574fb8ef16f92140b2fb7797:
+  version "34.12.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2210255d6ffc909c574fb8ef16f92140b2fb7797"
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/matrix-sdk-crypto-wasm" "^9.0.0"