From df1a02a8b1b13c9afb57a71e669d473621da1ebb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 9 Nov 2023 09:33:56 +0100
Subject: [PATCH 1/4] Fix Maestro test due to wording change.

---
 .maestro/tests/settings/settings.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.maestro/tests/settings/settings.yaml b/.maestro/tests/settings/settings.yaml
index 2fac9b108a..04e375ecbb 100644
--- a/.maestro/tests/settings/settings.yaml
+++ b/.maestro/tests/settings/settings.yaml
@@ -10,7 +10,7 @@ appId: ${APP_ID}
 - back
 
 - tapOn:
-    text: "Report bug"
+    text: "Report a problem"
 - assertVisible: "Report a bug"
 - back
 

From 408fc55110b2522a189528734e0cca481072d245 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 9 Nov 2023 11:07:44 +0100
Subject: [PATCH 2/4] Maestro navigate to more screen

---
 .maestro/tests/settings/settings.yaml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.maestro/tests/settings/settings.yaml b/.maestro/tests/settings/settings.yaml
index 04e375ecbb..b828ba6c38 100644
--- a/.maestro/tests/settings/settings.yaml
+++ b/.maestro/tests/settings/settings.yaml
@@ -9,6 +9,11 @@ appId: ${APP_ID}
 - assertVisible: "Share analytics data"
 - back
 
+- tapOn:
+    text: "Notifications"
+- assertVisible: "Enable notifications on this device"
+- back
+
 - tapOn:
     text: "Report a problem"
 - assertVisible: "Report a bug"
@@ -21,6 +26,16 @@ appId: ${APP_ID}
 - assertVisible: "Privacy policy"
 - back
 
+- tapOn:
+    text: "Screen lock"
+- assertVisible: "Choose PIN"
+- back
+
+- tapOn:
+    text: "Advanced settings"
+- assertVisible: "Rich text editor"
+- back
+
 - tapOn:
     text: "Developer options"
 - assertVisible: "Feature flags"

From 22e62e9beecb79b0bd388da00c5db1029bdf7590 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 9 Nov 2023 11:08:03 +0100
Subject: [PATCH 3/4] Maestro: scroll to see the item

---
 .maestro/tests/roomList/createAndDeleteRoom.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.maestro/tests/roomList/createAndDeleteRoom.yaml b/.maestro/tests/roomList/createAndDeleteRoom.yaml
index 5ec7060679..18d52b9dd8 100644
--- a/.maestro/tests/roomList/createAndDeleteRoom.yaml
+++ b/.maestro/tests/roomList/createAndDeleteRoom.yaml
@@ -29,5 +29,6 @@ appId: ${APP_ID}
 - tapOn: "People"
 # assert there's 1 member and 2 invitees
 - tapOn: "Back"
+- scroll
 - tapOn: "Leave room"
 - tapOn: "Leave"

From f998951531ffc9f8497040f97922363417b67a28 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 9 Nov 2023 11:26:12 +0100
Subject: [PATCH 4/4] Maestro: close keyboard first

---
 .maestro/tests/settings/settings.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.maestro/tests/settings/settings.yaml b/.maestro/tests/settings/settings.yaml
index b828ba6c38..53fcf0f017 100644
--- a/.maestro/tests/settings/settings.yaml
+++ b/.maestro/tests/settings/settings.yaml
@@ -29,6 +29,7 @@ appId: ${APP_ID}
 - tapOn:
     text: "Screen lock"
 - assertVisible: "Choose PIN"
+- hideKeyboard
 - back
 
 - tapOn: