From 982a23cafdd838f769db5a49d7efc6902b6c49ae Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Thu, 22 Oct 2026 11:22:51 +0200
Subject: [PATCH] ci: fix the ios settings, calendar and swipe flow steps

---
 .maestro/features/06-swipe-undo.yaml |  4 ++++
 .maestro/features/09-calendar.yaml   |  7 +++++-
 .maestro/subflows/settings-page.yaml | 34 +++++++++++++++++++++-------
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/.maestro/features/06-swipe-undo.yaml b/.maestro/features/06-swipe-undo.yaml
index 126bbd0d..5b7144b3 100644
--- a/.maestro/features/06-swipe-undo.yaml
+++ b/.maestro/features/06-swipe-undo.yaml
@@ -6,6 +6,10 @@ tags:
   - features
 ---
 - runFlow: ../subflows/signed-in.yaml
+- scrollUntilVisible:
+    element: ".*Grüße aus München.*"
+    direction: DOWN
+    timeout: 20000
 - swipe:
     from: ".*Grüße aus München.*"
     direction: LEFT
diff --git a/.maestro/features/09-calendar.yaml b/.maestro/features/09-calendar.yaml
index e23f74dd..71d76ac9 100644
--- a/.maestro/features/09-calendar.yaml
+++ b/.maestro/features/09-calendar.yaml
@@ -52,11 +52,16 @@ tags:
     direction: DOWN
     timeout: 10000
 - tapOn: "Add reminder"
+- scrollUntilVisible:
+    element: "15 minutes before"
+    direction: DOWN
+    timeout: 10000
 - tapOn: "15 minutes before"
 - takeScreenshot: calendar-05-editor
 - tapOn: "Save"
+# The editor closes (its Save goes; the FAB is labelled "New event" too).
 - extendedWaitUntil:
-    notVisible: "New event"
+    notVisible: "Save"
     timeout: 20000
 
 # Find it in the schedule and open it
diff --git a/.maestro/subflows/settings-page.yaml b/.maestro/subflows/settings-page.yaml
index c55a5502..76812ef2 100644
--- a/.maestro/subflows/settings-page.yaml
+++ b/.maestro/subflows/settings-page.yaml
@@ -1,17 +1,35 @@
 # Settings list: scroll to the row ROW (regex on "Title, summary"), open it,
 # check PROOF shows, screenshot, and go back on a phone. On the iPad the list
 # is a left column, so scroll there instead of the middle of the screen.
+# (Swipe coordinates have to be literals.)
 appId: org.bulwarkmail.mobile
 ---
-- repeat:
-    while:
-      notVisible: ${ROW}
-    times: 10
+- runFlow:
+    when:
+      true: ${DEVICE == 'tablet'}
     commands:
-      - swipe:
-          start: "${DEVICE == 'tablet' ? '18%,80%' : '50%,80%'}"
-          end: "${DEVICE == 'tablet' ? '18%,40%' : '50%,40%'}"
-          duration: 600
+      - repeat:
+          while:
+            notVisible: ${ROW}
+          times: 10
+          commands:
+            - swipe:
+                start: 18%,80%
+                end: 18%,40%
+                duration: 600
+- runFlow:
+    when:
+      true: ${DEVICE != 'tablet'}
+    commands:
+      - repeat:
+          while:
+            notVisible: ${ROW}
+          times: 10
+          commands:
+            - swipe:
+                start: 50%,80%
+                end: 50%,40%
+                duration: 600
 - tapOn: ${ROW}
 - extendedWaitUntil:
     visible: ${PROOF}