From 750394159f8aa9c430b075e73f4eae6b90b9e992 Mon Sep 17 00:00:00 2001
From: Rohit Bansal <40559587+Rohit3523@users.noreply.github.com>
Date: Thu, 6 Nov 2025 19:31:46 +0530
Subject: [PATCH 1/5] Remove pressKey from join-from-directory-test

---
 .maestro/tests/assorted/join-from-directory.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.maestro/tests/assorted/join-from-directory.yaml b/.maestro/tests/assorted/join-from-directory.yaml
index df84972bf49..0a2a543f61a 100644
--- a/.maestro/tests/assorted/join-from-directory.yaml
+++ b/.maestro/tests/assorted/join-from-directory.yaml
@@ -41,7 +41,6 @@ tags:
 - tapOn:
     id: 'directory-view-search'
 - inputText: join-from-directory
-- pressKey: Enter
 - extendedWaitUntil:
     visible:
       id: 'directory-view-item-join-from-directory'
@@ -103,7 +102,6 @@ tags:
 - tapOn:
     id: 'directory-view-search'
 - inputText: ${output.otherUser.username}
-- pressKey: Enter
 - extendedWaitUntil:
     visible:
       id: 'directory-view-item-${output.otherUser.username}'
@@ -147,7 +145,6 @@ tags:
 - tapOn:
     id: 'directory-view-search'
 - inputText: ${output.team}
-- pressKey: Enter
 - extendedWaitUntil:
     visible:
       id: 'directory-view-item-${output.team}'

From 36d659ab9561095f81c5a9d02031b9176b690236 Mon Sep 17 00:00:00 2001
From: Rohit Bansal <40559587+Rohit3523@users.noreply.github.com>
Date: Thu, 6 Nov 2025 20:16:43 +0530
Subject: [PATCH 2/5] Show in app notification for 1 min

---
 app/containers/InAppNotification/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/containers/InAppNotification/index.tsx b/app/containers/InAppNotification/index.tsx
index 503e284eac9..870076e382f 100644
--- a/app/containers/InAppNotification/index.tsx
+++ b/app/containers/InAppNotification/index.tsx
@@ -59,7 +59,7 @@ const InAppNotification = memo(() => {
 				componentProps: {
 					notification
 				},
-				duration: notification.customTime || 3000, // default 3s,
+				duration: notification.customTime || process.env.RUNNING_E2E_TESTS ? 60000 : 3000, // default 3s,
 				hideOnPress: notification.hideOnPress ?? true,
 				swipeEnabled: notification.swipeEnabled ?? true
 			});

From b8157eb568bbc18b5f2891a8008c921de5640065 Mon Sep 17 00:00:00 2001
From: Rohit Bansal <40559587+Rohit3523@users.noreply.github.com>
Date: Fri, 7 Nov 2025 22:24:28 +0530
Subject: [PATCH 3/5] Clear cache flaky fix

---
 .maestro/tests/assorted/setting.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.maestro/tests/assorted/setting.yaml b/.maestro/tests/assorted/setting.yaml
index e159d44a579..e5991253235 100644
--- a/.maestro/tests/assorted/setting.yaml
+++ b/.maestro/tests/assorted/setting.yaml
@@ -104,8 +104,12 @@ tags:
     visible:
       id: 'settings-view'
     timeout: 60000
-- assertVisible:
-    id: 'settings-view-clear-cache'
+- waitForAnimationToEnd:
+    timeout: 60000
+- extendedWaitUntil:
+    visible:
+      id: 'settings-view-clear-cache'
+    timeout: 60000
 - tapOn:
     id: 'settings-view-clear-cache'
     retryTapIfNoChange: true

From 1e58a5e69967760a2857a0721ec0edaaa26ce687 Mon Sep 17 00:00:00 2001
From: Rohit Bansal <40559587+Rohit3523@users.noreply.github.com>
Date: Fri, 7 Nov 2025 23:08:33 +0530
Subject: [PATCH 4/5] use message id not text

---
 .maestro/tests/room/jump-to-message.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.maestro/tests/room/jump-to-message.yaml b/.maestro/tests/room/jump-to-message.yaml
index bfe651f52ca..2d330c4217b 100644
--- a/.maestro/tests/room/jump-to-message.yaml
+++ b/.maestro/tests/room/jump-to-message.yaml
@@ -108,8 +108,7 @@ tags:
       id: 'message-content-30'
     timeout: 60000
 - tapOn:
-    text: '30'
-    index: 1
+    id: 'message-content-30'
 - extendedWaitUntil:
     visible:
       id: 'message-content-29'

From be6cd7f20bd1ed572444d64b70fb17d216997d0d Mon Sep 17 00:00:00 2001
From: Rohit Bansal <40559587+Rohit3523@users.noreply.github.com>
Date: Sat, 8 Nov 2025 20:39:47 +0530
Subject: [PATCH 5/5] ios flaky fix

---
 .maestro/tests/assorted/join-from-directory.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.maestro/tests/assorted/join-from-directory.yaml b/.maestro/tests/assorted/join-from-directory.yaml
index 0a2a543f61a..edeaae617dc 100644
--- a/.maestro/tests/assorted/join-from-directory.yaml
+++ b/.maestro/tests/assorted/join-from-directory.yaml
@@ -102,6 +102,11 @@ tags:
 - tapOn:
     id: 'directory-view-search'
 - inputText: ${output.otherUser.username}
+- runFlow:
+    when:
+      platform: iOS
+    commands:
+      - pressKey: enter
 - extendedWaitUntil:
     visible:
       id: 'directory-view-item-${output.otherUser.username}'