From 49e57482cc1f0f70d77108476f5a6704e10dd07f Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Thu, 22 Oct 2026 13:49:11 +0200
Subject: [PATCH] ci: scroll ios settings pages to their check text and steady
 the calendar reminder and compose body steps

---
 .maestro/features/09-calendar.yaml   | 14 ++++++++++++-
 .maestro/subflows/compose-body.yaml  |  6 ++++--
 .maestro/subflows/settings-page.yaml | 30 ++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/.maestro/features/09-calendar.yaml b/.maestro/features/09-calendar.yaml
index 71d76ac9..259e631a 100644
--- a/.maestro/features/09-calendar.yaml
+++ b/.maestro/features/09-calendar.yaml
@@ -47,11 +47,23 @@ tags:
     timeout: 10000
 - tapOn: "Title"
 - inputText: ${output.event}
+# Close the keyboard first: a tap while it slides away lands on a form that
+# is still moving.
+- pressKey: Enter
+- waitForAnimationToEnd:
+    timeout: 3000
 - scrollUntilVisible:
     element: "Add reminder"
     direction: DOWN
     timeout: 10000
-- tapOn: "Add reminder"
+- repeat:
+    while:
+      notVisible: "15 minutes before"
+    times: 2
+    commands:
+      - tapOn: "Add reminder"
+      - waitForAnimationToEnd:
+          timeout: 3000
 - scrollUntilVisible:
     element: "15 minutes before"
     direction: DOWN
diff --git a/.maestro/subflows/compose-body.yaml b/.maestro/subflows/compose-body.yaml
index a01dd410..2ecac86b 100644
--- a/.maestro/subflows/compose-body.yaml
+++ b/.maestro/subflows/compose-body.yaml
@@ -9,12 +9,14 @@ appId: org.bulwarkmail.mobile
     commands:
       - tapOn: "Write your message.*"
 # A tap on the WebView doesn't always take the focus from the Subject field
-# (on the iPad the body once went into Subject): drop the keyboard first.
+# (on the iPad the body once went into Subject); a second tap does.
+# (hideKeyboard fails here: the composer's keyboard has no dismiss key.)
 - runFlow:
     when:
       notVisible: "Write your message.*"
     commands:
-      - hideKeyboard
+      - tapOn:
+          point: "50%,50%"
       - waitForAnimationToEnd:
           timeout: 2000
       - tapOn:
diff --git a/.maestro/subflows/settings-page.yaml b/.maestro/subflows/settings-page.yaml
index 76812ef2..7b4c8800 100644
--- a/.maestro/subflows/settings-page.yaml
+++ b/.maestro/subflows/settings-page.yaml
@@ -31,6 +31,36 @@ appId: org.bulwarkmail.mobile
                 end: 50%,40%
                 duration: 600
 - tapOn: ${ROW}
+- waitForAnimationToEnd:
+    timeout: 5000
+# PROOF can be further down the page: scroll the page (the right-hand pane
+# on the iPad) until it shows.
+- runFlow:
+    when:
+      true: ${DEVICE == 'tablet'}
+    commands:
+      - repeat:
+          while:
+            notVisible: ${PROOF}
+          times: 6
+          commands:
+            - swipe:
+                start: 75%,80%
+                end: 75%,40%
+                duration: 600
+- runFlow:
+    when:
+      true: ${DEVICE != 'tablet'}
+    commands:
+      - repeat:
+          while:
+            notVisible: ${PROOF}
+          times: 6
+          commands:
+            - swipe:
+                start: 50%,80%
+                end: 50%,40%
+                duration: 600
 - extendedWaitUntil:
     visible: ${PROOF}
     timeout: 20000