From 2a640c92e1d16e3313038e05e78697e26085b179 Mon Sep 17 00:00:00 2001
From: aringenbach <arnaudr@element.io>
Date: Fri, 9 Jun 2023 16:20:07 +0200
Subject: [PATCH 1/2] Fix RTE sometimes inserting characters in wrong locations
 after multiple new lines

---
 Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++--
 changelog.d/7570.bugfix                                | 1 +
 project.yml                                            | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/7570.bugfix

diff --git a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
index bf7d208dd..4a7151c77 100644
--- a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-wysiwyg-composer-swift",
       "state" : {
-        "revision" : "ff5e8054da60212051cb0dec244500ca0f441bac",
-        "version" : "2.1.0"
+        "revision" : "1100b217c04d096dfe072afb4484660ff794d805",
+        "version" : "2.2.2"
       }
     },
     {
diff --git a/changelog.d/7570.bugfix b/changelog.d/7570.bugfix
new file mode 100644
index 000000000..6ea9c3824
--- /dev/null
+++ b/changelog.d/7570.bugfix
@@ -0,0 +1 @@
+Labs: Fix RTE sometimes inserting characters in wrong locations after multiple new lines
diff --git a/project.yml b/project.yml
index 449ee955c..8cbc73192 100644
--- a/project.yml
+++ b/project.yml
@@ -57,7 +57,7 @@ packages:
     branch: 0.0.1
   WysiwygComposer:
     url: https://github.com/matrix-org/matrix-wysiwyg-composer-swift
-    version: 2.1.0
+    version: 2.2.2
   DeviceKit:
     url: https://github.com/devicekit/DeviceKit
     majorVersion: 4.7.0

From ff3ef630528853cbc8a071103bb8589040d80f6c Mon Sep 17 00:00:00 2001
From: aringenbach <arnaudr@element.io>
Date: Mon, 12 Jun 2023 12:20:36 +0200
Subject: [PATCH 2/2] Fix a crash when creating a new direct chat with RTE

---
 Riot/Modules/Room/RoomViewController.m | 2 +-
 changelog.d/7577.bugfix                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/7577.bugfix

diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 01f9707d9..ac1ab9931 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -5172,7 +5172,7 @@ static CGSize kThreadListBarButtonItemImageSize;
 
 - (MXMediaManager *)mediaManager
 {
-    return self.roomDataSource.mxSession.mediaManager;
+    return self.mainSession.mediaManager;
 }
 
 - (void)roomInputToolbarViewDidOpenActionMenu:(RoomInputToolbarView*)toolbarView
diff --git a/changelog.d/7577.bugfix b/changelog.d/7577.bugfix
new file mode 100644
index 000000000..4e4d6f4a0
--- /dev/null
+++ b/changelog.d/7577.bugfix
@@ -0,0 +1 @@
+Labs: RTE: Fix a crash when creating a new direct chat