feat: log why the iOS notification extension falls back to the placeholder

.github/workflows/e2e-ios.yml

@@ -44,8 +44,7 @@ on:
     types: [published]
 
 concurrency:
-  # Per branch and set of legs: a perf run doesn't cancel a feature run.
+  group: e2e-ios-${{ github.ref }}
-  group: e2e-ios-${{ github.ref }}-${{ inputs.legs || 'all' }}
   cancel-in-progress: true
 
 env:
@@ -122,11 +121,6 @@ jobs:
       - name: Build for the simulator
         env:
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          # The bundle times each module's evaluation for the perf leg, and
-          # Metro writes which id is which module (metro.config.js; a branch
-          # without that support ignores both).
-          BULWARK_MODULE_TIMINGS: '1'
-          BULWARK_MODULE_MAP: ${{ runner.temp }}/module-map.json
         run: |
           WORKSPACE=$(ls -d ios/*.xcworkspace | head -1)
           SCHEME=$(basename "$WORKSPACE" .xcworkspace)
@@ -161,13 +155,7 @@ jobs:
           codesign -d --entitlements - "$APP_PATH" 2>&1 | head -20 || true
           # Packed as a tar: artifacts drop the executable bit, which would
           # leave a reused app unable to launch.
-          tar -C build/Build/Products/Release-iphonesimulator -cf "$RUNNER_TEMP/simulator-app.tar" BulwarkMobile.app
+          tar -C build/Build/Products/Release-iphonesimulator -czf "$RUNNER_TEMP/simulator-app.tar.gz" BulwarkMobile.app
-          if [ -f "$RUNNER_TEMP/module-map.json" ]; then
-            tar -C "$RUNNER_TEMP" -rf "$RUNNER_TEMP/simulator-app.tar" module-map.json
-          else
-            echo "no module map (branch without module timings)"
-          fi
-          gzip -f "$RUNNER_TEMP/simulator-app.tar"
           ls -la "$RUNNER_TEMP/simulator-app.tar.gz"
 
       - name: Upload the simulator app
@@ -337,7 +325,7 @@ jobs:
           if [ -d "$RUNNER_TEMP/base/app/BulwarkMobile.app" ]; then
             APPS=(--app "base=$RUNNER_TEMP/base/app/BulwarkMobile.app" "${APPS[@]}")
           fi
-          node scripts/e2e/perf.mjs "${APPS[@]}" --rounds "${{ inputs.perf_rounds || 5 }}" --cold 5 \
+          node scripts/e2e/perf.mjs "${APPS[@]}" --rounds "${{ inputs.perf_rounds || 5 }}" --cold 3 \
             --flows "$(ls "$GITHUB_WORKSPACE"/.maestro/perf/[0-9]-*.yaml | paste -sd, -)" --out "$OUT"
 
       - name: Upload results

.github/workflows/release-android.yml

@@ -441,7 +441,6 @@ jobs:
           cp android/app/build/outputs/mapping/playRelease/mapping.txt "$MAPPING"
           echo "aab=$AAB" >> "$GITHUB_OUTPUT"
           echo "mapping=$MAPPING" >> "$GITHUB_OUTPUT"
-          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
 
       - uses: actions/upload-artifact@v4
         with:
@@ -451,11 +450,11 @@ jobs:
             ${{ steps.artifact.outputs.mapping }}
           if-no-files-found: error
 
-      # Runs once PLAY_SERVICE_ACCOUNT_JSON is set (Play only accepts API
+      # Runs once PLAY_SERVICE_ACCOUNT_JSON is set. Play only accepts API
-      # uploads after the first bundle was uploaded by hand in the Console).
+      # uploads after the first bundle was uploaded by hand in the Console, and
-      # Every release goes out to the internal and closed (beta) testers right
+      # releases of an app that was never published must be drafts; switch
-      # away; closed testing may wait for Google's review first.
+      # `status` to `completed` after the first production release.
-      - name: Upload to Google Play (internal and closed testing)
+      - name: Upload to Google Play (internal testing, draft)
         if: env.PLAY_SERVICE_ACCOUNT_JSON != ''
         uses: r0adkll/upload-google-play@v1
         with:
@@ -463,6 +462,5 @@ jobs:
           packageName: org.bulwarkmail.mobile
           releaseFiles: ${{ steps.artifact.outputs.aab }}
           mappingFile: ${{ steps.artifact.outputs.mapping }}
-          releaseName: ${{ steps.artifact.outputs.version }}
+          track: internal
-          tracks: internal,beta
+          status: draft
-          status: completed

.maestro/features/02-read-messages.yaml

@@ -44,9 +44,7 @@ tags:
     visible: ".*q3-report.pdf.*"
     timeout: 20000
 - takeScreenshot: read-04-attachment
-# The message's attachment chip, labelled with the file name alone (on the
+- tapOn: ".*q3-report.pdf.*"
-# iPad the list row next to it mentions the name in its longer label).
-- tapOn: "q3-report.pdf"
 - extendedWaitUntil:
     visible: "Share"
     timeout: 30000
@@ -55,11 +53,9 @@ tags:
 - takeScreenshot: read-05-attachment-preview
 - assertVisible: "q3-report.pdf"
 - tapOn: "Close"
-# Back on the message (the iPad pane has a quick reply instead of Reply All).
 - extendedWaitUntil:
-    notVisible: "Share"
+    visible: "Reply All"
     timeout: 10000
-- assertVisible: ".*q3-report.pdf.*"
 - runFlow: ../subflows/close-message.yaml
 
 # A thread (Projects/Alpha)

.maestro/features/03-compose-send.yaml

@@ -21,12 +21,13 @@ tags:
 - runFlow:
     file: ../subflows/compose-body.yaml
     env:
-      FROM_SUBJECT: "yes"
       BODY: "Hello from the iOS simulator test."
 - takeScreenshot: compose-01-filled
 
 # The attach sheet offers its options one by one (it used to be a single
-# accessibility element, and picking one opened no picker on iOS).
+# accessibility element). The system photo and file pickers run in another
+# process that XCTest can't drive, so a picked attachment is covered by the
+# forward in 04-incoming-reply-forward instead.
 - tapOn: "Attach"
 - extendedWaitUntil:
     visible: "Photos & Videos"
@@ -34,54 +35,28 @@ tags:
 - assertVisible: "Camera"
 - assertVisible: "Files"
 - takeScreenshot: compose-02-attach-sheet
-- evalScript: ${output.pickPhoto = ORIENTATION != 'landscape'}
+- tapOn: "Photos & Videos"
-# The system photo picker runs in another process: XCTest sees none of its
-# elements, but taps by position reach it. Pick the first photo (the app
-# icon, added by boot-sim.sh) and confirm with the check mark. The iPad in
-# landscape lays the picker out differently, so it only closes the sheet.
-- runFlow:
-    when:
-      true: ${!output.pickPhoto}
-    commands:
-      - tapOn: "Cancel"
-- runFlow:
-    when:
-      true: ${output.pickPhoto}
-    commands:
-      - tapOn: "Photos & Videos"
-      - extendedWaitUntil:
-          notVisible: "Draft saved|New Message"
-          timeout: 10000
-          optional: true
-      - waitForAnimationToEnd:
-          timeout: 5000
-      - takeScreenshot: compose-03-photo-picker
-      - runFlow:
-          when:
-            true: ${DEVICE == 'tablet'}
-          commands:
-            - tapOn:
-                point: "44%,33%"
-            - waitForAnimationToEnd:
-                timeout: 2000
-            - tapOn:
-                point: "90%,26%"
-      - runFlow:
-          when:
-            true: ${DEVICE != 'tablet'}
-          commands:
-            - tapOn:
-                point: "16%,25%"
-            - waitForAnimationToEnd:
-                timeout: 2000
-            - tapOn:
-                point: "90%,13%"
-- extendedWaitUntil:
-    visible: "New Message"
-    timeout: 20000
 - waitForAnimationToEnd:
     timeout: 5000
-- takeScreenshot: compose-04-with-photo
+- takeScreenshot: compose-03-photo-picker
+# Dismiss the picker sheet.
+- swipe:
+    start: 50%,12%
+    end: 50%,95%
+    duration: 400
+- waitForAnimationToEnd:
+    timeout: 3000
+- runFlow:
+    when:
+      notVisible: "New Message"
+    commands:
+      - swipe:
+          start: 50%,12%
+          end: 50%,95%
+          duration: 400
+- extendedWaitUntil:
+    visible: "New Message"
+    timeout: 10000
 
 - tapOn: "Send"
 - extendedWaitUntil:
@@ -92,10 +67,3 @@ tags:
     file: ../subflows/assert-delivered.yaml
     env:
       SUBJECT: ${output.subject}
-- runFlow:
-    when:
-      true: ${output.pickPhoto}
-    commands:
-      - assertTrue:
-          condition: ${output.helper.attachments.length >= 1}
-          label: "${output.subject} carries the picked photo"

.maestro/features/06-swipe-undo.yaml

@@ -6,21 +6,16 @@ tags:
   - features
 ---
 - runFlow: ../subflows/signed-in.yaml
-- scrollUntilVisible:
-    element: ".*Grüße aus München.*"
-    direction: DOWN
-    centerElement: true
-    timeout: 20000
 - swipe:
     from: ".*Grüße aus München.*"
     direction: LEFT
     duration: 400
-# The undo bar shows for 5 s; when it goes, the Compose button slides into
+- extendedWaitUntil:
-# its place, and a late tap on UNDO opens the composer. So tap at once and
+    visible: "Email archived"
-# check the rest afterwards.
+    timeout: 10000
-- tapOn:
+- takeScreenshot: swipe-01-archived
-    text: "UNDO"
+- assertNotVisible: ".*Grüße aus München.*"
-    waitToSettleTimeoutMs: 500
+- tapOn: "UNDO"
 - extendedWaitUntil:
     visible: ".*Grüße aus München.*"
     timeout: 15000

.maestro/features/07-move-delete-tag.yaml

@@ -21,16 +21,12 @@ tags:
 - extendedWaitUntil:
     visible: "Move to..."
     timeout: 10000
-- tapOn:
+- tapOn: "Projects"
-    text: "Projects"
+- extendedWaitUntil:
-    # The undo bar shows for 5 s: don't spend them waiting for the screen to settle.
+    visible: "Moved to Projects"
-    waitToSettleTimeoutMs: 500
+    timeout: 15000
 - takeScreenshot: actions-02-moved
-# Tap UNDO at once (see 06-swipe-undo: a late tap opens the composer).
+- tapOn: "UNDO"
-- tapOn:
-    text: "UNDO"
-    # The undo bar shows for 5 s: don't spend them waiting for the screen to settle.
-    waitToSettleTimeoutMs: 500
 - runFlow: ../subflows/close-message.yaml
 - extendedWaitUntil:
     visible: ".*Weekly digest.*"
@@ -42,34 +38,27 @@ tags:
     env:
       SUBJECT: Weekly digest
 - takeScreenshot: actions-03a-before-delete
-- tapOn:
+- tapOn: "Delete"
-    text: "Delete"
+- waitForAnimationToEnd:
-    # The undo bar shows for 5 s: don't spend them waiting for the screen to settle.
+    timeout: 3000
-    waitToSettleTimeoutMs: 500
+- takeScreenshot: actions-03b-after-delete
+- extendedWaitUntil:
+    visible: "Email moved to Trash"
+    timeout: 15000
 - takeScreenshot: actions-03-deleted
-- tapOn:
+- tapOn: "UNDO"
-    text: "UNDO"
-    # The undo bar shows for 5 s: don't spend them waiting for the screen to settle.
-    waitToSettleTimeoutMs: 500
 - runFlow: ../subflows/close-message.yaml
 - extendedWaitUntil:
     visible: ".*Weekly digest.*"
     timeout: 15000
 
-# Select from the list and star, then unstar. On a phone the row can be
+# Select from the list and star, then unstar
-# below the fold (earlier runs left mail on top).
-- scrollUntilVisible:
-    element: ".*Grüße aus München.*"
-    direction: DOWN
-    centerElement: true
-    timeout: 20000
 - longPressOn: ".*Grüße aus München.*"
 - extendedWaitUntil:
     visible: "Clear selection"
     timeout: 10000
 - takeScreenshot: actions-04-selected
-# Star (or Unstar, when an earlier run left it starred), then toggle back.
+- tapOn: "Star"
-- tapOn: "Star|Unstar"
 # A bulk action ends selection mode by itself.
 - runFlow:
     when:

.maestro/features/08-scheduled-send.yaml

@@ -21,7 +21,6 @@ tags:
 - runFlow:
     file: ../subflows/compose-body.yaml
     env:
-      FROM_SUBJECT: "yes"
       BODY: "Scheduled from the iOS simulator test."
 - tapOn: "Schedule send"
 - extendedWaitUntil:

.maestro/features/09-calendar.yaml

@@ -12,7 +12,13 @@ tags:
 - extendedWaitUntil:
     visible: ".*Would Like to Send You Notifications.*|Go to today"
     timeout: 30000
-- runFlow: ../subflows/allow-notifications.yaml
+- runFlow:
+    when:
+      visible: ".*Would Like to Send You Notifications.*"
+    commands:
+      - tapOn:
+          text: "Allow"
+          optional: true
 - extendedWaitUntil:
     visible: "Go to today"
     timeout: 30000
@@ -41,33 +47,16 @@ 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
-- repeat:
+- tapOn: "Add reminder"
-    while:
-      notVisible: "15 minutes before"
-    times: 2
-    commands:
-      - tapOn: "Add reminder"
-      - waitForAnimationToEnd:
-          timeout: 3000
-- 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: "Save"
+    notVisible: "New event"
     timeout: 20000
 
 # Find it in the schedule and open it

.maestro/features/11-files.yaml

@@ -44,14 +44,7 @@ tags:
     timeout: 20000
 - takeScreenshot: files-04-folder-created
 - longPressOn: ".*${output.folder}.*"
-- repeat:
+- tapOn: "Delete"
-    while:
-      notVisible: "Delete this item.*"
-    times: 3
-    commands:
-      - tapOn: "Delete"
-      - waitForAnimationToEnd:
-          timeout: 3000
 - extendedWaitUntil:
     visible: "Delete this item.*"
     timeout: 10000

.maestro/features/12-settings.yaml

@@ -12,27 +12,27 @@ tags:
     timeout: 20000
 - takeScreenshot: settings-00-list
 - runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: account, ROW: ".*@example.org, .*", PROOF: "Logged-in accounts|Display Name"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: language, ROW: "Language, Region & Time, .*", Q: "Language", PROOF: "Date Format"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: language, ROW: "Language, Region & Time, .*", PROOF: "Date Format"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: notifications, ROW: "Notifications, .*", Q: "Notifications", PROOF: "Email Notifications"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: notifications, ROW: "Notifications, .*", PROOF: "Email Notifications"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: appearance, ROW: "Appearance, .*", Q: "Appearance", PROOF: "Choose your preferred color scheme"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: appearance, ROW: "Appearance, .*", PROOF: "Choose your preferred color scheme"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: layout, ROW: "Layout, .*", Q: "Layout", PROOF: "Tune the email list interactions for mobile."}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: layout, ROW: "Layout, .*", PROOF: "Tune the email list interactions for mobile."}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: reading, ROW: "Reading, .*", Q: "Reading", PROOF: "Mark as Read"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: reading, ROW: "Reading, .*", PROOF: "Mark as Read"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: composing, ROW: "Composing, .*", Q: "Composing", PROOF: "Composer"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: composing, ROW: "Composing, .*", PROOF: "Composer"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: identities, ROW: "Identities, .*", Q: "Identities", PROOF: "Sending Identities"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: identities, ROW: "Identities, .*", PROOF: "Sending Identities"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: vacation, ROW: "Out of Office, .*", Q: "Office", PROOF: "Reply automatically"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: vacation, ROW: "Out of Office, .*", PROOF: "Reply automatically"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: filters, ROW: "Filters, .*", Q: "Filters", PROOF: "Email Filters"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: filters, ROW: "Filters, .*", PROOF: "Email Filters"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: templates, ROW: "Templates, .*", Q: "Templates", PROOF: "Email Templates"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: templates, ROW: "Templates, .*", PROOF: "Email Templates"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: folders, ROW: "Folders, .*", Q: "Folders", PROOF: ".*Inbox.*"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: folders, ROW: "Folders, .*", PROOF: ".*Inbox.*"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: tags, ROW: "Tags, .*", Q: "Tags", PROOF: "Email Tags"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: tags, ROW: "Tags, .*", PROOF: "Email Tags"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: downloads, ROW: "Downloads, .*", Q: "Downloads", PROOF: "Email .*eml.* filename"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: downloads, ROW: "Downloads, .*", PROOF: "Email .*eml.* filename"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: security, ROW: "Security, .*", Q: "Security", PROOF: "Account Security|Detecting server capabilities.*"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: security, ROW: "Security, .*", PROOF: "Account Security|Detecting server capabilities.*"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: content, ROW: "Content & Senders, .*", Q: "Content", PROOF: "External Content"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: content, ROW: "Content & Senders, .*", PROOF: "External Content"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: calendar, ROW: "Calendar, .*", Q: "Calendar", PROOF: "Default view"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: calendar, ROW: "Calendar, .*", PROOF: "Default view"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: contacts, ROW: "Contacts, .*", Q: "Contacts", PROOF: "Group by first letter"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: contacts, ROW: "Contacts, .*", PROOF: "Group by first letter"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: files, ROW: "Files, .*", Q: "Files", PROOF: "Default View"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: files, ROW: "Files, .*", PROOF: "Default View"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: sidebar-apps, ROW: "Sidebar Apps, .*", Q: "Sidebar", PROOF: "Keep Apps Loaded"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: sidebar-apps, ROW: "Sidebar Apps, .*", PROOF: "Keep Apps Loaded"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: themes, ROW: "Themes, .*", Q: "Themes", PROOF: "The default light and dark palettes."}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: themes, ROW: "Themes, .*", PROOF: "The default light and dark palettes."}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: storage, ROW: "Storage & backup, .*", Q: "Storage", PROOF: "Offline mail.*"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: storage, ROW: "Storage & backup, .*", PROOF: "Offline mail.*"}}
-- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: about, ROW: "About, .*", Q: "About", PROOF: "This device"}}
+- runFlow: {file: ../subflows/settings-page.yaml, env: {NAME: about, ROW: "About, .*", PROOF: "This device"}}
 - tapOn:
     id: tab-mail

.maestro/push/01-notification.yaml

@@ -1,13 +1,8 @@
-# Push on iOS: the relay's payload carries only ids and a placeholder text.
+# Push on iOS: the relay's payload carries only ids; the notification service
-# A tap opens the message, with the app running and from a cold start. The
+# extension (plugins/ios-push) fetches sender and subject before the banner
-# helper sends the message as userb and pushes the relay's payload with
+# shows. A tap opens the message, with the app running and from a cold start.
-# simctl, so this needs no APNs key.
+# The helper sends the message as userb and pushes with simctl, so this needs
-#
+# no APNs key.
-# simctl push hands the payload to the simulator as a local notification
-# request: the notification service extension (plugins/ios-push), which
-# puts sender and subject in, never runs that way (the log shows no
-# NotificationService process). So the banner shows the placeholder here;
-# the extension needs a real APNs push to be tested.
 appId: org.bulwarkmail.mobile
 name: Push notification on iOS
 tags:
@@ -35,43 +30,38 @@ tags:
     timeout: 3000
 - pressKey: Home
 
-# 1. The banner shows (and what it says).
+- evalScript: ${output.subject = 'E2E push ' + Date.now()}
-- evalScript: ${output.subject0 = 'E2E push banner ' + Date.now()}
 - runScript:
     file: ../scripts/helper.js
     env:
-      CALL: /simpush?to=${ACCOUNT}&subject=${encodeURIComponent(output.subject0)}
+      CALL: /simpush?to=${ACCOUNT}&subject=${encodeURIComponent(output.subject)}
+# The banner shows for a few seconds: catch it with either text, then check.
 - extendedWaitUntil:
-    visible: ".*${output.subject0}.*|.*New message.*"
+    visible: ".*${output.subject}.*|.*New message.*"
     timeout: 30000
 - takeScreenshot: push-01-banner
-# Let it go, so the next tap can't hit this one.
+# Sender and subject come from the extension, not the relay.
-- extendedWaitUntil:
+- assertVisible: ".*User B.*"
-    notVisible: ".*${output.subject0}.*|.*New message.*"
+- assertNotVisible: ".*New message.*"
-    timeout: 20000
+- tapOn: ".*${output.subject}.*"
-
-# 2. A tap opens the message, app in the background. The banner shows for a
-# few seconds and finding it takes Maestro about as long; taps on the lock
-# screen list do nothing on these simulators. So tap where the banner
-# appears, right after the push (push-and-tap.yaml).
-- evalScript: ${output.subject = 'E2E push ' + Date.now()}
-- runFlow:
-    file: ../subflows/push-and-tap.yaml
-    env:
-      SUBJECT: ${output.subject}
 - extendedWaitUntil:
     visible: "Reply All"
     timeout: 60000
 - assertVisible: ".*${output.subject}.*"
 - takeScreenshot: push-02-opened-warm
 
-# 3. The same from a cold start: the app isn't running.
+# Cold start: the app isn't running when the notification is tapped.
 - stopApp
 - evalScript: ${output.subject2 = 'E2E push cold ' + Date.now()}
-- runFlow:
+- runScript:
-    file: ../subflows/push-and-tap.yaml
+    file: ../scripts/helper.js
     env:
-      SUBJECT: ${output.subject2}
+      CALL: /simpush?to=${ACCOUNT}&subject=${encodeURIComponent(output.subject2)}
+- extendedWaitUntil:
+    visible: ".*${output.subject2}.*"
+    timeout: 30000
+- takeScreenshot: push-03-banner-cold
+- tapOn: ".*${output.subject2}.*"
 - extendedWaitUntil:
     visible: "Reply All"
     timeout: 90000

.maestro/subflows/allow-notifications.yaml

@@ -1,21 +0,0 @@
-# The app asks for notification permission now and then (calendar
-# reminders, push). The system alert covers the whole app, so XCTest sees
-# nothing else until it is answered: allow it when it is up. Taps on system
-# alerts miss in landscape, so answer it in portrait.
-appId: org.bulwarkmail.mobile
----
-- runFlow:
-    when:
-      visible: ".*Would Like to Send You Notifications.*"
-    commands:
-      - setOrientation: PORTRAIT
-      - waitForAnimationToEnd:
-          timeout: 3000
-      - tapOn:
-          text: "Allow"
-          optional: true
-      - runFlow:
-          when:
-            true: ${ORIENTATION == 'landscape'}
-          commands:
-            - setOrientation: LANDSCAPE_LEFT

.maestro/subflows/compose-body.yaml

@@ -1,41 +1,19 @@
 # In the composer: type BODY into the editor. The rich editor is a WebView
 # whose placeholder is CSS, so it may not be exposed; then tap the middle of
 # the screen, which is the body area below Subject (above the keyboard).
-# FROM_SUBJECT=yes: the Subject field has the focus; Return there moves it
-# to the body (an iPad in landscape shows hardly any body with the keyboard
-# up, so there is nothing to tap).
 appId: org.bulwarkmail.mobile
 ---
 - runFlow:
     when:
-      true: ${FROM_SUBJECT == 'yes'}
+      visible: "Write your message.*"
     commands:
-      - pressKey: Enter
+      - tapOn: "Write your message.*"
-      - waitForAnimationToEnd:
-          timeout: 2000
-      - inputText: ${BODY}
 - runFlow:
     when:
-      true: ${FROM_SUBJECT != 'yes'}
+      notVisible: "Write your message.*"
     commands:
-      - runFlow:
+      - tapOn:
-          when:
+          point: "50%,50%"
-            visible: "Write your message.*"
+- waitForAnimationToEnd:
-          commands:
+    timeout: 3000
-            - tapOn: "Write your message.*"
+- inputText: ${BODY}
-      # A tap on the WebView doesn't always take the focus from the Subject field
-      # (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:
-            - tapOn:
-                point: "50%,50%"
-            - waitForAnimationToEnd:
-                timeout: 2000
-            - tapOn:
-                point: "50%,50%"
-      - waitForAnimationToEnd:
-          timeout: 3000
-      - inputText: ${BODY}

.maestro/subflows/confirm-link.yaml

@@ -10,10 +10,9 @@ appId: org.bulwarkmail.mobile
       visible: "Open in .*Bulwark Mobile.*"
     commands:
       - tapOn: "Open"
-# Right after a sign-out the app can take a while to get to the link.
 - extendedWaitUntil:
     visible: "Sign in with a link.|Open the sign-in page of.*"
-    timeout: 60000
+    timeout: 20000
 - takeScreenshot: link-confirm-prompt
 - tapOn:
     text: "Continue"

.maestro/subflows/inbox.yaml

@@ -18,9 +18,5 @@ appId: org.bulwarkmail.mobile
     visible:
       id: email-row
     timeout: 60000
-# Rows are one element: sender, subject and preview together. Mail the
+# Rows are one element: sender, subject and preview together.
-# tests sent earlier can push the seeded row below the fold.
+- assertVisible: ${INBOX_TEXT || '.*Your verification code.*'}
-- scrollUntilVisible:
-    element: ${INBOX_TEXT || '.*Your verification code.*'}
-    direction: DOWN
-    timeout: 30000

.maestro/subflows/manual-server.yaml

@@ -14,18 +14,6 @@ appId: org.bulwarkmail.mobile
       TAP: "no"
       TEXT: ${HOST}
 - tapOn: "Continue"
-- extendedWaitUntil:
-    visible: "Sign in with a password instead"
-    timeout: 20000
-    optional: true
-# Once in a while the tap doesn't reach the button (it moves as the keyboard
-# goes away): tap again if the form is still there.
-- runFlow:
-    when:
-      visible:
-        id: login-server-input
-    commands:
-      - tapOn: "Continue"
 - extendedWaitUntil:
     visible: "Sign in with a password instead"
     timeout: 20000

.maestro/subflows/open-message.yaml

@@ -1,36 +1,13 @@
 # From a message list: open the message whose row mentions SUBJECT.
-# A row near the bottom can count as visible while the phone's tab bar
-# covers it (the tap then opens another tab): on the phone, scroll it to the
-# middle. The iPad's list is a column Maestro's scroll (in the middle of the
-# screen) doesn't reach; its rows fit on screen.
 appId: org.bulwarkmail.mobile
 ---
-- runFlow:
+- scrollUntilVisible:
-    when:
+    element: ".*${SUBJECT}.*"
-      true: ${DEVICE != 'tablet'}
+    direction: DOWN
-    commands:
+    timeout: 30000
-      - scrollUntilVisible:
-          element: ".*${SUBJECT}.*"
-          direction: DOWN
-          centerElement: true
-          visibilityPercentage: 100
-          timeout: 30000
-- runFlow:
-    when:
-      true: ${DEVICE == 'tablet'}
-    commands:
-      - scrollUntilVisible:
-          element: ".*${SUBJECT}.*"
-          direction: DOWN
-          timeout: 30000
-# A tap while the list still moves lands on another row.
-- waitForAnimationToEnd:
-    timeout: 5000
 - tapOn: ".*${SUBJECT}.*"
-# The message toolbar's "more" button: "Reply All" shows on the phone, but
-# the iPad pane has a quick reply box instead for mail to one recipient.
 - extendedWaitUntil:
-    visible: "more"
+    visible: "Reply All"
     timeout: 20000
 - waitForAnimationToEnd:
     timeout: 5000

.maestro/subflows/push-and-tap.yaml

@@ -1,23 +0,0 @@
-# Push a message with SUBJECT to ACCOUNT (helper /simpush) and tap its banner
-# where it appears, at once (it shows for a few seconds, about as long as
-# Maestro takes to find it). If the tap came too early or too late, push
-# again: up to three tries until the message is open.
-appId: org.bulwarkmail.mobile
----
-- repeat:
-    while:
-      notVisible: "Reply All"
-    times: 3
-    commands:
-      - runScript:
-          file: ../scripts/helper.js
-          env:
-            CALL: /simpush?to=${ACCOUNT}&subject=${encodeURIComponent(SUBJECT)}
-      - tapOn:
-          point: "50%,9%"
-          waitToSettleTimeoutMs: 500
-          retryTapIfNoChange: false
-      - extendedWaitUntil:
-          visible: "Reply All"
-          timeout: 30000
-          optional: true

.maestro/subflows/settings-page.yaml

@@ -1,81 +1,18 @@
-# Settings list: find the row ROW (regex on "Title, summary"), open it,
+# Settings list: scroll to the row ROW (regex on "Title, summary"), open it,
-# check PROOF shows, screenshot, and go back on a phone.
+# 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.
-# Rows count as visible while the phone's tab bar or header covers them or
-# while they hang half off the iPad's screen, and a tap then misses; the
-# iPad's list is a left column Maestro's scroll (in the middle of the screen)
-# doesn't reach. So search for the page (Q, a word of its title): the row
-# then sits right under the search box. The account card (no Q) is always
-# at the top.
 appId: org.bulwarkmail.mobile
 ---
-- runFlow:
+- repeat:
-    when:
+    while:
-      true: ${!!Q}
+      notVisible: ${ROW}
+    times: 10
     commands:
-      - tapOn: "Search settings"
+      - swipe:
-      - eraseText: 40
+          start: "${DEVICE == 'tablet' ? '18%,80%' : '50%,80%'}"
-      - inputText: ${Q}
+          end: "${DEVICE == 'tablet' ? '18%,40%' : '50%,40%'}"
-      - waitForAnimationToEnd:
+          duration: 600
-          timeout: 3000
-      # Now and then a typed character goes missing: type it again.
-      - runFlow:
-          when:
-            notVisible: ${ROW}
-          commands:
-            - tapOn: "Search settings"
-            - eraseText: 40
-            - inputText: ${Q}
-            - waitForAnimationToEnd:
-                timeout: 3000
-# A tap while the list still coasts from the swipe only stops it.
-- waitForAnimationToEnd:
-    timeout: 5000
 - tapOn: ${ROW}
-- waitForAnimationToEnd:
-    timeout: 5000
-# On the phone the page replaces the list: make sure it opened before
-# scrolling (else the swipes below scroll the list away).
-- runFlow:
-    when:
-      true: ${DEVICE != 'tablet'}
-    commands:
-      - runFlow:
-          when:
-            notVisible: "Back"
-          commands:
-            - tapOn: ${ROW}
-      - extendedWaitUntil:
-          visible: "Back"
-          timeout: 10000
-# 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

.maestro/subflows/sign-out.yaml

@@ -1,30 +1,12 @@
 # Signed in: sign out of the active account from the end of Settings.
-# On the iPad the Settings list is the left column; scroll that one.
 appId: org.bulwarkmail.mobile
 ---
 - tapOn:
     id: tab-settings
-- runFlow:
+- scrollUntilVisible:
-    when:
+    element: "Sign out"
-      true: ${DEVICE == 'tablet'}
+    direction: DOWN
-    commands:
+    timeout: 30000
-      - repeat:
-          while:
-            notVisible: "Sign out"
-          times: 12
-          commands:
-            - swipe:
-                start: 30%,85%
-                end: 30%,30%
-                duration: 500
-- runFlow:
-    when:
-      true: ${DEVICE != 'tablet'}
-    commands:
-      - scrollUntilVisible:
-          element: "Sign out"
-          direction: DOWN
-          timeout: 30000
 - tapOn: "Sign out"
 - extendedWaitUntil:
     visible: "The account is removed from this device.*"

.maestro/subflows/signed-in.yaml

@@ -7,13 +7,6 @@ appId: org.bulwarkmail.mobile
       notifications: allow
       photos: allow
       camera: allow
-# Answer the notification prompt (if the app asks) before turning to
-# landscape: rotated, taps on system alerts miss.
-- setOrientation: PORTRAIT
-- extendedWaitUntil:
-    visible: "Enter server details manually|Inbox|.*Would Like to Send You Notifications.*"
-    timeout: 120000
-- runFlow: allow-notifications.yaml
 - runFlow:
     when:
       true: ${ORIENTATION == 'landscape'}
@@ -21,7 +14,7 @@ appId: org.bulwarkmail.mobile
       - setOrientation: LANDSCAPE_LEFT
 - extendedWaitUntil:
     visible: "Enter server details manually|Inbox"
-    timeout: 30000
+    timeout: 120000
 - runFlow:
     when:
       visible: "Enter server details manually"
@@ -30,7 +23,6 @@ appId: org.bulwarkmail.mobile
           file: password-sign-in.yaml
           env:
             LOGIN: ${ACCOUNT}@example.org
-- runFlow: allow-notifications.yaml
 - tapOn:
     id: tab-mail
 - runFlow: go-to-inbox.yaml

.maestro/subflows/type-web.yaml

@@ -1,10 +1,8 @@
 # Type TEXT into a web page field found by its placeholder HINT (the sign-in
 # pages in the auth session), and check it arrived as typed. Now and then a
-# stray character lands in front of it on the CI simulator; then erase the
+# stray character lands in front of it on the CI simulator; then select the
-# field and type again. The caret is still at the end of what was just
+# field's text and type over it. SECRET=yes skips the check (a password
-# typed, so eraseText (which deletes before the caret) empties it; selecting
+# field shows dots).
-# the text with a long press didn't work and appended instead. SECRET=yes
-# skips the check (a password field shows dots).
 appId: org.bulwarkmail.mobile
 ---
 - tapOn: ${HINT}
@@ -15,13 +13,13 @@ appId: org.bulwarkmail.mobile
     when:
       true: ${SECRET != 'yes'}
     commands:
-      - repeat:
+      - runFlow:
-          while:
+          when:
             notVisible: ${TEXT}
-          times: 2
           commands:
-            - eraseText: 150
+            - longPressOn: ".*${TEXT}.*"
-            - waitForAnimationToEnd:
+            - tapOn:
-                timeout: 2000
+                text: "Select All"
+                optional: true
             - inputText: ${TEXT}
-      - assertVisible: ${TEXT}
+            - assertVisible: ${TEXT}

App.tsx

@@ -94,7 +94,6 @@ import { useOfflineCacheStore } from './src/stores/offline-cache-store';
 import { useOutboxStore } from './src/stores/outbox-store';
 import { runOfflineSync } from './src/lib/offline-sync';
 import { spacing, typography, type ThemePalette } from './src/theme/tokens';
-import { perfEndAfterPaint, perfMarksEnabled, perfStart } from './src/lib/perf-marks';
 import { useColors } from './src/theme/colors';
 
 const Stack = createNativeStackNavigator<RootStackParamList>();
@@ -262,10 +261,6 @@ function MainTabsNavigator({ navigation }: NativeStackScreenProps<RootStackParam
       <PushOnboardingPrompt />
       <AppIconBadge />
     <Tab.Navigator
-      screenListeners={perfMarksEnabled() ? ({ route }) => ({
-        tabPress: () => perfStart('tab-switch'),
-        focus: () => perfEndAfterPaint('tab-switch', { to: route.name }),
-      }) : undefined}
       screenOptions={{
         headerShown: false,
         // Tabs out of view stop re-rendering until they are shown again.

VERSION

@@ -1 +1 @@
-0.1.86
+0.1.83

docs/android-release.md

@@ -228,11 +228,9 @@ The `play-bundle` job builds `bundlePlayRelease` for arm64-v8a, armeabi-v7a and
 x86_64 (Play splits the bundle per ABI), checks the signer, the package name and
 the permissions, and keeps the AAB and its R8 mapping as a workflow artifact.
 With the `PLAY_SERVICE_ACCOUNT_JSON` secret set (vault: "Google Play – service
-account bulwark-google-play-api") it also uploads the bundle and rolls it out
+account bulwark-google-play-api") it also uploads the bundle to the internal
-on the internal and closed (beta) testing tracks, so testers get every release
+testing track as a draft. Play only accepts API uploads once a first bundle has
-without a step in the Play Console; closed testing may wait for Google's
+been uploaded by hand in the Play Console.
-review. Play only accepts API uploads once a first bundle has been uploaded by
-hand in the Play Console.
 
 The `github` flavor stays on the old Firebase project until the app registers
 its new FCM token with the relay when the token changes; moving it before that

index.ts

@@ -6,10 +6,6 @@ import { registerWidgetTaskHandler } from 'react-native-android-widget';
 import { pushBackgroundTask } from './src/lib/push-background-task';
 import { widgetTaskHandler } from './src/widgets/task-handler';
 import { refreshWidgetsInBackground } from './src/widgets/sync';
-import { perfMark } from './src/lib/perf-marks';
-
-// Every import above has run: the bundle is loaded (performance harness).
-perfMark('bundle-loaded');
 import { markUiStarted } from './src/widgets/ui-presence';
 
 // Runs in a fresh headless JS runtime when BulwarkPushTaskService is started

metro.config.js

@@ -1,36 +1,5 @@
-const path = require('path');
-const fs = require('fs');
 const { getDefaultConfig } = require('expo/metro-config');
 
 const config = getDefaultConfig(__dirname);
 
-// Performance harness (the iOS simulator tests, .github/workflows/e2e-ios.yml):
-// with BULWARK_MODULE_TIMINGS set, the bundle times each module's
-// evaluation (scripts/perf/module-timings.js), and BULWARK_MODULE_MAP names
-// a file that receives the module ids with their source paths, so the
-// harness can tell which module is which. Release builds set neither.
-if (process.env.BULWARK_MODULE_TIMINGS) {
-  const basePolyfills = config.serializer.getPolyfills;
-  config.serializer.getPolyfills = (ctx) => [
-    ...basePolyfills(ctx),
-    path.join(__dirname, 'scripts/perf/module-timings.js'),
-  ];
-  const mapFile = process.env.BULWARK_MODULE_MAP;
-  if (mapFile) {
-    const baseFactory = config.serializer.createModuleIdFactory;
-    config.serializer.createModuleIdFactory = () => {
-      const idOf = baseFactory();
-      const names = {};
-      process.on('exit', () => {
-        try { fs.writeFileSync(mapFile, JSON.stringify(names)); } catch { /* best effort */ }
-      });
-      return (modulePath) => {
-        const id = idOf(modulePath);
-        names[id] = path.relative(__dirname, modulePath).split(path.sep).join('/');
-        return id;
-      };
-    };
-  }
-}
-
 module.exports = config;

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "bulwark-mobile",
-  "version": "0.1.86",
+  "version": "0.1.83",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "bulwark-mobile",
-      "version": "0.1.86",
+      "version": "0.1.83",
       "hasInstallScript": true,
       "license": "AGPL-3.0-only",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulwark-mobile",
-  "version": "0.1.86",
+  "version": "0.1.83",
   "license": "AGPL-3.0-only",
   "main": "index.ts",
   "scripts": {

scripts/e2e/helper.mjs

@@ -105,24 +105,9 @@ function simctl(args, input) {
   });
 }
 
-// simctl pbcopy times out now and then (seen on the iPad simulator); a
-// second or third try goes through.
-async function pbcopy(text) {
-  for (let attempt = 1; ; attempt++) {
-    try {
-      await simctl(['pbcopy', UDID], text);
-      return;
-    } catch (e) {
-      if (attempt >= 3) throw e;
-      log(`pbcopy attempt ${attempt} failed, trying again`);
-      await new Promise((r) => setTimeout(r, 2000));
-    }
-  }
-}
-
 async function deliver(link, how) {
   if (how === 'openurl') await simctl(['openurl', UDID, link]);
-  else if (how === 'pbcopy') await pbcopy(link);
+  else if (how === 'pbcopy') await simctl(['pbcopy', UDID], link);
   else if (how !== 'none') throw new Error(`unknown deliver=${how}`);
 }
 
@@ -413,7 +398,7 @@ const routes = {
     return { ok: true };
   },
   async '/clipboard'(q) {
-    await pbcopy(q.get('text') || '');
+    await simctl(['pbcopy', UDID], q.get('text') || '');
     return { ok: true };
   },
 };

scripts/e2e/perf.mjs

@@ -11,10 +11,7 @@
 //      stays signed in),
 //   2. cold-starts it `--cold` times: terminate, launch, wait for
 //      `inbox-rendered`; cold start = that mark's time minus the launch time
-//      taken on this machine (the simulator shares the host clock). The
+//      taken on this machine (the simulator shares the host clock),
-//      first launch after the install is much slower and swings a lot (iOS
-//      does its first-launch work for the new binary), so it is reported on
-//      its own as `first-start-*`; `cold-start-*` are the launches after it,
 //   3. runs the Maestro interaction flows once each (open messages, switch
 //      tabs, open compose, scroll), which produce the other marks. Each flow
 //      is its own run, so one that fails costs only its own metric.
@@ -104,14 +101,12 @@ function waitForMark(name, timeoutMs) {
 
 // ── steps ───────────────────────────────────────────────────────────────────
 const samples = []; // { label, metric, ms, round }
-const moduleRuns = {}; // label -> [{ total, top: { id: ms } }] (module-times marks)
 
-async function coldStart(label, round, first) {
+async function coldStart(label, round) {
   try { simctl('terminate', UDID, BUNDLE); } catch { /* not running */ }
   await sleep(1500);
   const pending = waitForMark('inbox-rendered', 120_000);
   const bundlePending = waitForMark('bundle-loaded', 120_000);
-  const modulesPending = waitForMark('module-times', 125_000);
   const t0 = Date.now();
   simctl('launch', UDID, BUNDLE, '-perfMarks', 'YES');
   const [mark, bundle] = await Promise.all([pending, bundlePending]);
@@ -119,33 +114,8 @@ async function coldStart(label, round, first) {
     console.log(`  ${label} cold start: no inbox-rendered mark within 120 s`);
     return;
   }
-  const kind = first ? 'first-start' : 'cold-start';
+  samples.push({ label, round, metric: 'cold-start-to-inbox', ms: mark.t - t0 });
-  // Builds made with BULWARK_MODULE_TIMINGS log how long each module took
+  if (bundle) samples.push({ label, round, metric: 'cold-start-to-bundle', ms: bundle.t - t0 });
-  // to evaluate, right after the first inbox (src/lib/perf-marks.ts).
-  const modules = await Promise.race([modulesPending, sleep(3000).then(() => null)]);
-  if (modules && !first) {
-    const top = {};
-    for (const pair of String(modules.top || '').split(',')) {
-      const [id, ms] = pair.split(':');
-      if (id) top[id] = Number(ms);
-    }
-    (moduleRuns[label] ||= []).push({ total: modules.total, top });
-  }
-  samples.push({ label, round, metric: `${kind}-to-inbox`, ms: mark.t - t0 });
-  if (bundle) samples.push({ label, round, metric: `${kind}-to-bundle`, ms: bundle.t - t0 });
-  // The start-up timeline: every mark between launch and the inbox, as time
-  // since launch, plus how long each persisted cache took to read and parse.
-  if (!first) {
-    for (const m of marks) {
-      if (m.t < t0 || m.t > mark.t || m.n === 'inbox-rendered' || m.n === 'bundle-loaded') continue;
-      const key = m.store ? `${m.n}:${m.store}` : m.n;
-      samples.push({ label, round, metric: `start:${key}`, ms: m.t - t0 });
-      if (m.n === 'hydrate') {
-        samples.push({ label, round, metric: `hydrate-read:${m.store}`, ms: m.readMs });
-        samples.push({ label, round, metric: `hydrate-parse:${m.store}`, ms: m.parseMs, kb: m.kb });
-      }
-    }
-  }
   console.log(`  ${label} cold start ${mark.t - t0} ms (bundle ${bundle ? bundle.t - t0 : '?'} ms, rows ${mark.rows})`);
   await sleep(3000);
 }
@@ -198,28 +168,7 @@ const scroll = labels.map((l) => {
   if (!xs.length) return null;
   return `${l}: median ${median(xs.map((s) => s.long))} long frames of ${median(xs.map((s) => s.frames))}, worst ${median(xs.map((s) => s.worst))} ms`;
 }).filter(Boolean);
-// The slowest modules at start-up per app, by median over the launches.
+const md = [...lines, '', ...scroll.map((s) => `- list-scroll ${s}`), ''].join('\n');
-const moduleSections = [];
-for (const app of apps) {
-  const runs = moduleRuns[app.label];
-  if (!runs?.length) continue;
-  let names = {};
-  try { names = JSON.parse(fs.readFileSync(path.join(path.dirname(app.path), 'module-map.json'), 'utf8')); } catch { /* no map */ }
-  const ids = new Set(runs.flatMap((r) => Object.keys(r.top)));
-  const rows = [...ids]
-    .map((id) => ({ id, ms: median(runs.map((r) => r.top[id] ?? 0)) }))
-    .sort((a, b) => b.ms - a.ms)
-    .slice(0, 30);
-  moduleSections.push(
-    `### Slowest modules at start-up: ${app.label} (own evaluation time, median of ${runs.length} launches; all modules ${median(runs.map((r) => r.total))} ms)`,
-    '',
-    '| module | ms |',
-    '|---|---|',
-    ...rows.map((r) => `| ${names[r.id] ?? `#${r.id}`} | ${r.ms} |`),
-    '',
-  );
-}
-const md = [...lines, '', ...scroll.map((s) => `- list-scroll ${s}`), '', ...moduleSections].join('\n');
 fs.writeFileSync(path.join(out, 'perf.json'), JSON.stringify({ apps, rounds, coldRuns, samples }, null, 1));
 fs.writeFileSync(path.join(out, 'perf.md'), md);
 console.log(md);
@@ -236,7 +185,7 @@ if (final && process.env.GITHUB_STEP_SUMMARY) fs.appendFileSync(process.env.GITH
       currentLabel = app.label;
       try { simctl('terminate', UDID, BUNDLE); } catch { /* not running */ }
       simctl('install', UDID, app.path);
-      for (let i = 0; i < coldRuns; i++) await coldStart(app.label, round, i === 0);
+      for (let i = 0; i < coldRuns; i++) await coldStart(app.label, round);
       const got = await runFlows(app.label);
       for (const m of got) {
         const metric = m.n === 'tab-switch' && m.to ? `tab-switch:${m.to}` : m.n;

scripts/e2e/run-flows.sh

@@ -34,20 +34,17 @@ maestro --version
 xcrun simctl io "$UDID" recordVideo --codec=h264 --force "$OUT/run.mp4" &
 RECORDER=$!
 
-# Warm-up: the XCTest driver takes minutes to start on a cold runner. When
+# Warm-up: the XCTest driver takes minutes to start on a cold runner.
-# it dies on the way (it does, now and then), a second try starts a new one
+WARMUP_START=$(date +%s)
-# instead of losing the whole leg.
+(cd "$OUT/screenshots" && capped maestro --device "$UDID" test \
-for attempt in 1 2; do
+  --debug-output "$RUNNER_TEMP/maestro-warmup" "$ROOT/.maestro/launch.yaml")
-  WARMUP_START=$(date +%s)
+STATUS=$?
-  (cd "$OUT/screenshots" && capped maestro --device "$UDID" test \
+echo "warm-up took $(( $(date +%s) - WARMUP_START )) s (status $STATUS)"
-    --debug-output "$RUNNER_TEMP/maestro-warmup-$attempt" "$ROOT/.maestro/launch.yaml")
+if [ $STATUS -ne 0 ]; then
-  STATUS=$?
+  echo "::group::Maestro warm-up log"
-  echo "warm-up $attempt took $(( $(date +%s) - WARMUP_START )) s (status $STATUS)"
+  find "$RUNNER_TEMP/maestro-warmup" -name 'maestro.log' -exec tail -n 300 {} \;
-  [ $STATUS -eq 0 ] && break
-  echo "::group::Maestro warm-up log $attempt"
-  find "$RUNNER_TEMP/maestro-warmup-$attempt" -name 'maestro.log' -exec tail -n 300 {} \;
   echo "::endgroup::"
-done
+fi
 
 if [ $STATUS -eq 0 ]; then
   ARGS=(

scripts/perf/module-timings.js

@@ -1,30 +0,0 @@
-// Metro polyfill for the performance harness (metro.config.js adds it only
-// when BULWARK_MODULE_TIMINGS is set at bundle time; release builds don't
-// have it). It wraps every module factory and adds up how long each module's
-// own code ran when it was first evaluated, without the modules it required
-// meanwhile. src/lib/perf-marks.ts logs the slowest ones at first inbox.
-(function (g) {
-  var define = g.__d;
-  if (typeof define !== 'function') return;
-  var now = typeof g.nativePerformanceNow === 'function'
-    ? g.nativePerformanceNow
-    : function () { return Date.now(); };
-  var times = {};
-  var stack = [];
-  g.__bulwarkModuleTimes = times;
-  g.__d = function (factory, moduleId, dependencyMap, verboseName) {
-    var timed = function () {
-      var start = now();
-      stack.push(0);
-      try {
-        return factory.apply(this, arguments);
-      } finally {
-        var total = now() - start;
-        var nested = stack.pop();
-        times[moduleId] = (times[moduleId] || 0) + (total - nested);
-        if (stack.length > 0) stack[stack.length - 1] += total;
-      }
-    };
-    return define(timed, moduleId, dependencyMap, verboseName);
-  };
-})(typeof globalThis !== 'undefined' ? globalThis : this);

src/api/__tests__/jmap-client.test.ts

@@ -8,7 +8,7 @@ vi.mock('expo-secure-store', () => ({
 }));
 
 import * as SecureStore from 'expo-secure-store';
-import { JMAPClient, AuthenticationError, InvalidTokenError, RateLimitError, parseHoldLimit } from '../jmap-client';
+import { JMAPClient, AuthenticationError, RateLimitError, parseHoldLimit } from '../jmap-client';
 import type { JMAPSession } from '../types';
 
 const MOCK_SESSION: JMAPSession = {
@@ -113,10 +113,8 @@ describe('JMAPClient', () => {
   });
 
   describe('connectWithToken', () => {
-    const TOKEN_SESSION = { ...MOCK_SESSION, username: 'user@example.com' };
-
     it('should use Bearer auth', async () => {
-      global.fetch = mockFetch([{ status: 200, json: TOKEN_SESSION }]) as any;
+      global.fetch = mockFetch([{ status: 200, json: MOCK_SESSION }]) as any;
 
       await client.connectWithToken('https://mail.example.com', 'my-token');
 
@@ -130,70 +128,6 @@ describe('JMAPClient', () => {
       );
       expect(client.isConnected).toBe(true);
     });
-
-    it('names the account after the session and remembers the token', async () => {
-      global.fetch = mockFetch([{ status: 200, json: TOKEN_SESSION }]) as any;
-
-      const { username, accountId } = await client.connectWithToken('https://mail.example.com/', 'my-token');
-
-      expect(username).toBe('user@example.com');
-      expect(accountId).toBe('user@example.com@mail.example.com');
-      const [key, stored] = vi.mocked(SecureStore.setItemAsync).mock.calls.at(-1)!;
-      expect(key).toContain('user_example.com');
-      expect(JSON.parse(stored)).toMatchObject({
-        serverUrl: 'https://mail.example.com',
-        username: 'user@example.com',
-        accessToken: 'my-token',
-      });
-      expect(client.usesPastedToken).toBe(true);
-    });
-
-    it('refuses a token the server rejects', async () => {
-      global.fetch = mockFetch([{ status: 401 }]) as any;
-
-      await expect(client.connectWithToken('https://mail.example.com', 'bad')).rejects.toThrow(InvalidTokenError);
-      expect(client.isConnected).toBe(false);
-    });
-
-    it('refuses a session that does not name the account', async () => {
-      global.fetch = mockFetch([{ status: 200, json: MOCK_SESSION }]) as any;
-
-      await expect(client.connectWithToken('https://mail.example.com', 'my-token')).rejects.toThrow('did not name the account');
-      expect(client.isConnected).toBe(false);
-    });
-
-    it('keeps a download host the server runs on another HTTPS origin', async () => {
-      global.fetch = mockFetch([{
-        status: 200,
-        json: {
-          ...TOKEN_SESSION,
-          apiUrl: 'https://api.fastmail.com/jmap/api/',
-          downloadUrl: 'https://www.fastmailusercontent.com/jmap/download/{accountId}/{blobId}/{name}?type={type}',
-          uploadUrl: 'https://api.fastmail.com/jmap/upload/{accountId}/',
-        },
-      }]) as any;
-
-      const { session } = await client.connectWithToken('https://api.fastmail.com', 'my-token');
-
-      expect(session.downloadUrl).toBe('https://www.fastmailusercontent.com/jmap/download/{accountId}/{blobId}/{name}?type={type}');
-      expect(session.uploadUrl).toBe('https://api.fastmail.com/jmap/upload/{accountId}/');
-    });
-
-    it('still moves self-reported internal hosts onto the server address', async () => {
-      global.fetch = mockFetch([{
-        status: 200,
-        json: {
-          ...TOKEN_SESSION,
-          apiUrl: 'http://localhost:8080/jmap/',
-          downloadUrl: 'http://localhost:8080/download/{accountId}/{blobId}/{name}?type={type}',
-        },
-      }]) as any;
-
-      const { session } = await client.connectWithToken('https://mail.example.com', 'my-token');
-
-      expect(session.apiUrl).toBe('https://mail.example.com/jmap/');
-      expect(session.downloadUrl).toBe('https://mail.example.com/download/{accountId}/{blobId}/{name}?type={type}');
-    });
   });
 
   describe('request', () => {

src/api/jmap-client.ts

@@ -177,12 +177,6 @@ export class JMAPClient {
     return !!this.credentials?.accessToken;
   }
 
-  // A pasted access token, as opposed to an OAuth bundle (which always names
-  // the token endpoint it renews at).
-  get usesPastedToken(): boolean {
-    return !!this.credentials?.accessToken && !this.credentials.tokenEndpoint;
-  }
-
   get isConnected(): boolean {
     return this.session !== null && this._accountId !== null;
   }
@@ -300,42 +294,15 @@ export class JMAPClient {
     return session;
   }
 
-  /**
+  async connectWithToken(serverUrl: string, accessToken: string): Promise<JMAPSession> {
-   * Access-token login (an API token the user pasted, e.g. from Fastmail).
-   * The token is the whole credential: it names the account, so the username
-   * comes from the session, and with no refresh token it lasts until the
-   * provider expires or revokes it.
-   */
-  async connectWithToken(
-    serverUrl: string,
-    accessToken: string,
-  ): Promise<{ session: JMAPSession; username: string; accountId: string }> {
     const baseUrl = serverUrl.replace(/\/+$/, '');
     this.credentials = { serverUrl: baseUrl, username: '', password: '', accessToken };
 
-    try {
+    this.session = this.rewriteSessionUrls(await this.fetchSession(baseUrl), baseUrl);
-      this.session = this.rewriteSessionUrls(await this.fetchSession(baseUrl), baseUrl);
-    } catch (err) {
-      this.credentials = null;
-      if (err instanceof AuthenticationError || (err instanceof Error && /^Session discovery failed: 403\b/.test(err.message))) {
-        throw new InvalidTokenError();
-      }
-      throw err;
-    }
     this._accountId = this.resolveAccountId(this.session);
     this.firstTouchGate.reset();
 
-    const username = this.session.username;
+    return this.session;
-    if (!username) {
-      this.reset();
-      throw new Error('The server did not name the account');
-    }
-    this.credentials.username = username;
-
-    const accountId = generateAccountId(username, baseUrl);
-    await writeSharedSecret(credentialsKey(accountId), JSON.stringify(this.credentials));
-
-    return { session: this.session, username, accountId };
   }
 
   // OAuth login via webmail handoff. The webmail did the OAuth dance against
@@ -645,26 +612,16 @@ export class JMAPClient {
   // URL polyfill mutates inputs (appends trailing slashes, normalises
   // characters) and would corrupt the RFC 6570 templates {accountId}/{blobId}
   // before the caller has a chance to substitute values into them.
-  //
-  // A URL on another HTTPS origin than the server's own apiUrl is one it
-  // deliberately hosts elsewhere (Fastmail serves downloads from a separate
-  // domain) and is kept; everything else moves onto the origin we connected to.
   private rewriteSessionUrls(session: JMAPSession, serverUrl: string): JMAPSession {
     const serverOrigin = extractOrigin(serverUrl);
-    const reportedOrigin = session.apiUrl ? extractOrigin(session.apiUrl) : null;
     const rewrite = (url: string | undefined): string | undefined =>
       rewriteSessionUrl(url, serverOrigin);
-    const rewriteHosted = (url: string | undefined): string | undefined => {
-      const origin = url ? extractOrigin(url) : null;
-      const hostedElsewhere = !!origin && !!reportedOrigin && origin !== reportedOrigin && /^https:/i.test(origin);
-      return hostedElsewhere ? url : rewrite(url);
-    };
     return {
       ...session,
       apiUrl: rewrite(session.apiUrl) ?? session.apiUrl,
-      downloadUrl: rewriteHosted(session.downloadUrl) ?? session.downloadUrl,
+      downloadUrl: rewrite(session.downloadUrl) ?? session.downloadUrl,
-      uploadUrl: rewriteHosted(session.uploadUrl) ?? session.uploadUrl,
+      uploadUrl: rewrite(session.uploadUrl) ?? session.uploadUrl,
-      eventSourceUrl: rewriteHosted(session.eventSourceUrl) ?? session.eventSourceUrl,
+      eventSourceUrl: rewrite(session.eventSourceUrl) ?? session.eventSourceUrl,
     };
   }
 
@@ -1326,14 +1283,6 @@ export class AuthenticationError extends Error {
   }
 }
 
-// The server refused a pasted access token (wrong, expired or revoked).
-export class InvalidTokenError extends Error {
-  constructor() {
-    super('Invalid access token');
-    this.name = 'InvalidTokenError';
-  }
-}
-
 // The server wants a second factor before it will hand out a session.
 export class TotpRequiredError extends AuthenticationError {
   constructor() {

src/components/EmailBodyView.tsx

@@ -19,7 +19,6 @@ import { useContactsStore } from '../stores/contacts-store';
 import { useLocaleStore } from '../stores/locale-store';
 import { spacing, typography, type ThemePalette } from '../theme/tokens';
 import { useColors, useResolvedTheme } from '../theme/colors';
-import { perfEndAfterPaint, perfLap } from '../lib/perf-marks';
 import type { RootStackParamList } from '../navigation/types';
 
 type Nav = NativeStackNavigationProp<RootStackParamList>;
@@ -684,13 +683,8 @@ export default function EmailBodyView({
     [prepared.isHtml, prepared.applyInversion, quoteLabels],
   );
 
-  // Performance harness: how much of opening a message is the WebView.
-  React.useEffect(() => { perfLap('open-message', 'body-mounted'); }, []);
-
   const onMessage = (e: WebViewMessageEvent) => {
     const data = e.nativeEvent.data;
-    // The body reported its size: it is laid out (performance harness).
-    perfEndAfterPaint('open-message');
     // Swipe/zoom messages arrive as JSON; the height reporter posts a bare number.
     if (data.charCodeAt(0) === 123 /* '{' */) {
       try {
@@ -794,7 +788,6 @@ export default function EmailBodyView({
           injectedJavaScript={injectedJs}
           onMessage={onMessage}
           onLoadEnd={() => {
-            perfLap('open-message', 'webview-loaded');
             // A (re)load resets the page's zoom state to 1 — drop any host-side
             // scroll locks so they can't go stale (e.g. cid images arriving
             // reload the source mid-zoom).

src/components/PasteSignInLinkModal.tsx

@@ -5,6 +5,7 @@ import {
   TextInput,
   Pressable,
   StyleSheet,
+  Modal,
   Platform,
   KeyboardAvoidingView,
   ScrollView,
@@ -18,7 +19,6 @@ import Button from './Button';
 import { useLocaleStore } from '../stores/locale-store';
 import { insecurePairingLinkError, parsePastedSignInLink, type QrLoginPayload } from '../lib/oauth';
 import { describeLoginError } from '../lib/login-errors';
-import { SafeAreaModal } from './SafeAreaModal';
 import { MODAL_ORIENTATIONS } from '../lib/modal-orientations';
 
 interface PasteSignInLinkModalProps {
@@ -81,7 +81,7 @@ export function PasteSignInLinkModal({ visible, onClose, onSubmit }: PasteSignIn
   const title = t('login.mobile.paste_title', 'Paste sign-in link');
 
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} animationType="slide" onRequestClose={onClose} statusBarTranslucent>
+    <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} animationType="slide" onRequestClose={onClose} statusBarTranslucent>
       <SafeAreaView style={styles.container}>
         <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : undefined} style={styles.flex}>
           <View style={styles.header}>
@@ -145,7 +145,7 @@ export function PasteSignInLinkModal({ visible, onClose, onSubmit }: PasteSignIn
           </ScrollView>
         </KeyboardAvoidingView>
       </SafeAreaView>
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/QrScanModal.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { View, Text, Pressable, StyleSheet, Platform, Linking } from 'react-native';
+import { View, Text, Pressable, StyleSheet, Modal, Platform, Linking } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { CameraView, useCameraPermissions, type BarcodeScanningResult } from 'expo-camera';
 import { X } from './icons';
@@ -7,7 +7,6 @@ import { spacing, radius, typography, type ThemePalette } from '../theme/tokens'
 import { useColors, useResolvedTheme } from '../theme/colors';
 import Button from './Button';
 import { useLocaleStore } from '../stores/locale-store';
-import { SafeAreaModal } from './SafeAreaModal';
 import { MODAL_ORIENTATIONS } from '../lib/modal-orientations';
 
 interface QrScanModalProps {
@@ -44,7 +43,7 @@ export function QrScanModal({ visible, onClose, onScanned }: QrScanModalProps) {
   );
 
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} animationType="slide" onRequestClose={onClose} statusBarTranslucent>
+    <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} animationType="slide" onRequestClose={onClose} statusBarTranslucent>
       <View style={styles.container}>
         {permission?.granted ? (
           <CameraView
@@ -106,7 +105,7 @@ export function QrScanModal({ visible, onClose, onScanned }: QrScanModalProps) {
           ) : null}
         </SafeAreaView>
       </View>
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/RichTextEditor.tsx

@@ -3,7 +3,6 @@ import { StyleSheet, View, Platform } from 'react-native';
 import { WebView, type WebViewMessageEvent } from 'react-native-webview';
 import { useColors } from '../theme/colors';
 import type { ThemePalette } from '../theme/tokens';
-import { perfEndAfterPaint } from '../lib/perf-marks';
 import { buildEditorHtml, MIN_EDITOR_HEIGHT } from '../lib/editor-html';
 
 export type RichTextCommand =
@@ -66,8 +65,6 @@ export interface RichTextEditorHandle {
    */
   getHtml(timeoutMs?: number): Promise<string>;
   focus(): void;
-  /** Focus with the caret where new text goes (before signature / quote). */
-  focusEnd(): void;
   /** Drop the caret, which closes the keyboard. */
   blur(): void;
 }
@@ -188,9 +185,6 @@ const RichTextEditor = React.forwardRef<RichTextEditorHandle, Props>(function Ri
         pendingSnapshots.current.set(id, { resolve, reject, timer });
         call(`window.__rne && window.__rne.getHtml(${id})`);
       }),
-    focusEnd: () => {
-      call(`window.__rne && window.__rne.focusEnd()`);
-    },
     focus: () => {
       call(`window.__rne && window.__rne.focus()`);
     },
@@ -208,7 +202,6 @@ const RichTextEditor = React.forwardRef<RichTextEditorHandle, Props>(function Ri
     }
     if (!readyRef.current) {
       readyRef.current = true;
-      perfEndAfterPaint('compose-open');
       const queued = queuedRef.current;
       queuedRef.current = [];
       for (const script of queued) webViewRef.current?.injectJavaScript(`${script}; true;`);

src/components/SafeAreaModal.tsx

@@ -1,20 +0,0 @@
-import React from 'react';
-import { Modal, type ModalProps } from 'react-native';
-import { SafeAreaProvider } from 'react-native-safe-area-context';
-
-/**
- * A Modal with its own safe-area provider. A Modal is a separate native
- * window, and a SafeAreaView inside a Modal whose content slides in (a
- * slide-up Modal, or a drawer or sheet the app animates itself) measured no
- * insets: the view starts off screen. On iPhones with a notch or Dynamic
- * Island headers (and their close buttons) ended up under the status bar,
- * where taps don't reach them, and bottom rows on the home indicator. Use
- * this for any Modal with a SafeAreaView inside.
- */
-export function SafeAreaModal({ children, ...props }: ModalProps) {
-  return (
-    <Modal {...props}>
-      <SafeAreaProvider>{children}</SafeAreaProvider>
-    </Modal>
-  );
-}

src/components/SidebarDrawer.tsx

@@ -39,7 +39,6 @@ import type { RootStackParamList } from '../navigation/types';
 import type { Mailbox } from '../api/types';
 import { MODAL_ORIENTATIONS } from '../lib/modal-orientations';
 import { confirmSignOut } from '../lib/sign-out-confirm';
-import { SafeAreaModal } from './SafeAreaModal';
 import { setPendingSettingsTab } from '../navigation/pending-settings-tab';
 import {
   isAccountMuted, isMailboxMuted, mailboxOverridesForAccount, resetMailboxMutes, setAccountMuted, setMailboxMuted,
@@ -1241,11 +1240,8 @@ export default function SidebarDrawer({ visible, onClose, docked = false }: Side
     );
   }
 
-  // Its own safe-area provider: the panel's SafeAreaView starts off screen
-  // (it slides in), and without one it measured no insets on iOS, so the
-  // account header sat under the status bar.
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS}
+    <Modal supportedOrientations={MODAL_ORIENTATIONS}
       visible={visible}
       transparent
       animationType="none"
@@ -1272,7 +1268,7 @@ export default function SidebarDrawer({ visible, onClose, docked = false }: Side
           onClose={() => setPrompt(null)}
         />
       )}
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/UndoSnackbar.tsx

@@ -6,7 +6,6 @@ import { useNavigation } from '@react-navigation/native';
 import type { NativeStackNavigationProp } from '@react-navigation/native-stack';
 import { spacing, radius, typography, type ThemePalette } from '../theme/tokens';
 import { useColors } from '../theme/colors';
-import { undoSnackbarColors } from './undo-snackbar-colors';
 import { useEmailStore } from '../stores/email-store';
 import { useSendUndoStore, restoreUndoneSend, type PendingUndoSend } from '../stores/send-undo-store';
 import { useLocaleStore } from '../stores/locale-store';
@@ -159,7 +158,6 @@ export function UndoSnackbar() {
 }
 
 function makeStyles(c: ThemePalette) {
-  const colors = undoSnackbarColors(c);
   return StyleSheet.create({
     wrap: {
       position: 'absolute',
@@ -172,7 +170,7 @@ function makeStyles(c: ThemePalette) {
       paddingLeft: spacing.lg,
       paddingRight: spacing.sm,
       borderRadius: radius.md,
-      backgroundColor: colors.bar,
+      backgroundColor: c.text,
       shadowColor: '#000',
       shadowOpacity: 0.3,
       shadowRadius: 12,
@@ -181,7 +179,7 @@ function makeStyles(c: ThemePalette) {
     },
     label: {
       ...typography.body,
-      color: colors.label,
+      color: c.background,
       flex: 1,
     },
     undoBtn: {
@@ -194,7 +192,7 @@ function makeStyles(c: ThemePalette) {
     },
     undoText: {
       ...typography.bodySemibold,
-      color: colors.action,
+      color: c.primary,
       letterSpacing: 0.5,
     },
     sendNowText: {

src/components/__tests__/modal-safe-area.test.ts

@@ -1,86 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import fs from 'node:fs';
-import path from 'node:path';
-
-// A SafeAreaView inside a react-native Modal whose content starts off screen
-// measured no insets on iOS: the Modal is its own window, and the view was
-// measured before it slid in. On iPhones with a notch or Dynamic Island the
-// header and its close button sat under the status bar, out of reach
-// (attachment preview, QR scanner, paste sign-in link, filter and event
-// editors), the drawers' account headers did too, and the bottom sheets'
-// last rows sat on the home indicator. Such modals use SafeAreaModal, which
-// gives the window its own SafeAreaProvider. Slid in means animationType
-// "slide", or "none" with the app's own slide animation (drawers, sheets).
-
-const SRC = path.resolve(__dirname, '../..');
-
-function sourceFiles(dir: string): string[] {
-  return fs.readdirSync(dir, { withFileTypes: true }).flatMap((e) => {
-    const p = path.join(dir, e.name);
-    if (e.isDirectory()) return e.name === '__tests__' ? [] : sourceFiles(p);
-    return e.name.endsWith('.tsx') ? [p] : [];
-  });
-}
-
-/** Plain <Modal> elements: the opening tag and what is between the tags. */
-function modals(source: string): { tag: string; body: string }[] {
-  return modalTags(source).map((tag) => {
-    const start = source.indexOf(tag) + tag.length;
-    const end = source.indexOf('</Modal>', start);
-    return { tag, body: source.slice(start, end < 0 ? undefined : end) };
-  });
-}
-
-/** Opening tags of plain <Modal> elements, attributes included. */
-function modalTags(source: string): string[] {
-  const tags: string[] = [];
-  let at = source.indexOf('<Modal');
-  while (at >= 0) {
-    if (/[\s>]/.test(source[at + 6] ?? '')) {
-      let depth = 0;
-      let i = at;
-      for (; i < source.length; i++) {
-        const ch = source[i];
-        if (ch === '{') depth++;
-        else if (ch === '}') depth--;
-        else if (ch === '>' && depth === 0 && source[i - 1] !== '=') break;
-      }
-      tags.push(source.slice(at, i + 1));
-    }
-    at = source.indexOf('<Modal', at + 6);
-  }
-  return tags;
-}
-
-describe('modals that slide in with a SafeAreaView', () => {
-  it('use SafeAreaModal so their content clears the status bar and home indicator', () => {
-    const offenders = sourceFiles(SRC)
-      .filter((file) => {
-        const source = fs.readFileSync(file, 'utf8');
-        if (!source.includes('SafeAreaView')) return false;
-        return modals(source).some(({ tag, body }) =>
-          /animationType="slide"/.test(tag)
-          || (/animationType="none"/.test(tag) && body.includes('<SafeAreaView')));
-      })
-      .map((file) => path.relative(SRC, file));
-    expect(offenders).toEqual([]);
-  });
-
-  // The mail drawer builds its panel (with the SafeAreaView) outside the
-  // modal's tags, so the check above can't see it there.
-  it('include the side drawers', () => {
-    const drawers = sourceFiles(SRC).filter((file) => /SidebarDrawer\.tsx$/.test(file));
-    expect(drawers.length).toBeGreaterThanOrEqual(3);
-    for (const file of drawers) {
-      const source = fs.readFileSync(file, 'utf8');
-      expect(modalTags(source).filter((tag) => /animationType="none"/.test(tag)), path.relative(SRC, file)).toEqual([]);
-      expect(source).toContain('<SafeAreaModal');
-    }
-  });
-
-  it('finds the tags it is looking for', () => {
-    const tags = modalTags('<View><Modal visible={x} onRequestClose={() => close()} animationType="slide">\n</Modal></View>');
-    expect(tags).toHaveLength(1);
-    expect(tags[0]).toContain('animationType="slide"');
-  });
-});

src/components/__tests__/sheet-accessibility.test.ts

@@ -1,73 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import fs from 'node:fs';
-import path from 'node:path';
-
-// Sheets and menus were built as a tappable backdrop (Pressable or
-// TouchableWithoutFeedback) wrapping a card that swallows taps. Both are
-// accessible elements by default, and an accessible element hides its
-// children from VoiceOver and TalkBack: the compose "Attach" and "Schedule
-// send" sheets read as one element ("Attach, Photos & Videos, Camera, Files,
-// Cancel") whose options couldn't be picked one by one. The wrappers that
-// only catch taps are marked accessible={false}, so the options inside stay
-// reachable.
-
-const SRC = path.resolve(__dirname, '../..');
-
-function sourceFiles(dir: string): string[] {
-  return fs.readdirSync(dir, { withFileTypes: true }).flatMap((e) => {
-    const p = path.join(dir, e.name);
-    if (e.isDirectory()) return e.name === '__tests__' ? [] : sourceFiles(p);
-    return e.name.endsWith('.tsx') ? [p] : [];
-  });
-}
-
-function openingTags(source: string, name: string): { tag: string; line: number }[] {
-  const out: { tag: string; line: number }[] = [];
-  const re = new RegExp(`<${name}\\b`, 'g');
-  let m: RegExpExecArray | null;
-  while ((m = re.exec(source))) {
-    let depth = 0;
-    let i = m.index;
-    for (; i < source.length; i++) {
-      const ch = source[i];
-      if (ch === '{') depth++;
-      else if (ch === '}') depth--;
-      else if (ch === '>' && depth === 0 && source[i - 1] !== '=') break;
-    }
-    out.push({ tag: source.slice(m.index, i + 1), line: source.slice(0, m.index).split('\n').length });
-  }
-  return out;
-}
-
-/** A wrapper that only catches taps and still hides what it wraps. */
-export function isHidingWrapper(tag: string): boolean {
-  if (/accessible=\{false\}/.test(tag)) return false;
-  if (/\/\s*>$/.test(tag)) return false; // self-closing: wraps nothing
-  if (tag.startsWith('<TouchableWithoutFeedback')) return true;
-  if (/onPress=\{\(\) => \{\}\}/.test(tag)) return true;
-  return /style=\{styles\.\w*(Backdrop|backdrop|Overlay|overlay)\}/.test(tag);
-}
-
-describe('sheet backdrops', () => {
-  it('do not hide the options they wrap from screen readers', () => {
-    const offenders: string[] = [];
-    for (const file of sourceFiles(SRC)) {
-      const source = fs.readFileSync(file, 'utf8');
-      for (const name of ['Pressable', 'TouchableWithoutFeedback']) {
-        for (const { tag, line } of openingTags(source, name)) {
-          if (isHidingWrapper(tag)) offenders.push(`${path.relative(SRC, file)}:${line}`);
-        }
-      }
-    }
-    expect(offenders).toEqual([]);
-  });
-
-  it('recognises the wrappers it looks for', () => {
-    expect(isHidingWrapper('<Pressable style={styles.modalBackdrop} onPress={onClose}>')).toBe(true);
-    expect(isHidingWrapper('<Pressable style={styles.card} onPress={() => {}}>')).toBe(true);
-    expect(isHidingWrapper('<TouchableWithoutFeedback onPress={onClose}>')).toBe(true);
-    expect(isHidingWrapper('<Pressable accessible={false} style={styles.modalBackdrop} onPress={onClose}>')).toBe(false);
-    expect(isHidingWrapper('<Pressable style={styles.pickerOverlay} onPress={close} />')).toBe(false);
-    expect(isHidingWrapper('<Pressable style={styles.row} onPress={open}>')).toBe(false);
-  });
-});

src/components/__tests__/undo-snackbar-contrast.test.ts

@@ -1,41 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { DARK_COLORS, LIGHT_COLORS, type ThemePalette } from '../../theme/tokens';
-import { BUILTIN_THEMES } from '../../theme/builtin-themes';
-import { undoSnackbarColors } from '../undo-snackbar-colors';
-
-// The undo bar (UndoSnackbar) is drawn in the text colour. Its UNDO button
-// used the primary colour, which is white in the default dark theme: white
-// on white, so in dark mode the bar showed "Email archived" and no visible
-// way to undo. The bound is 3:1, not 4.5:1, because Solarized's own text
-// and background are a little under 4.5:1.
-
-function luminance(hex: string): number {
-  const v = hex.replace('#', '');
-  const full = v.length === 3 ? v.split('').map((ch) => ch + ch).join('') : v.slice(0, 6);
-  const [r, g, b] = [0, 2, 4].map((i) => {
-    const c = parseInt(full.slice(i, i + 2), 16) / 255;
-    return c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4;
-  });
-  return 0.2126 * r + 0.7152 * g + 0.0722 * b;
-}
-
-function contrast(a: string, b: string): number {
-  const [hi, lo] = [luminance(a), luminance(b)].sort((x, y) => y - x);
-  return (hi + 0.05) / (lo + 0.05);
-}
-
-const palettes: Array<[string, ThemePalette]> = [
-  ['default light', LIGHT_COLORS],
-  ['default dark', DARK_COLORS],
-  ...BUILTIN_THEMES.flatMap((theme): Array<[string, ThemePalette]> => [
-    [`${theme.name} light`, { ...LIGHT_COLORS, ...theme.light } as ThemePalette],
-    [`${theme.name} dark`, { ...DARK_COLORS, ...theme.dark } as ThemePalette],
-  ]),
-];
-
-describe('undo bar', () => {
-  it.each(palettes)('UNDO is readable on the bar (%s)', (_name, palette) => {
-    const { bar, action } = undoSnackbarColors(palette);
-    expect(contrast(action, bar)).toBeGreaterThanOrEqual(3);
-  });
-});

src/components/calendar/CalendarEditSheet.tsx

@@ -74,9 +74,9 @@ export function CalendarEditSheet({ visible, calendar, onSave, onClose }: Calend
 
   return (
     <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="slide" onRequestClose={onClose}>
-      <TouchableWithoutFeedback accessible={false} onPress={onClose}>
+      <TouchableWithoutFeedback onPress={onClose}>
         <View style={[styles.backdrop, { paddingLeft: sheetInsets.left, paddingRight: sheetInsets.right }]}>
-          <TouchableWithoutFeedback accessible={false}>
+          <TouchableWithoutFeedback>
             <View style={styles.sheet}>
               <Text style={styles.title}>
                 {calendar

src/components/calendar/CalendarShareSheet.tsx

@@ -160,9 +160,9 @@ export function CalendarShareSheet({ calendar, onShare, onClose }: CalendarShare
 
   return (
     <Modal supportedOrientations={MODAL_ORIENTATIONS} visible transparent animationType="slide" onRequestClose={onClose}>
-      <TouchableWithoutFeedback accessible={false} onPress={onClose}>
+      <TouchableWithoutFeedback onPress={onClose}>
         <View style={[styles.backdrop, { paddingLeft: sheetInsets.left, paddingRight: sheetInsets.right }]}>
-          <TouchableWithoutFeedback accessible={false}>
+          <TouchableWithoutFeedback>
             <View style={styles.sheet}>
               <View style={styles.titleRow}>
                 <Users size={18} color={c.textMuted} />

src/components/calendar/CalendarSidebarDrawer.tsx

@@ -3,6 +3,7 @@ import {
   Animated,
   Dimensions,
   Easing,
+  Modal,
   Pressable,
   ScrollView,
   StyleSheet,
@@ -23,7 +24,6 @@ import { BIRTHDAY_CALENDAR_ID } from '../../lib/birthday-calendar';
 import { isWritableCalendar } from '../../lib/calendar-editability';
 import { useLocaleStore } from '../../stores/locale-store';
 import { MODAL_ORIENTATIONS } from '../../lib/modal-orientations';
-import { SafeAreaModal } from '../SafeAreaModal';
 
 /** A calendar view listed at the top of the drawer. */
 export interface DrawerViewOption {
@@ -157,7 +157,7 @@ export function CalendarSidebarDrawer({
   };
 
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS}
+    <Modal supportedOrientations={MODAL_ORIENTATIONS}
       visible={visible}
       transparent
       animationType="none"
@@ -271,7 +271,7 @@ export function CalendarSidebarDrawer({
           </ScrollView>
         </SafeAreaView>
       </Animated.View>
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/calendar/EventDetailSheet.tsx

@@ -3,6 +3,7 @@ import {
   Animated,
   Dimensions,
   Easing,
+  Modal,
   Platform,
   Pressable,
   ScrollView,
@@ -62,7 +63,6 @@ import { recurrenceEndLabel, recurrenceIntervalLabel } from '../../lib/recurrenc
 import type { TranslateFn } from '../../stores/locale-store';
 import { MODAL_ORIENTATIONS } from '../../lib/modal-orientations';
 import { useSheetInsets } from '../../lib/use-layout';
-import { SafeAreaModal } from '../SafeAreaModal';
 
 type RsvpStatus = 'accepted' | 'declined' | 'tentative';
 
@@ -248,7 +248,7 @@ export function EventDetailSheet({
   };
 
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS}
+    <Modal supportedOrientations={MODAL_ORIENTATIONS}
       visible={visible}
       transparent
       animationType="none"
@@ -464,7 +464,7 @@ export function EventDetailSheet({
       {/* The screen's own toast host sits under this Modal; this one shows
           the copy confirmation above the sheet. */}
       <ToastHost />
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/calendar/EventModal.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import {
+  Modal,
   View,
   Text,
   ScrollView,
@@ -68,7 +69,6 @@ import { ParticipantInput } from './ParticipantInput';
 import { useContactNameResolver } from '../../lib/contact-name-resolver';
 import { RecurrenceEditor } from './RecurrenceEditor';
 import { MODAL_ORIENTATIONS } from '../../lib/modal-orientations';
-import { SafeAreaModal } from '../SafeAreaModal';
 import ToggleSwitch from '../ToggleSwitch';
 
 type RecurrenceOption = 'none' | 'daily' | 'weekly' | 'monthly' | 'yearly' | 'custom';
@@ -419,7 +419,7 @@ export function EventModal({
   );
 
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS}
+    <Modal supportedOrientations={MODAL_ORIENTATIONS}
       visible={visible}
       animationType="slide"
       presentationStyle="fullScreen"
@@ -838,7 +838,7 @@ export function EventModal({
           />
         )}
       </SafeAreaView>
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/calendar/ICalImportSheet.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import {
-  View, Text, StyleSheet, ScrollView, Pressable, Animated, Easing, Alert, ActivityIndicator,
+  View, Text, StyleSheet, ScrollView, Pressable, Modal, Animated, Easing, Alert, ActivityIndicator,
 } from 'react-native';
 import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context';
 import { Upload, X, Check, CalendarPlus, AlertTriangle, Clock } from '../icons';
@@ -19,7 +19,6 @@ import { useCalendarLocale } from '../../lib/calendar-locale';
 import type { Locale } from 'date-fns';
 import { MODAL_ORIENTATIONS } from '../../lib/modal-orientations';
 import { useSheetInsets } from '../../lib/use-layout';
-import { SafeAreaModal } from '../SafeAreaModal';
 
 // expo-document-picker is loaded lazily on first use; its native module is not
 // linked into every build (matches the FilesScreen / ContactImportSheet flow).
@@ -189,7 +188,7 @@ export function ICalImportSheet({ visible, onClose, calendars, onImport, onImpor
   };
 
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="none" onRequestClose={onClose} statusBarTranslucent>
+    <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="none" onRequestClose={onClose} statusBarTranslucent>
       <Animated.View style={[styles.overlay, { opacity: overlayOpacity }]}>
         <Pressable style={{ flex: 1 }} onPress={onClose} />
       </Animated.View>
@@ -379,7 +378,7 @@ export function ICalImportSheet({ visible, onClose, calendars, onImport, onImpor
           )}
         </SafeAreaView>
       </Animated.View>
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/calendar/ICalSubscriptionSheet.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import {
-  View, Text, StyleSheet, ScrollView, Pressable, Animated, Easing, TextInput, ActivityIndicator, Alert,
+  View, Text, StyleSheet, ScrollView, Pressable, Modal, Animated, Easing, TextInput, ActivityIndicator, Alert,
 } from 'react-native';
 import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context';
 import { X, Plus, RefreshCw, Trash2, Rss, AlertTriangle } from '../icons';
@@ -19,7 +19,6 @@ import {
 import { jmapClient } from '../../api/jmap-client';
 import { MODAL_ORIENTATIONS } from '../../lib/modal-orientations';
 import { useSheetInsets } from '../../lib/use-layout';
-import { SafeAreaModal } from '../SafeAreaModal';
 
 // The webmail's refresh intervals and their labels.
 const INTERVAL_OPTIONS: { minutes: number; key: string; fallback: string }[] = [
@@ -136,7 +135,7 @@ export function ICalSubscriptionSheet({ visible, onClose }: Props) {
   };
 
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="none" onRequestClose={onClose} statusBarTranslucent>
+    <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="none" onRequestClose={onClose} statusBarTranslucent>
       <Animated.View style={[styles.overlay, { opacity: overlayOpacity }]}>
         <Pressable style={{ flex: 1 }} onPress={onClose} />
       </Animated.View>
@@ -314,7 +313,7 @@ export function ICalSubscriptionSheet({ visible, onClose }: Props) {
           <View style={{ height: insets.bottom }} />
         </SafeAreaView>
       </Animated.View>
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/calendar/TasksSheet.tsx

@@ -4,6 +4,7 @@ import {
   Animated,
   Dimensions,
   Easing,
+  Modal,
   Platform,
   Pressable,
   ScrollView,
@@ -44,7 +45,6 @@ import { formatCalendarDate } from '../../lib/date-format';
 import { useSheetDrag } from '../../lib/use-sheet-drag';
 import { MODAL_ORIENTATIONS } from '../../lib/modal-orientations';
 import { useSheetInsets } from '../../lib/use-layout';
-import { SafeAreaModal } from '../SafeAreaModal';
 
 type TaskFilter = 'all' | 'pending' | 'completed' | 'overdue';
 
@@ -235,7 +235,7 @@ export function TasksSheet({
   ];
 
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="none" statusBarTranslucent onRequestClose={onClose}>
+    <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="none" statusBarTranslucent onRequestClose={onClose}>
       <Animated.View style={[styles.overlay, { opacity: overlayOpacity }]}>
         <Pressable style={styles.overlayPress} onPress={onClose} />
       </Animated.View>
@@ -480,7 +480,7 @@ export function TasksSheet({
           }}
         />
       )}
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/contacts/ContactImportSheet.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import {
-  View, Text, StyleSheet, ScrollView, Pressable, Animated, Easing, Alert, ActivityIndicator,
+  View, Text, StyleSheet, ScrollView, Pressable, Modal, Animated, Easing, Alert, ActivityIndicator,
 } from 'react-native';
 import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context';
 import * as FileSystem from 'expo-file-system/legacy';
@@ -15,7 +15,6 @@ import { useColors } from '../../theme/colors';
 import { useLocaleStore } from '../../stores/locale-store';
 import { MODAL_ORIENTATIONS } from '../../lib/modal-orientations';
 import { useSheetInsets } from '../../lib/use-layout';
-import { SafeAreaModal } from '../SafeAreaModal';
 
 // expo-document-picker is loaded lazily on first use; its native module is not
 // linked into every build (matches the FilesScreen upload flow).
@@ -165,7 +164,7 @@ export default function ContactImportSheet({
   };
 
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="none" onRequestClose={onClose} statusBarTranslucent>
+    <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="none" onRequestClose={onClose} statusBarTranslucent>
       <Animated.View style={[styles.overlay, { opacity: overlayOpacity }]}>
         <Pressable style={{ flex: 1 }} onPress={onClose} />
       </Animated.View>
@@ -305,7 +304,7 @@ export default function ContactImportSheet({
           )}
         </SafeAreaView>
       </Animated.View>
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/contacts/ContactPickerSheet.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import {
-  View, Text, StyleSheet, Pressable, TextInput, FlatList,
+  View, Text, StyleSheet, Pressable, Modal, TextInput, FlatList,
   Animated, Dimensions, Easing,
 } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -18,7 +18,6 @@ import { useColors } from '../../theme/colors';
 import { useLocaleStore } from '../../stores/locale-store';
 import { MODAL_ORIENTATIONS } from '../../lib/modal-orientations';
 import { useSheetInsets } from '../../lib/use-layout';
-import { SafeAreaModal } from '../SafeAreaModal';
 
 interface Props {
   visible: boolean;
@@ -99,7 +98,7 @@ export default function ContactPickerSheet({
   };
 
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="none" statusBarTranslucent onRequestClose={onClose}>
+    <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="none" statusBarTranslucent onRequestClose={onClose}>
       <Animated.View style={[styles.overlay, { opacity: overlay }]}>
         <Pressable style={styles.overlayPress} onPress={onClose} />
       </Animated.View>
@@ -180,7 +179,7 @@ export default function ContactPickerSheet({
           />
         </SafeAreaView>
       </Animated.View>
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/contacts/ContactsSidebarDrawer.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import {
-  View, Text, StyleSheet, Pressable, ScrollView, Animated, Dimensions, Easing, TextInput, Alert,
+  View, Text, StyleSheet, Pressable, ScrollView, Modal, Animated, Dimensions, Easing, TextInput, Alert,
 } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { useNavigation } from '@react-navigation/native';
@@ -19,7 +19,6 @@ import { spacing, radius, typography, componentSizes, type ThemePalette } from '
 import { useColors } from '../../theme/colors';
 import { useLocaleStore } from '../../stores/locale-store';
 import { MODAL_ORIENTATIONS } from '../../lib/modal-orientations';
-import { SafeAreaModal } from '../SafeAreaModal';
 
 type Nav = NativeStackNavigationProp<RootStackParamList>;
 
@@ -163,7 +162,7 @@ export default function ContactsSidebarDrawer({ visible, onClose }: Props) {
   );
 
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="none" statusBarTranslucent onRequestClose={onClose} onShow={runOpen}>
+    <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="none" statusBarTranslucent onRequestClose={onClose} onShow={runOpen}>
       <Animated.View style={[styles.overlay, { opacity: overlay }]}>
         <Pressable style={styles.overlayPress} onPress={onClose} />
       </Animated.View>
@@ -311,7 +310,7 @@ export default function ContactsSidebarDrawer({ visible, onClose }: Props) {
           </ScrollView>
         </SafeAreaView>
       </Animated.View>
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/email/AttachmentPreviewModal.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import {
-  View, Text, StyleSheet, Pressable, ScrollView, Image, ActivityIndicator, Platform, PixelRatio, Alert,
+  View, Text, StyleSheet, Modal, Pressable, ScrollView, Image, ActivityIndicator, Platform, PixelRatio, Alert,
   useWindowDimensions,
 } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -21,7 +21,6 @@ import { formatFullDateTime } from '../../lib/email-date';
 import type { EmlPreview } from './use-body-override';
 import { useFilePreview } from './use-file-preview';
 import { ArchiveSummary, PreviewPartList, type PreviewPart } from './PreviewPartList';
-import { SafeAreaModal } from '../SafeAreaModal';
 import { MODAL_ORIENTATIONS } from '../../lib/modal-orientations';
 
 export interface PreviewItem {
@@ -433,9 +432,9 @@ export function AttachmentPreviewModal({
   );
   if (docked) return item || loading ? content : null;
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS} visible={!!item || loading} animationType="slide" onRequestClose={onClose}>
+    <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={!!item || loading} animationType="slide" onRequestClose={onClose}>
       {content}
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/files/ShareSheet.tsx

@@ -160,9 +160,9 @@ export default function ShareSheet({ node, onClose, onChanged }: ShareSheetProps
 
   return (
     <Modal supportedOrientations={MODAL_ORIENTATIONS} visible transparent animationType="slide" onRequestClose={onClose}>
-      <TouchableWithoutFeedback accessible={false} onPress={onClose}>
+      <TouchableWithoutFeedback onPress={onClose}>
         <View style={[styles.backdrop, { paddingLeft: sheetInsets.left, paddingRight: sheetInsets.right }]}>
-          <TouchableWithoutFeedback accessible={false}>
+          <TouchableWithoutFeedback>
             <View style={styles.sheet}>
               <View style={styles.titleRow}>
                 <Icon size={18} color={c.textMuted} />

src/components/filters/FilterRuleModal.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import {
-  View, Text, StyleSheet, ScrollView, Pressable, Alert,
+  View, Text, StyleSheet, ScrollView, Pressable, Modal, Alert,
   KeyboardAvoidingView, Platform,
 } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -37,7 +37,6 @@ import type {
   FilterComparator,
   FilterActionType,
 } from '../../lib/sieve/types';
-import { SafeAreaModal } from '../SafeAreaModal';
 import { MODAL_ORIENTATIONS } from '../../lib/modal-orientations';
 
 const ALL_FIELDS: FilterConditionField[] = ['from', 'to', 'cc', 'subject', 'header', 'size', 'body', 'attachment'];
@@ -228,7 +227,7 @@ export function FilterRuleModal({ visible, rule, mailboxes, onSave, onClose }: F
   }, [name, conditions, actions, matchType, stopProcessing, includeSpam, rule, onSave, t, mailboxTargets]);
 
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} animationType="slide" onRequestClose={onClose} statusBarTranslucent>
+    <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} animationType="slide" onRequestClose={onClose} statusBarTranslucent>
       <SafeAreaView style={styles.container} edges={['top', 'bottom']}>
         <View style={styles.header}>
           <Pressable
@@ -491,7 +490,7 @@ export function FilterRuleModal({ visible, rule, mailboxes, onSave, onClose }: F
           </Button>
         </View>
       </SafeAreaView>
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/filters/SieveEditorSheet.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useMemo, useState } from 'react';
 import {
-  View, Text, StyleSheet, ScrollView, Pressable, TextInput,
+  View, Text, StyleSheet, ScrollView, Pressable, Modal, TextInput,
   KeyboardAvoidingView, Platform, ActivityIndicator,
 } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -9,7 +9,6 @@ import { spacing, radius, typography, componentSizes, type ThemePalette } from '
 import { useColors } from '../../theme/colors';
 import Button from '../Button';
 import { useLocaleStore } from '../../stores/locale-store';
-import { SafeAreaModal } from '../SafeAreaModal';
 import { MODAL_ORIENTATIONS } from '../../lib/modal-orientations';
 
 interface SieveEditorSheetProps {
@@ -64,7 +63,7 @@ export function SieveEditorSheet({ visible, content, onSave, onClose, onValidate
   }, [script, showSaveWarning, onSave]);
 
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} animationType="slide" onRequestClose={onClose} statusBarTranslucent>
+    <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} animationType="slide" onRequestClose={onClose} statusBarTranslucent>
       <SafeAreaView style={styles.container} edges={['top', 'bottom']}>
         <View style={styles.header}>
           <Pressable
@@ -175,7 +174,7 @@ export function SieveEditorSheet({ visible, content, onSave, onClose, onValidate
           </View>
         </View>
       </SafeAreaView>
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/components/settings/AccountSettings.tsx

@@ -52,9 +52,7 @@ export function AccountSettings() {
   const username = account?.username || authUsername || undefined;
   const serverUrl = account?.serverUrl || authServerUrl || '';
   // Live client state, not a prop: OAuth/handoff accounts carry a bearer token.
-  const authMode: 'oauth' | 'token' | 'basic' = jmapClient.usesPastedToken
+  const authMode: 'oauth' | 'basic' = jmapClient.usesBearerAuth ? 'oauth' : 'basic';
-    ? 'token'
-    : jmapClient.usesBearerAuth ? 'oauth' : 'basic';
 
   const [quota, setQuota] = useState<MailQuota | null>(null);
   useEffect(() => {
@@ -130,9 +128,7 @@ export function AccountSettings() {
           <Text style={styles.value}>
             {authMode === 'oauth'
               ? t('settings.account.auth_method_oauth', 'Single Sign-On (OAuth/OIDC)')
-              : authMode === 'token'
+              : t('settings.account.auth_method_basic', 'Password')}
-                ? t('settings.account.auth_method_token', 'Access token')
-                : t('settings.account.auth_method_basic', 'Password')}
           </Text>
         </SettingItem>
 

src/components/settings/ContentSendersSettings.tsx

@@ -196,8 +196,8 @@ export function ContentSendersSettings() {
         animationType="fade"
         onRequestClose={() => setModalOpen(false)}
       >
-        <Pressable accessible={false} style={styles.modalBackdrop} onPress={() => setModalOpen(false)}>
+        <Pressable style={styles.modalBackdrop} onPress={() => setModalOpen(false)}>
-          <Pressable accessible={false} style={styles.modalCard} onPress={() => {}}>
+          <Pressable style={styles.modalCard} onPress={() => {}}>
             <View style={styles.modalHeader}>
               <Text style={styles.modalTitle}>{t('settings.email_behavior.trusted_senders.modal_title', 'Trusted Senders')}</Text>
               <Pressable

src/components/settings/settings-section.tsx

@@ -298,7 +298,7 @@ export function Select({ value, onChange, options, style }: SelectProps) {
         animationType="fade"
         onRequestClose={() => setOpen(false)}
       >
-        <Pressable accessible={false} style={styles.modalBackdrop} onPress={() => setOpen(false)}>
+        <Pressable style={styles.modalBackdrop} onPress={() => setOpen(false)}>
           <View style={styles.modalContent}>
             <ScrollView>
               {options.map((opt) => {

src/components/undo-snackbar-colors.ts

@@ -1,10 +0,0 @@
-import type { ThemePalette } from '../theme/tokens';
-
-/**
- * Colours of the undo bar. The bar is drawn in the text colour, so what is
- * on it takes the background colour. The primary colour can't be used for
- * UNDO: the default dark theme's primary is white, like the bar.
- */
-export function undoSnackbarColors(c: ThemePalette): { bar: string; label: string; action: string } {
-  return { bar: c.text, label: c.background, action: c.background };
-}

src/lib/__tests__/after-modal-dismiss.test.ts

@@ -1,61 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest';
-import fs from 'node:fs';
-import path from 'node:path';
-import { createAfterDismissQueue } from '../after-modal-dismiss';
-
-afterEach(() => {
-  vi.useRealTimers();
-});
-
-describe('createAfterDismissQueue', () => {
-  it('holds the action on iOS until the modal is dismissed', () => {
-    const queue = createAfterDismissQueue('ios');
-    const action = vi.fn();
-    queue.run(action);
-    expect(action).not.toHaveBeenCalled();
-    queue.flush();
-    expect(action).toHaveBeenCalledTimes(1);
-    queue.flush();
-    expect(action).toHaveBeenCalledTimes(1);
-  });
-
-  it('runs the action after the fallback delay when onDismiss never comes', () => {
-    vi.useFakeTimers();
-    const queue = createAfterDismissQueue('ios', 600);
-    const action = vi.fn();
-    queue.run(action);
-    vi.advanceTimersByTime(599);
-    expect(action).not.toHaveBeenCalled();
-    vi.advanceTimersByTime(1);
-    expect(action).toHaveBeenCalledTimes(1);
-  });
-
-  it('does not run the action twice when onDismiss and the timer both fire', () => {
-    vi.useFakeTimers();
-    const queue = createAfterDismissQueue('ios', 600);
-    const action = vi.fn();
-    queue.run(action);
-    queue.flush();
-    vi.advanceTimersByTime(1000);
-    expect(action).toHaveBeenCalledTimes(1);
-  });
-
-  it('runs the action right away on Android', () => {
-    const queue = createAfterDismissQueue('android');
-    const action = vi.fn();
-    queue.run(action);
-    expect(action).toHaveBeenCalledTimes(1);
-  });
-});
-
-// The compose "Attach" sheet closed its modal and opened the photo picker,
-// camera or file picker in the same tick. On iOS the picker never showed.
-describe('compose options sheet', () => {
-  const source = fs.readFileSync(path.resolve(__dirname, '../../screens/ComposeScreen.tsx'), 'utf8');
-
-  it('opens the chosen option only after the sheet is dismissed', () => {
-    expect(source).not.toMatch(/onClose\(\);\s*opt\.onPress\(\)/);
-    expect(source).toMatch(/onDismiss=\{afterDismiss\.flush\}/);
-    expect(source).toMatch(/afterDismiss\.run\(opt\.onPress\)/);
-  });
-});

src/lib/__tests__/editor-focus-end.test.ts

@@ -1,58 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { buildEditorHtml, FOCUS_END_SOURCE } from '../editor-html';
-import { LIGHT_COLORS } from '../../theme/tokens';
-
-// On the iPad most of the composer's body area is empty space under the
-// editor; a tap there did nothing and the keyboard kept typing into Subject.
-// That space now calls the page's focusEnd(), which must put the caret where
-// the user's own text goes: in front of the signature or the quoted message.
-
-interface FakeNode { name: string; previousElementSibling?: FakeNode | null }
-
-function run(stop: FakeNode | null) {
-  const calls: string[] = [];
-  const editor = {
-    name: 'editor',
-    focus: () => calls.push('focus'),
-    querySelector: () => stop,
-  };
-  const range = {
-    selectNodeContents: (n: FakeNode) => calls.push(`select ${n.name}`),
-    setStartBefore: (n: FakeNode) => calls.push(`before ${n.name}`),
-    collapse: (toStart: boolean) => calls.push(toStart ? 'collapse start' : 'collapse end'),
-  };
-  const selection = {
-    removeAllRanges: () => calls.push('clear'),
-    addRange: (r: unknown) => calls.push(r === range ? 'add range' : 'add other'),
-  };
-  const fakeDocument = { createRange: () => range };
-  const fakeWindow = { getSelection: () => selection };
-  const focusEnd = new Function('document', 'window', `${FOCUS_END_SOURCE}; return focusEnd;`)(fakeDocument, fakeWindow);
-  focusEnd(editor);
-  return calls;
-}
-
-describe('focusEnd', () => {
-  it('puts the caret at the end of the paragraph in front of the signature', () => {
-    const mine = { name: 'mine' };
-    expect(run({ name: 'signature', previousElementSibling: mine })).toEqual([
-      'focus', 'select mine', 'collapse end', 'clear', 'add range',
-    ]);
-  });
-
-  it('puts the caret in front of a signature or quote that comes first', () => {
-    expect(run({ name: 'quote', previousElementSibling: null })).toEqual([
-      'focus', 'before quote', 'collapse start', 'clear', 'add range',
-    ]);
-  });
-
-  it('puts the caret at the end without signature or quote', () => {
-    expect(run(null)).toEqual(['focus', 'select editor', 'collapse end', 'clear', 'add range']);
-  });
-
-  it('is part of the page script and of its bridge', () => {
-    const html = buildEditorHtml({ initialHtml: '<p><br></p>', placeholder: 'Write…', c: LIGHT_COLORS });
-    expect(html).toContain('function focusEnd(editor)');
-    expect(html).toContain('focusEnd: function () { focusEnd(editor); }');
-  });
-});

src/lib/__tests__/login-errors.test.ts

@@ -16,14 +16,6 @@ describe('describeLoginError', () => {
     expect(copy.detail).toMatch(/app password/i);
   });
 
-  it('blames a refused access token on the token, not on a password', () => {
-    for (const err of [named('InvalidTokenError', 'Invalid access token'), 'Invalid access token']) {
-      const copy = describeLoginError(err);
-      expect(copy.detail).toMatch(/access token/);
-      expect(copy.detail).not.toMatch(/password/i);
-    }
-  });
-
   it('explains the auth store\'s "Session expired" notice', () => {
     expect(describeLoginError('Session expired').title).toBe('Your session has expired. Please sign in again.');
     expect(describeLoginError('Session expired for this account').title).toBe('Your session has expired. Please sign in again.');

src/lib/__tests__/module-timings.test.ts

@@ -1,31 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import fs from 'node:fs';
-import path from 'node:path';
-
-// scripts/perf/module-timings.js wraps Metro's module definitions and adds
-// up each module's own evaluation time, without the time of the modules it
-// required while it ran.
-
-function install(clock: { t: number }) {
-  const g: Record<string, unknown> = { nativePerformanceNow: () => clock.t };
-  const factories = new Map<number, () => void>();
-  g.__d = (factory: () => void, id: number) => { factories.set(id, factory); };
-  const src = fs.readFileSync(path.resolve(__dirname, '../../../scripts/perf/module-timings.js'), 'utf8');
-  new Function('globalThis', src)(g);
-  (g.__d as (f: () => void, id: number) => void)(() => { clock.t += 5; }, 2);
-  (g.__d as (f: () => void, id: number) => void)(() => {
-    clock.t += 10;
-    factories.get(2)!();
-    clock.t += 3;
-  }, 1);
-  return { run: (id: number) => factories.get(id)!(), times: () => g.__bulwarkModuleTimes as Record<number, number> };
-}
-
-describe('module timings polyfill', () => {
-  it('counts a module without the modules it required', () => {
-    const clock = { t: 0 };
-    const m = install(clock);
-    m.run(1);
-    expect(m.times()).toEqual({ 1: 13, 2: 5 });
-  });
-});

src/lib/__tests__/perf-marks.test.ts

@@ -1,78 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-// The module reads its switch once at load, so each case loads it fresh
-// with its own react-native mock.
-async function load(os: 'ios' | 'android', setting: unknown) {
-  vi.resetModules();
-  vi.doMock('react-native', () => ({
-    Platform: { OS: os },
-    Settings: { get: vi.fn(() => setting) },
-  }));
-  return import('../perf-marks');
-}
-
-describe('perf marks', () => {
-  let log: ReturnType<typeof vi.spyOn>;
-  beforeEach(() => {
-    log = vi.spyOn(console, 'log').mockImplementation(() => undefined);
-  });
-  afterEach(() => {
-    log.mockRestore();
-    vi.doUnmock('react-native');
-  });
-
-  it('logs nothing without the launch argument', async () => {
-    const m = await load('ios', undefined);
-    m.perfMark('bundle-loaded');
-    m.perfStart('open-message');
-    m.perfEnd('open-message');
-    m.perfOnce('inbox-rendered');
-    expect(m.perfMarksEnabled()).toBe(false);
-    expect(log).not.toHaveBeenCalled();
-  });
-
-  it('stays off on Android even when the setting is there', async () => {
-    const m = await load('android', 'YES');
-    m.perfMark('bundle-loaded');
-    expect(log).not.toHaveBeenCalled();
-  });
-
-  it('logs marks and span durations with -perfMarks YES', async () => {
-    const m = await load('ios', 'YES');
-    vi.useFakeTimers();
-    vi.setSystemTime(1_000);
-    m.perfStart('open-message');
-    vi.setSystemTime(1_250);
-    m.perfEnd('open-message', { id: 'x' });
-    vi.useRealTimers();
-    expect(log).toHaveBeenCalledTimes(1);
-    const line = String(log.mock.calls[0][0]);
-    expect(line.startsWith('[perf] ')).toBe(true);
-    expect(JSON.parse(line.slice(7))).toEqual({ n: 'open-message', t: 1_250, ms: 250, id: 'x' });
-  });
-
-  it('logs a once-mark only once and ignores an end without a start', async () => {
-    const m = await load('ios', true);
-    m.perfOnce('inbox-rendered', { rows: 3 });
-    m.perfOnce('inbox-rendered', { rows: 9 });
-    m.perfEnd('never-started');
-    expect(log).toHaveBeenCalledTimes(1);
-    expect(String(log.mock.calls[0][0])).toContain('"rows":3');
-  });
-  it('logs the slowest modules once, with the total', async () => {
-    const m = await load('ios', true);
-    (globalThis as { __bulwarkModuleTimes?: Record<string, number> }).__bulwarkModuleTimes = { 7: 12.34, 3: 50, 9: 1 };
-    try {
-      m.logModuleTimes();
-      m.logModuleTimes();
-      const lines = log.mock.calls.map((c: unknown[]) => String(c[0])).filter((l: string) => l.includes('module-times'));
-      expect(lines).toHaveLength(1);
-      const mark = JSON.parse(lines[0].slice('[perf] '.length));
-      expect(mark.total).toBe(63);
-      expect(mark.count).toBe(3);
-      expect(mark.top).toBe('3:50,7:12.3,9:1');
-    } finally {
-      delete (globalThis as { __bulwarkModuleTimes?: unknown }).__bulwarkModuleTimes;
-    }
-  });
-});

src/lib/after-modal-dismiss.ts

@@ -1,42 +0,0 @@
-// iOS can't present a view controller (the photo picker, the camera, the
-// document picker, a share sheet) while a React Native Modal is still
-// dismissing: UIKit drops the request without an error and the picker never
-// shows. A sheet whose option opens a picker has to wait until it is gone.
-//
-// run() keeps the action until flush(), which the Modal's onDismiss calls.
-// A timer flushes too, in case onDismiss doesn't fire. Android has no such
-// limit, so the action runs right away there.
-
-export interface AfterDismissQueue {
-  run(action: () => void): void;
-  flush(): void;
-}
-
-export function createAfterDismissQueue(
-  platform: string,
-  fallbackMs = 600,
-): AfterDismissQueue {
-  let pending: (() => void) | null = null;
-  let timer: ReturnType<typeof setTimeout> | null = null;
-
-  const flush = () => {
-    if (timer) clearTimeout(timer);
-    timer = null;
-    const action = pending;
-    pending = null;
-    action?.();
-  };
-
-  return {
-    run(action) {
-      if (platform !== 'ios') {
-        action();
-        return;
-      }
-      if (timer) clearTimeout(timer);
-      pending = action;
-      timer = setTimeout(flush, fallbackMs);
-    },
-    flush,
-  };
-}

src/lib/editor-html.ts

@@ -64,33 +64,6 @@ export function shouldBlockEditorRemoteImages(opts: {
   return !senderTrusted;
 }
 
-/**
- * Page-script function for a tap on the empty space under the editor: focus
- * it with the caret where the user's own text goes, in front of the
- * signature or the quoted message, else at the end. A string, embedded in
- * the page script and run by the unit test against stand-in DOM objects.
- */
-export const FOCUS_END_SOURCE = `function focusEnd(editor) {
-    editor.focus();
-    var sel = window.getSelection();
-    if (!sel) return;
-    var stop = editor.querySelector('[data-signature-block="start"], [data-signature-block="separator"], [data-quoted-html]');
-    var range = document.createRange();
-    var prev = stop ? stop.previousElementSibling : null;
-    if (prev) {
-      range.selectNodeContents(prev);
-      range.collapse(false);
-    } else if (stop) {
-      range.setStartBefore(stop);
-      range.collapse(true);
-    } else {
-      range.selectNodeContents(editor);
-      range.collapse(false);
-    }
-    sel.removeAllRanges();
-    sel.addRange(range);
-  }`;
-
 export function buildEditorHtml(opts: {
   initialHtml: string;
   placeholder: string;
@@ -288,8 +261,6 @@ export function buildEditorHtml(opts: {
   });
 
   // ── Bridge: receive commands from RN ───────────────────────────────
-  ${FOCUS_END_SOURCE}
-
   window.__rne = {
     exec: function (command, value) {
       editor.focus();
@@ -392,7 +363,6 @@ export function buildEditorHtml(opts: {
       post('htmlSnapshot', { id: id, html: editor.innerHTML });
     },
     focus: function () { editor.focus(); },
-    focusEnd: function () { focusEnd(editor); },
   };
 
   reportHeight();

src/lib/login-errors.ts

@@ -151,13 +151,6 @@ export function describeLoginError(err: unknown, context: LoginErrorContext = {}
     };
   }
 
-  if (name === 'InvalidTokenError' || lower.includes('invalid access token')) {
-    return {
-      title: t('login.mobile.err_bad_title', "That didn't work"),
-      detail: t('login.error.invalid_token', 'The server did not accept this access token. Check that it is complete and has not expired or been revoked.'),
-    };
-  }
-
   if (name === 'AuthenticationError' || lower.includes('invalid username or password')) {
     return {
       title: t('login.mobile.err_bad_title', "That didn't work"),

src/lib/perf-marks.ts

@@ -1,140 +0,0 @@
-// Timing marks for the performance harness (scripts/e2e/perf.mjs).
-//
-// Off unless the app was launched with the `-perfMarks YES` launch argument
-// (iOS puts launch arguments into NSUserDefaults, which React Native's
-// Settings module reads). When on, every mark is one `[perf]` line on the
-// console; on iOS that lands in the system log, where the harness reads it
-// with `log show --info`. Nothing is stored or sent anywhere.
-
-import { Platform, Settings } from 'react-native';
-
-function readEnabled(): boolean {
-  try {
-    if (Platform.OS !== 'ios') return false;
-    const value = Settings.get('perfMarks') as unknown;
-    return value === true || value === 'YES' || value === 'true' || value === 1 || value === '1';
-  } catch {
-    return false;
-  }
-}
-
-const enabled = readEnabled();
-
-export function perfMarksEnabled(): boolean {
-  return enabled;
-}
-
-/** Log a mark with the wall-clock time (the harness compares across processes). */
-export function perfMark(name: string, detail?: Record<string, string | number | boolean>): void {
-  if (!enabled) return;
-  console.log(`[perf] ${JSON.stringify({ n: name, t: Date.now(), ...detail })}`);
-}
-
-const started = new Map<string, number>();
-
-/** Start a timed span; `perfEnd` with the same name logs its duration. */
-export function perfStart(name: string): void {
-  if (!enabled) return;
-  started.set(name, Date.now());
-}
-
-export function perfEnd(name: string, detail?: Record<string, string | number | boolean>): void {
-  if (!enabled) return;
-  const t0 = started.get(name);
-  if (t0 === undefined) return;
-  started.delete(name);
-  perfMark(name, { ms: Date.now() - t0, ...detail });
-}
-
-/** Log how far into a running span a step got, without ending it. */
-export function perfLap(name: string, lap: string): void {
-  if (!enabled) return;
-  const t0 = started.get(name);
-  if (t0 === undefined) return;
-  perfMark(`${name}:${lap}`, { ms: Date.now() - t0 });
-}
-
-/**
- * End a span once the next frames are drawn: two animation frames after the
- * state change that rendered the result, so the time includes commit and
- * paint, not just the JS render.
- */
-export function perfEndAfterPaint(name: string, detail?: Record<string, string | number | boolean>): void {
-  if (!enabled || !started.has(name)) return;
-  requestAnimationFrame(() => requestAnimationFrame(() => perfEnd(name, detail)));
-}
-
-let onceDone = new Set<string>();
-/** A mark that is logged once per process (first inbox render, ...). */
-export function perfOnce(name: string, detail?: Record<string, string | number | boolean>): void {
-  if (!enabled || onceDone.has(name)) return;
-  onceDone.add(name);
-  perfMark(name, detail);
-}
-
-/**
- * The modules whose own evaluation took longest so far, when the bundle was
- * built with BULWARK_MODULE_TIMINGS (scripts/perf/module-timings.js): the
- * 60 slowest as "id:ms" pairs, plus the total. Logged once, at first inbox.
- */
-export function logModuleTimes(): void {
-  if (!enabled || onceDone.has('module-times')) return;
-  const times = (globalThis as { __bulwarkModuleTimes?: Record<string, number> }).__bulwarkModuleTimes;
-  if (!times) return;
-  onceDone.add('module-times');
-  const entries = Object.entries(times);
-  const total = entries.reduce((sum, [, ms]) => sum + ms, 0);
-  const top = entries
-    .sort((a, b) => b[1] - a[1])
-    .slice(0, 60)
-    .map(([id, ms]) => `${id}:${Math.round(ms * 10) / 10}`)
-    .join(',');
-  perfMark('module-times', { total: Math.round(total), count: entries.length, top });
-}
-
-/** Test hook. */
-export function resetPerfMarks(): void {
-  started.clear();
-  onceDone = new Set();
-}
-
-/**
- * Frame monitor for scrolling: counts animation frames between `start` and
- * `stop` and how many of them took longer than two vsyncs (a visible hitch
- * at 60 Hz). JS-thread frames, so it shows JS work blocking during a scroll.
- */
-export function createFrameMonitor(name: string): { start: () => void; stop: () => void } {
-  let raf: number | null = null;
-  let last = 0;
-  let frames = 0;
-  let long = 0;
-  let worst = 0;
-  let t0 = 0;
-  const tick = (now: number) => {
-    if (last) {
-      const dt = now - last;
-      frames += 1;
-      if (dt > 34) long += 1;
-      if (dt > worst) worst = dt;
-    }
-    last = now;
-    raf = requestAnimationFrame(tick);
-  };
-  return {
-    start() {
-      if (!enabled || raf !== null) return;
-      frames = 0;
-      long = 0;
-      worst = 0;
-      last = 0;
-      t0 = Date.now();
-      raf = requestAnimationFrame(tick);
-    },
-    stop() {
-      if (raf === null) return;
-      cancelAnimationFrame(raf);
-      raf = null;
-      perfMark(name, { ms: Date.now() - t0, frames, long, worst: Math.round(worst) });
-    },
-  };
-}

src/screens/ComposeScreen.tsx

@@ -32,7 +32,6 @@ import { getEmailInitials } from '../lib/avatar-utils';
 import { useContactsStore, type RecipientSuggestion } from '../stores/contacts-store';
 import { useKeyboardObstruction } from '../lib/use-keyboard-obstruction';
 import { useLayout } from '../lib/use-layout';
-import { createAfterDismissQueue } from '../lib/after-modal-dismiss';
 import { useLocaleStore } from '../stores/locale-store';
 import { useSettingsStore } from '../stores/settings-store';
 import { useHasContacts } from '../lib/capabilities';
@@ -376,26 +375,16 @@ function OptionsSheet({
 }) {
   const c = useColors();
   const styles = React.useMemo(() => makeStyles(c), [c]);
-  // An option may open a system picker, which iOS only shows once this
-  // modal is gone.
-  const afterDismiss = React.useRef(createAfterDismissQueue(Platform.OS)).current;
   return (
-    <Modal
+    <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="fade" onRequestClose={onClose}>
-      supportedOrientations={MODAL_ORIENTATIONS}
+      <Pressable style={styles.modalBackdrop} onPress={onClose}>
-      visible={visible}
+        <Pressable style={styles.scheduleCard} onPress={() => {}}>
-      transparent
-      animationType="fade"
-      onRequestClose={onClose}
-      onDismiss={afterDismiss.flush}
-    >
-      <Pressable accessible={false} style={styles.modalBackdrop} onPress={onClose}>
-        <Pressable accessible={false} style={styles.scheduleCard} onPress={() => {}}>
           {!!title && <Text style={styles.modalTitle} numberOfLines={2}>{title}</Text>}
           {options.map((opt) => (
             <Pressable
               key={opt.label}
               style={styles.scheduleRow}
-              onPress={() => { onClose(); afterDismiss.run(opt.onPress); }}
+              onPress={() => { onClose(); opt.onPress(); }}
             >
               <Text style={[styles.scheduleRowLabel, opt.destructive && { color: c.error }]}>{opt.label}</Text>
             </Pressable>
@@ -2495,16 +2484,6 @@ export default function ComposeScreen({ route, navigation }: Props) {
               onViewportShift={onEditorViewportShift}
             />
           )}
-          {/* The empty space under the body looks like part of it (on a
-              tablet, most of the panel): a tap there starts typing in it. */}
-          <Pressable
-            style={styles.bodyFiller}
-            accessible={false}
-            onPress={() => {
-              if (plainTextMode) plainBodyRef.current?.focus();
-              else editorRef.current?.focusEnd();
-            }}
-          />
         </ScrollView>
 
         {/* A phone in landscape with the keyboard up has room for a few lines
@@ -2668,8 +2647,8 @@ export default function ComposeScreen({ route, navigation }: Props) {
 
       {/* Text / background colour palette */}
       <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={!!colorTarget} transparent animationType="fade" onRequestClose={() => setColorTarget(null)}>
-        <Pressable accessible={false} style={styles.modalBackdrop} onPress={() => setColorTarget(null)}>
+        <Pressable style={styles.modalBackdrop} onPress={() => setColorTarget(null)}>
-          <Pressable accessible={false} style={styles.scheduleCard} onPress={() => {}}>
+          <Pressable style={styles.scheduleCard} onPress={() => {}}>
             <Text style={styles.modalTitle}>
               {colorTarget === 'background'
                 ? t('email_composer.toolbar.background_color', 'Background color')
@@ -2737,8 +2716,8 @@ export default function ComposeScreen({ route, navigation }: Props) {
         animationType="fade"
         onRequestClose={() => setScheduleSheetOpen(false)}
       >
-        <Pressable accessible={false} style={styles.modalBackdrop} onPress={() => setScheduleSheetOpen(false)}>
+        <Pressable style={styles.modalBackdrop} onPress={() => setScheduleSheetOpen(false)}>
-          <Pressable accessible={false} style={styles.scheduleCard} onPress={() => {}}>
+          <Pressable style={styles.scheduleCard} onPress={() => {}}>
             <Text style={styles.modalTitle}>
               {t('email_composer.schedule_send', 'Schedule send')}
             </Text>
@@ -2771,8 +2750,8 @@ export default function ComposeScreen({ route, navigation }: Props) {
 
       {customStage !== null && Platform.OS === 'ios' && (
         <Modal supportedOrientations={MODAL_ORIENTATIONS} transparent animationType="fade" onRequestClose={() => setCustomStage(null)}>
-          <Pressable accessible={false} style={styles.modalBackdrop} onPress={() => setCustomStage(null)}>
+          <Pressable style={styles.modalBackdrop} onPress={() => setCustomStage(null)}>
-            <Pressable accessible={false} style={styles.scheduleCard} onPress={() => {}}>
+            <Pressable style={styles.scheduleCard} onPress={() => {}}>
               <DateTimePicker
                 value={customDraftRef.current}
                 mode="datetime"
@@ -3001,7 +2980,6 @@ function makeStyles(c: ThemePalette) {
     backgroundColor: c.background,
   },
   scrollContent: { flexGrow: 1 },
-  bodyFiller: { flexGrow: 1, minHeight: 48 },
 
   header: {
     flexDirection: 'row',

src/screens/ContactDetailScreen.tsx

@@ -1,7 +1,8 @@
 import React from 'react';
 import {
   View, Text, StyleSheet, Pressable, ScrollView, Linking, Alert, Image, Share,
-  Animated, Dimensions, Easing, } from 'react-native';
+  Animated, Dimensions, Easing, Modal,
+} from 'react-native';
 import * as FileSystem from 'expo-file-system/legacy';
 import * as Sharing from 'expo-sharing';
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -34,7 +35,6 @@ import { useColors } from '../theme/colors';
 import { useLocaleStore, type TranslateFn } from '../stores/locale-store';
 import { MODAL_ORIENTATIONS } from '../lib/modal-orientations';
 import { useSheetInsets } from '../lib/use-layout';
-import { SafeAreaModal } from '../components/SafeAreaModal';
 
 type Nav = NativeStackNavigationProp<RootStackParamList, 'ContactDetail'>;
 type Route = RouteProp<RootStackParamList, 'ContactDetail'>;
@@ -814,7 +814,7 @@ function MoreActionsSheet({
   }, [visible, slideY, overlayOpacity]);
 
   return (
-    <SafeAreaModal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="none" statusBarTranslucent onRequestClose={onClose}>
+    <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={visible} transparent animationType="none" statusBarTranslucent onRequestClose={onClose}>
       <Animated.View style={[styles.sheetOverlay, { opacity: overlayOpacity }]}>
         <Pressable style={{ flex: 1 }} onPress={onClose} />
       </Animated.View>
@@ -846,7 +846,7 @@ function MoreActionsSheet({
           })}
         </SafeAreaView>
       </Animated.View>
-    </SafeAreaModal>
+    </Modal>
   );
 }
 

src/screens/ContactFormScreen.tsx

@@ -1254,7 +1254,6 @@ export default function ContactFormScreen() {
                     style={styles.input}
                     placeholder={t('contacts.form.given_name', 'First name')}
                     ref={givenRef}
-                    testID="contact-first-name"
                     returnKeyType="next"
                     blurOnSubmit={false}
                     onSubmitEditing={() => middleRef.current?.focus()}
@@ -1281,7 +1280,6 @@ export default function ContactFormScreen() {
                     style={styles.input}
                     placeholder={t('contacts.form.surname', 'Last name')}
                     ref={surnameRef}
-                    testID="contact-last-name"
                     returnKeyType="next"
                     blurOnSubmit={false}
                     onSubmitEditing={() => fullRef.current?.focus()}
@@ -1349,7 +1347,6 @@ export default function ContactFormScreen() {
                   style={styles.input}
                   placeholder={t('contacts.form.email_placeholder', 'email@example.com')}
                   ref={i === 0 ? firstEmailRef : undefined}
-                  testID={`contact-email-${i}`}
                   placeholderTextColor={c.textMuted}
                   keyboardType="email-address"
                   autoCapitalize="none"

src/screens/EmailListScreen.tsx

@@ -56,7 +56,6 @@ import { getFullEmail, emptyMailbox as apiEmptyMailbox } from '../api/email';
 import type { RootStackParamList } from '../navigation/types';
 import { usePendingMailSearch } from '../navigation/pending-mail-search';
 import type { Attachment, Email } from '../api/types';
-import { createFrameMonitor, logModuleTimes, perfOnce, perfStart } from '../lib/perf-marks';
 import { MODAL_ORIENTATIONS } from '../lib/modal-orientations';
 
 function getSenderName(email: Email, unknownLabel: string): string {
@@ -474,17 +473,6 @@ export default function EmailListScreen({
     () => collapseThreads(emails, disableThreading),
     [emails, disableThreading],
   );
-  // Performance harness (off unless launched with -perfMarks YES).
-  const scrollMonitor = React.useMemo(() => createFrameMonitor('list-scroll'), []);
-  React.useEffect(() => { perfOnce('list-mounted'); }, []);
-  React.useEffect(() => {
-    if (visibleEmails.length > 0) {
-      requestAnimationFrame(() => {
-        perfOnce('inbox-rendered', { rows: visibleEmails.length });
-        logModuleTimes();
-      });
-    }
-  }, [visibleEmails.length]);
   const threadGroups = React.useMemo(
     () => groupByThread(emails, disableThreading),
     [emails, disableThreading],
@@ -657,10 +645,7 @@ export default function EmailListScreen({
       const email = emailsRef.current.find((e) => rowKeyOf(e) === id);
       if (!email) return;
       if (isDraftEmail(email, currentRoleRef.current)) void openDraftRef.current(email);
-      else {
+      else onEmailPressRef.current?.(email);
-        perfStart('open-message');
-        onEmailPressRef.current?.(email);
-      }
     }
   }, [toggleSelect]);
 
@@ -1578,8 +1563,6 @@ export default function EmailListScreen({
           contentContainerStyle={styles.listContent}
           onEndReached={handleEndReached}
           onEndReachedThreshold={0.3}
-          onScrollBeginDrag={scrollMonitor.start}
-          onMomentumScrollEnd={scrollMonitor.stop}
           refreshing={loading}
           onRefresh={handleRefresh}
         />
@@ -1587,10 +1570,7 @@ export default function EmailListScreen({
 
       {/* Compose FAB - matches webmail mobile: PenSquare, h-14 w-14, rounded-full, shadow-lg */}
       <Pressable
-        onPress={() => {
+        onPress={onComposePress}
-          perfStart('compose-open');
-          onComposePress?.();
-        }}
         style={({ pressed }) => [
           styles.fab,
           // Lifted over the phone's undo bar, which used to cover it.
@@ -1613,9 +1593,9 @@ export default function EmailListScreen({
         animationType="fade"
         onRequestClose={() => setFilterMenuOpen(false)}
       >
-        <TouchableWithoutFeedback accessible={false} onPress={() => setFilterMenuOpen(false)}>
+        <TouchableWithoutFeedback onPress={() => setFilterMenuOpen(false)}>
           <View style={styles.filterBackdrop}>
-            <TouchableWithoutFeedback accessible={false}>
+            <TouchableWithoutFeedback>
               <View style={styles.filterMenu}>
                 <View style={styles.filterMenuHeader}>
                   <Text style={styles.filterMenuTitle}>{t('email_list.filter_title', 'Filter emails')}</Text>

src/screens/FilesScreen.tsx

@@ -1179,9 +1179,9 @@ function PromptModal(props: PromptModalProps) {
       animationType="fade"
       onRequestClose={props.onCancel}
     >
-      <TouchableWithoutFeedback accessible={false} onPress={props.onCancel}>
+      <TouchableWithoutFeedback onPress={props.onCancel}>
         <View style={styles.backdrop}>
-          <TouchableWithoutFeedback accessible={false}>
+          <TouchableWithoutFeedback>
             <View style={styles.dialog}>
               <Text style={styles.title}>{props.title}</Text>
               <TextInput
@@ -1246,9 +1246,9 @@ function ActionsSheet({
   const modified = modifiedOf(target);
   return (
     <Modal supportedOrientations={MODAL_ORIENTATIONS} visible transparent animationType="slide" onRequestClose={onClose}>
-      <TouchableWithoutFeedback accessible={false} onPress={onClose}>
+      <TouchableWithoutFeedback onPress={onClose}>
         <View style={[styles.backdrop, { paddingLeft: sheetInsets.left, paddingRight: sheetInsets.right }]}>
-          <TouchableWithoutFeedback accessible={false}>
+          <TouchableWithoutFeedback>
             <View style={styles.sheet}>
               <Text style={styles.sheetTitle} numberOfLines={1}>
                 {target.displayName}
@@ -1370,9 +1370,9 @@ function FolderPickerSheet({ target, allNodes, rootLabel, t, onClose, onPick }:
   const currentParent = target.parentId ?? null;
   return (
     <Modal supportedOrientations={MODAL_ORIENTATIONS} visible transparent animationType="slide" onRequestClose={onClose}>
-      <TouchableWithoutFeedback accessible={false} onPress={onClose}>
+      <TouchableWithoutFeedback onPress={onClose}>
         <View style={[styles.backdrop, { paddingLeft: sheetInsets.left, paddingRight: sheetInsets.right }]}>
-          <TouchableWithoutFeedback accessible={false}>
+          <TouchableWithoutFeedback>
             <View style={styles.sheet}>
               <Text style={styles.sheetTitle} numberOfLines={1}>
                 {t('files.move_to', 'Move to…')} · {target.displayName}
@@ -1427,9 +1427,9 @@ function SortSheet({ visible, sortKey, sortDir, t, onClose, onChangeKey, onChang
   const keys: FilesSortKey[] = ['name', 'size', 'modified'];
   return (
     <Modal supportedOrientations={MODAL_ORIENTATIONS} visible transparent animationType="slide" onRequestClose={onClose}>
-      <TouchableWithoutFeedback accessible={false} onPress={onClose}>
+      <TouchableWithoutFeedback onPress={onClose}>
         <View style={[styles.backdrop, { paddingLeft: sheetInsets.left, paddingRight: sheetInsets.right }]}>
-          <TouchableWithoutFeedback accessible={false}>
+          <TouchableWithoutFeedback>
             <View style={styles.sheet}>
               <Text style={styles.sheetTitle}>{t('files.settings_default_sort', 'Sort')}</Text>
               {keys.map((k) => (

src/screens/LoginScreen.tsx

@@ -80,7 +80,6 @@ function signInLinkConfirmation(
  */
 export default function LoginScreen({ onLogin, isAddMode = false, onCancel }: LoginScreenProps) {
   const login = useAuthStore((state) => state.login);
-  const loginWithToken = useAuthStore((state) => state.loginWithToken);
   const loginViaWebmail = useAuthStore((state) => state.loginViaWebmail);
   const loginViaPairing = useAuthStore((state) => state.loginViaPairing);
   const clearError = useAuthStore((state) => state.clearError);
@@ -103,10 +102,6 @@ export default function LoginScreen({ onLogin, isAddMode = false, onCancel }: Lo
   // common no-2FA sign-in stays a two-field form.
   const [totp, setTotp] = React.useState('');
   const [totpRequired, setTotpRequired] = React.useState(false);
-  // Access-token (Bearer) sign-in in place of username and password, for
-  // providers that hand out API tokens (Fastmail accepts nothing else).
-  const [tokenMode, setTokenMode] = React.useState(false);
-  const [accessToken, setAccessToken] = React.useState('');
   const [failedDomain, setFailedDomain] = React.useState<string | null>(null);
   const [notice, setNotice] = React.useState<LoginErrorCopy | null>(null);
   const [searching, setSearching] = React.useState(false);
@@ -266,7 +261,6 @@ export default function LoginScreen({ onLogin, isAddMode = false, onCancel }: Lo
       setPassword(pending.password);
       setServerUrl(pending.serverUrl);
       setTotpRequired(true);
-      setTokenMode(false);
       setBusy(null);
       setNotice(describeLoginError(err, { serverUrl: target, t }));
       setHistory((prev) => [...prev, step]);
@@ -346,26 +340,6 @@ export default function LoginScreen({ onLogin, isAddMode = false, onCancel }: Lo
       setNotice({ title: t('login.mobile.notice_need_server', 'We need a server address first') });
       return;
     }
-
-    if (tokenMode) {
-      if (!accessToken.trim()) {
-        setNotice({ title: t('login.token_placeholder', 'Paste your API token') });
-        return;
-      }
-      setNotice(null);
-      setBusy('connecting');
-      const wasAuthenticated = useAuthStore.getState().isAuthenticated;
-      try {
-        await loginWithToken(target, accessToken, { addAccount: isAddMode });
-        finishIfSignedIn(wasAuthenticated);
-      } catch (err) {
-        setNotice(describeLoginError(err, { serverUrl: target, t }));
-      } finally {
-        setBusy(null);
-      }
-      return;
-    }
-
     if (!email.trim() || !password) {
       setNotice({ title: t('login.mobile.notice_need_credentials', 'Enter your email and password') });
       return;
@@ -395,7 +369,7 @@ export default function LoginScreen({ onLogin, isAddMode = false, onCancel }: Lo
     } finally {
       setBusy(null);
     }
-  }, [accessToken, email, finishIfSignedIn, isAddMode, login, loginWithToken, password, serverInput, serverUrl, tokenMode, totp, totpRequired, t]);
+  }, [email, finishIfSignedIn, isAddMode, login, password, serverInput, serverUrl, totp, totpRequired, t]);
 
   // A sign-in code, however it arrived: scanned, pasted, or a tapped
   // `bulwarkmail://` link.
@@ -543,7 +517,7 @@ export default function LoginScreen({ onLogin, isAddMode = false, onCancel }: Lo
       <SigningInStep
         phase={busy}
         serverUrl={pairing ? pairingWebmailUrl : serverUrl || knownServerUrl}
-        email={pairing || tokenMode ? null : email.trim() || null}
+        email={pairing ? null : email.trim() || null}
       />
     );
   }
@@ -681,17 +655,6 @@ export default function LoginScreen({ onLogin, isAddMode = false, onCancel }: Lo
             }}
             onSubmit={() => void handlePasswordSubmit()}
             notice={notice}
-            tokenMode={tokenMode}
-            token={accessToken}
-            onChangeToken={(value) => {
-              setNotice(null);
-              setAccessToken(value);
-            }}
-            onToggleTokenMode={() => {
-              setNotice(null);
-              clearError();
-              setTokenMode((v) => !v);
-            }}
           />
         ) : null}
       </LoginShell>

src/screens/ScheduledScreen.tsx

@@ -326,8 +326,8 @@ export default function ScheduledScreen({ navigation }: Props) {
 
       {/* Per-message actions */}
       <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={!!actionsFor} transparent animationType="fade" onRequestClose={() => setActionsFor(null)}>
-        <Pressable accessible={false} style={styles.modalBackdrop} onPress={() => setActionsFor(null)}>
+        <Pressable style={styles.modalBackdrop} onPress={() => setActionsFor(null)}>
-          <Pressable accessible={false} style={styles.card} onPress={() => {}}>
+          <Pressable style={styles.card} onPress={() => {}}>
             <Text style={styles.cardTitle} numberOfLines={2}>
               {actionsFor?.subject || t('email_composer.no_subject', '(No Subject)')}
             </Text>
@@ -349,8 +349,8 @@ export default function ScheduledScreen({ navigation }: Props) {
 
       {/* Reschedule presets */}
       <Modal supportedOrientations={MODAL_ORIENTATIONS} visible={!!rescheduleFor && customStage === null} transparent animationType="fade" onRequestClose={() => setRescheduleFor(null)}>
-        <Pressable accessible={false} style={styles.modalBackdrop} onPress={() => setRescheduleFor(null)}>
+        <Pressable style={styles.modalBackdrop} onPress={() => setRescheduleFor(null)}>
-          <Pressable accessible={false} style={styles.card} onPress={() => {}}>
+          <Pressable style={styles.card} onPress={() => {}}>
             <Text style={styles.cardTitle}>{t('email_list.reschedule_send', 'Reschedule')}</Text>
             {reschedulePresets.map((preset) => (
               <Pressable
@@ -379,8 +379,8 @@ export default function ScheduledScreen({ navigation }: Props) {
 
       {customStage !== null && Platform.OS === 'ios' && (
         <Modal supportedOrientations={MODAL_ORIENTATIONS} transparent animationType="fade" onRequestClose={() => setCustomStage(null)}>
-          <Pressable accessible={false} style={styles.modalBackdrop} onPress={() => setCustomStage(null)}>
+          <Pressable style={styles.modalBackdrop} onPress={() => setCustomStage(null)}>
-            <Pressable accessible={false} style={styles.card} onPress={() => {}}>
+            <Pressable style={styles.card} onPress={() => {}}>
               <DateTimePicker
                 value={customDraftRef.current}
                 mode="datetime"

src/screens/login/PasswordStep.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { View, Text, Pressable, StyleSheet, type TextInput } from 'react-native';
-import { Eye, EyeOff, KeyRound } from '../../components/icons';
+import { Eye, EyeOff } from '../../components/icons';
 import { spacing, typography, type ThemePalette } from '../../theme/tokens';
 import { useColors } from '../../theme/colors';
 import { Button, Input } from '../../components';
@@ -19,11 +19,6 @@ interface PasswordStepProps {
   onChangeTotp?: (value: string) => void;
   onSubmit: () => void;
   notice?: { title: string; detail?: string } | null;
-  /** Access-token sign-in in place of username and password. */
-  tokenMode?: boolean;
-  token?: string;
-  onChangeToken?: (value: string) => void;
-  onToggleTokenMode?: () => void;
 }
 
 function hostOf(url: string): string {
@@ -43,10 +38,6 @@ export default function PasswordStep({
   onChangeTotp,
   onSubmit,
   notice,
-  tokenMode = false,
-  token = '',
-  onChangeToken,
-  onToggleTokenMode,
 }: PasswordStepProps) {
   const c = useColors();
   const styles = React.useMemo(() => makeStyles(c), [c]);
@@ -61,107 +52,74 @@ export default function PasswordStep({
       <View style={styles.heading}>
         <Text style={styles.title}>{t('login.mobile.password_title', 'Sign in to {host}', { host: hostOf(serverUrl) })}</Text>
         <Text style={styles.subtitle}>
-          {tokenMode
+          {t('login.mobile.password_subtitle', 'Your password is sent to this server only, and stored in the device keychain.')}
-            ? t('login.token_hint', "Create an API token in your mail provider's settings and paste it here.")
-            : t('login.mobile.password_subtitle', 'Your password is sent to this server only, and stored in the device keychain.')}
         </Text>
       </View>
 
-      {tokenMode ? (
+      <Input
+        label={t('login.mobile.username_label', 'Email or username')}
+        placeholder={t('login.username_placeholder', 'user@example.com')}
+        value={email}
+        onChangeText={onChangeEmail}
+        testID="login-username-input"
+        autoCapitalize="none"
+        autoCorrect={false}
+        autoComplete="email"
+        textContentType="username"
+        keyboardType="email-address"
+        returnKeyType="next"
+        blurOnSubmit={false}
+        onSubmitEditing={() => passwordRef.current?.focus()}
+      />
+
+      <Input
+        label={t('login.password_label', 'Password')}
+        placeholder={t('login.password_placeholder', 'Enter your password')}
+        value={password}
+        onChangeText={onChangePassword}
+        testID="login-password-input"
+        autoFocus={Boolean(email)}
+        secureTextEntry={!showPassword}
+        autoComplete="current-password"
+        textContentType="password"
+        ref={passwordRef}
+        returnKeyType={totpRequired ? 'next' : 'go'}
+        blurOnSubmit={!totpRequired}
+        onSubmitEditing={totpRequired ? () => totpRef.current?.focus() : onSubmit}
+        rightIcon={
+          <Pressable
+            onPress={() => setShowPassword((v) => !v)}
+            hitSlop={14}
+            accessibilityRole="button"
+            accessibilityLabel={showPassword ? t('login.hide_password', 'Hide password') : t('login.show_password', 'Show password')}
+          >
+            {showPassword ? <EyeOff size={20} color={c.textMuted} /> : <Eye size={20} color={c.textMuted} />}
+          </Pressable>
+        }
+      />
+
+      {totpRequired ? (
         <Input
-          label={t('login.token_label', 'Access token')}
+          label={t('login.totp_label', 'Two-factor code')}
-          placeholder={t('login.token_placeholder', 'Paste your API token')}
+          placeholder="123456"
-          value={token}
+          value={totp}
-          onChangeText={(value) => onChangeToken?.(value)}
+          ref={totpRef}
-          testID="login-token-input"
+          onChangeText={(value) => onChangeTotp?.(value)}
           autoFocus
-          secureTextEntry
+          keyboardType="number-pad"
-          autoCapitalize="none"
+          autoComplete="one-time-code"
-          autoCorrect={false}
+          textContentType="oneTimeCode"
-          autoComplete="off"
+          maxLength={8}
-          spellCheck={false}
           returnKeyType="go"
           onSubmitEditing={onSubmit}
         />
       ) : null}
 
-      {tokenMode ? null : (
-        <>
-          <Input
-            label={t('login.mobile.username_label', 'Email or username')}
-            placeholder={t('login.username_placeholder', 'user@example.com')}
-            value={email}
-            onChangeText={onChangeEmail}
-            testID="login-username-input"
-            autoCapitalize="none"
-            autoCorrect={false}
-            autoComplete="email"
-            textContentType="username"
-            keyboardType="email-address"
-            returnKeyType="next"
-            blurOnSubmit={false}
-            onSubmitEditing={() => passwordRef.current?.focus()}
-          />
-
-          <Input
-            label={t('login.password_label', 'Password')}
-            placeholder={t('login.password_placeholder', 'Enter your password')}
-            value={password}
-            onChangeText={onChangePassword}
-            testID="login-password-input"
-            autoFocus={Boolean(email)}
-            secureTextEntry={!showPassword}
-            autoComplete="current-password"
-            textContentType="password"
-            ref={passwordRef}
-            returnKeyType={totpRequired ? 'next' : 'go'}
-            blurOnSubmit={!totpRequired}
-            onSubmitEditing={totpRequired ? () => totpRef.current?.focus() : onSubmit}
-            rightIcon={
-              <Pressable
-                onPress={() => setShowPassword((v) => !v)}
-                hitSlop={14}
-                accessibilityRole="button"
-                accessibilityLabel={showPassword ? t('login.hide_password', 'Hide password') : t('login.show_password', 'Show password')}
-              >
-                {showPassword ? <EyeOff size={20} color={c.textMuted} /> : <Eye size={20} color={c.textMuted} />}
-              </Pressable>
-            }
-          />
-
-          {totpRequired ? (
-            <Input
-              label={t('login.totp_label', 'Two-factor code')}
-              placeholder="123456"
-              value={totp}
-              ref={totpRef}
-              onChangeText={(value) => onChangeTotp?.(value)}
-              autoFocus
-              keyboardType="number-pad"
-              autoComplete="one-time-code"
-              textContentType="oneTimeCode"
-              maxLength={8}
-              returnKeyType="go"
-              onSubmitEditing={onSubmit}
-            />
-          ) : null}
-        </>
-      )}
-
       {notice ? <LoginNotice title={notice.title} detail={notice.detail} /> : null}
 
       <Button variant="default" size="md" onPress={onSubmit}>
         {t('login.sign_in', 'Sign in')}
       </Button>
-
-      {onToggleTokenMode ? (
-        <Pressable onPress={onToggleTokenMode} hitSlop={8} style={styles.toggle} accessibilityRole="button" testID="login-token-toggle">
-          <KeyRound size={16} color={c.textLink} />
-          <Text style={styles.link}>
-            {tokenMode ? t('login.password_toggle', 'Sign in with a password') : t('login.token_toggle', 'Sign in with an access token')}
-          </Text>
-        </Pressable>
-      ) : null}
     </View>
   );
 }
@@ -172,7 +130,5 @@ function makeStyles(c: ThemePalette) {
     heading: { gap: spacing.sm },
     title: { ...typography.h1, color: c.text },
     subtitle: { ...typography.body, color: c.textSecondary },
-    toggle: { flexDirection: 'row', alignItems: 'center', justifyContent: 'center', gap: spacing.xs, paddingVertical: spacing.xs },
-    link: { ...typography.body, color: c.textLink },
   });
 }

src/stores/__tests__/auth-store-token-login.test.ts

@@ -1,89 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-
-// Access-token sign-in: the pasted token is cleaned up before it is sent, the
-// account is named after the session, and a refused token leaves nothing
-// registered.
-
-const { InvalidTokenError, SESSION, connectWithToken } = vi.hoisted(() => {
-  class InvalidTokenError extends Error {
-    constructor() {
-      super('Invalid access token');
-      this.name = 'InvalidTokenError';
-    }
-  }
-  const SESSION = { apiUrl: 'https://api.fastmail.com/jmap/api/', username: 'ada@fastmail.com' };
-  const connectWithToken = vi.fn(async (_serverUrl: string, _token: string) => ({
-    session: SESSION,
-    username: 'ada@fastmail.com',
-    accountId: 'ada@fastmail.com@api.fastmail.com',
-  }));
-  return { InvalidTokenError, SESSION, connectWithToken };
-});
-
-vi.mock('../../api/jmap-client', () => ({
-  jmapClient: {
-    connectWithToken: (serverUrl: string, token: string) => connectWithToken(serverUrl, token),
-    snapshot: vi.fn(() => ({ session: null, credentials: null, accountId: null })),
-    restoreSnapshot: vi.fn(),
-    onAuthFailure: vi.fn(() => () => undefined),
-    onTokenRefresh: vi.fn(() => () => undefined),
-    hasAccountCapability: vi.fn(() => false),
-    getAccountName: () => undefined,
-    getSharedMailAccounts: () => [],
-    request: vi.fn(async () => ({ methodResponses: [] })),
-    accountId: 'acc-1',
-    isConnected: true,
-    currentSession: SESSION,
-    username: 'ada@fastmail.com',
-    serverUrl: 'https://api.fastmail.com',
-  },
-  AuthenticationError: class AuthenticationError extends Error {},
-  NetworkError: class NetworkError extends Error {},
-  InvalidTokenError,
-}));
-
-vi.mock('../../lib/push-notifications', () => ({
-  teardownPushNotifications: vi.fn(async () => undefined),
-  teardownPushNotificationsForAccount: vi.fn(async () => undefined),
-}));
-
-import { useAuthStore } from '../auth-store';
-import { useAccountStore } from '../account-store';
-
-beforeEach(() => {
-  connectWithToken.mockClear();
-  useAccountStore.setState({ accounts: [], activeAccountId: null });
-  useAuthStore.setState({ isAuthenticated: false, error: null, activeAccountId: null });
-});
-
-describe('loginWithToken', () => {
-  it('sends the bare token and registers the account the session names', async () => {
-    await useAuthStore.getState().loginWithToken('https://api.fastmail.com/', '  Bearer fmu1-abc  ');
-
-    expect(connectWithToken).toHaveBeenCalledWith('https://api.fastmail.com', 'fmu1-abc');
-    const account = useAccountStore.getState().getActiveAccount();
-    expect(account?.id).toBe('ada@fastmail.com@api.fastmail.com');
-    expect(account?.serverUrl).toBe('https://api.fastmail.com');
-    expect(useAuthStore.getState()).toMatchObject({
-      isAuthenticated: true,
-      username: 'ada@fastmail.com',
-      activeAccountId: 'ada@fastmail.com@api.fastmail.com',
-    });
-  });
-
-  it('refuses a token with spaces inside without asking the server', async () => {
-    await expect(useAuthStore.getState().loginWithToken('https://api.fastmail.com', 'fmu1 abc'))
-      .rejects.toThrow(InvalidTokenError);
-    expect(connectWithToken).not.toHaveBeenCalled();
-    expect(useAuthStore.getState().error).toBe('Invalid access token');
-  });
-
-  it('registers nothing when the server refuses the token', async () => {
-    connectWithToken.mockRejectedValueOnce(new InvalidTokenError());
-
-    await expect(useAuthStore.getState().loginWithToken('https://api.fastmail.com', 'fmu1-expired'))
-      .rejects.toThrow(InvalidTokenError);
-    expect(useAccountStore.getState().accounts).toHaveLength(0);
-    expect(useAuthStore.getState().isAuthenticated).toBe(false);
-  });
-});

src/stores/__tests__/auth-store.test.ts

@@ -129,31 +129,6 @@ describe('auth-store', () => {
       expect(state.serverUrl).toBeNull();
       expect(state.username).toBeNull();
     });
-
-    // logout used to read the account list from a snapshot taken before it
-    // removed the account: the removed account still looked like one to
-    // switch to, the "switch" to the active account returned at once, and
-    // signing out of the only account left the app signed in.
-    it('signs out of the only account', async () => {
-      const id = 'me@mail.example.com';
-      useAccountStore.setState({
-        accounts: [{
-          id, serverUrl: 'https://mail.example.com', username: 'me',
-          displayName: 'me', email: 'me', avatarColor: '#000', lastLoginAt: 0,
-          isConnected: true, hasError: false, isDefault: true,
-        }],
-        activeAccountId: id,
-        defaultAccountId: id,
-      });
-      useAuthStore.setState({ isAuthenticated: true, activeAccountId: id, serverUrl: 'x', username: 'y' });
-
-      await useAuthStore.getState().logout();
-
-      expect(useAccountStore.getState().accounts).toEqual([]);
-      const state = useAuthStore.getState();
-      expect(state.isAuthenticated).toBe(false);
-      expect(state.activeAccountId).toBeNull();
-    });
   });
 
   describe('mail the viewer held in memory', () => {

src/stores/auth-store.ts

@@ -1,5 +1,5 @@
 import { create } from 'zustand';
-import { jmapClient, AuthenticationError, InvalidTokenError, NetworkError, type ClientSnapshot } from '../api/jmap-client';
+import { jmapClient, AuthenticationError, NetworkError, type ClientSnapshot } from '../api/jmap-client';
 import type { JMAPSession } from '../api/types';
 import { fetchAccountDisplayName, isStalwartSupported } from '../api/account-security';
 import { useAccountStore } from './account-store';
@@ -27,7 +27,6 @@ import {
   teardownPushNotificationsForAccount,
 } from '../lib/push-notifications';
 import { deviceSyncSignedIn, releaseDeviceSyncBeforeSignOut } from '../device-sync/app/lifecycle';
-import { perfMark } from '../lib/perf-marks';
 
 // Persist middleware hydrates asynchronously on cold start. Without this
 // guard, restoreSession() can read the account-store before AsyncStorage has
@@ -86,8 +85,6 @@ export interface AuthState {
     password: string,
     opts?: { addAccount?: boolean; totp?: string },
   ) => Promise<void>;
-  /** Access-token (Bearer) sign-in with a token the user pasted, e.g. a Fastmail API token. */
-  loginWithToken: (serverUrl: string, token: string, opts?: { addAccount?: boolean }) => Promise<void>;
   loginViaWebmail: (webmailUrl: string, opts?: { addAccount?: boolean }) => Promise<void>;
   /** OAuth/OIDC (PKCE) straight against the mail server's authorization server. */
   loginViaOAuth: (serverUrl: string, opts?: { addAccount?: boolean }) => Promise<void>;
@@ -257,24 +254,11 @@ async function syncAccountDisplayName(accountId: string): Promise<void> {
 // pairing both end here). Bootstraps a JMAP session from the token bundle,
 // registers the account, and flips the store to connected. Throws on failure
 // so the caller can surface a flow-specific error.
-function completeOAuthHandoff(
+async function completeOAuthHandoff(
   set: (partial: Partial<AuthState>) => void,
   get: () => AuthState,
   result: Extract<HandoffResult, { flow: 'oauth' }>,
   opts?: { addAccount?: boolean },
-): Promise<void> {
-  return completeBearerSignIn(set, get, result.serverUrl, () => jmapClient.connectWithOAuth(result.serverUrl, result.tokens), opts);
-}
-
-// Connects with `connect` (an OAuth bundle or a pasted access token, where the
-// server names the account), registers the account, and flips the store to
-// connected.
-async function completeBearerSignIn(
-  set: (partial: Partial<AuthState>) => void,
-  get: () => AuthState,
-  serverUrl: string,
-  connect: () => Promise<{ session: JMAPSession; username: string; accountId: string }>,
-  opts?: { addAccount?: boolean },
 ): Promise<void> {
   // Adding an account must not destroy the live one: the singleton keeps the
   // previous connection until the new sign-in has actually succeeded, and a
@@ -283,7 +267,7 @@ async function completeBearerSignIn(
 
   let connected: { session: JMAPSession; username: string; accountId: string };
   try {
-    connected = await connect();
+    connected = await jmapClient.connectWithOAuth(result.serverUrl, result.tokens);
   } catch (err) {
     if (previous) jmapClient.restoreSnapshot(previous);
     throw err;
@@ -294,7 +278,7 @@ async function completeBearerSignIn(
   const wasRegistered = !!accountStore.getAccountById(accountId);
   try {
     accountStore.addAccount({
-      serverUrl: serverUrl.replace(/\/+$/, ''),
+      serverUrl: result.serverUrl.replace(/\/+$/, ''),
       username,
       displayName: username,
       email: username,
@@ -315,7 +299,7 @@ async function completeBearerSignIn(
   accountStore.setActiveAccount(accountId);
   useEmailStore.getState().setActiveAccount(accountId);
 
-  applyConnectedState(set, session, serverUrl.replace(/\/+$/, ''), username, accountId);
+  applyConnectedState(set, session, result.serverUrl.replace(/\/+$/, ''), username, accountId);
   // Start on the folder list now rather than once the mail screen has
   // mounted; the screen joins this load.
   void useEmailStore.getState().fetchMailboxes();
@@ -429,21 +413,6 @@ export const useAuthStore = create<AuthState>((set, get) => ({
     }
   },
 
-  loginWithToken: async (serverUrl, typedToken, opts) => {
-    set({ isLoading: true, error: null });
-    // Pasted tokens often come with the scheme or surrounding whitespace.
-    const token = typedToken.trim().replace(/^Bearer\s+/i, '');
-    const base = serverUrl.replace(/\/+$/, '');
-    try {
-      if (!token || /\s/.test(token)) throw new InvalidTokenError();
-      await completeBearerSignIn(set, get, base, () => jmapClient.connectWithToken(base, token), opts);
-      set({ pendingTotpLogin: null });
-    } catch (err) {
-      set({ isLoading: false, error: err instanceof Error ? err.message : 'Connection failed' });
-      throw err;
-    }
-  },
-
   loginViaWebmail: async (webmailUrl, opts) => {
     set({ isLoading: true, error: null });
     refuseAddWhenFull(set, opts);
@@ -633,12 +602,10 @@ export const useAuthStore = create<AuthState>((set, get) => ({
     jmapClient.reset();
     clearAccountFeatureStores(currentId);
 
-    // Switch to next remaining account, if any. Read the store again:
+    // Switch to next remaining account, if any
-    // `accountStore` is the state from before removeAccount.
+    const remaining = accountStore.accounts;
-    const after = useAccountStore.getState();
-    const remaining = after.accounts.filter((a) => a.id !== currentId);
     if (remaining.length > 0) {
-      const next = after.getDefaultAccount() ?? remaining[0];
+      const next = accountStore.getDefaultAccount() ?? remaining[0];
       try {
         await get().switchAccount(next.id);
         return;
@@ -794,7 +761,6 @@ export const useAuthStore = create<AuthState>((set, get) => ({
 
   restoreSession: async () => {
     set({ isLoading: true });
-    perfMark('restore-start');
     try {
       // Wait for persisted caches to finish hydrating from AsyncStorage.
       // Otherwise we read empty defaults and bounce the user back to the
@@ -807,7 +773,6 @@ export const useAuthStore = create<AuthState>((set, get) => ({
         waitForHydration(useCalendarStore),
         waitForHydration(useContactsStore),
       ]);
-      perfMark('restore-hydrated');
       const accountStore = useAccountStore.getState();
 
       // Legacy migration: if there are no registered accounts but the old
@@ -843,7 +808,6 @@ export const useAuthStore = create<AuthState>((set, get) => ({
 
       try {
         const ok = await jmapClient.loadAccount(target.id);
-        perfMark('restore-session');
         if (!ok) {
           // No stored credentials (or corrupt) — genuine logout.
           accountStore.removeAccount(target.id);
@@ -897,7 +861,6 @@ export const useAuthStore = create<AuthState>((set, get) => ({
 
       const session = jmapClient.currentSession!;
       applyConnectedState(set, session, target.serverUrl, target.username, target.id);
-      perfMark('restore-done');
       // Refresh the cached mailbox list + current folder now that the session
       // is live. Feature stores show persisted data immediately; this swaps
       // in fresh data once the network round-trip completes.

src/stores/persist-storage.ts

@@ -16,7 +16,6 @@
 
 import { AppState } from 'react-native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import { perfMark } from '../lib/perf-marks';
 import type { PersistStorage, StorageValue } from 'zustand/middleware';
 
 /** How long a store's write waits to take in further changes. */
@@ -94,12 +93,9 @@ export function createPersistStorage<S>(
   return {
     getItem: async (name) => {
       try {
-        const t0 = Date.now();
         const raw = await AsyncStorage.getItem(name);
         if (raw === null) return null;
-        const t1 = Date.now();
         const value = JSON.parse(raw) as StorageValue<S>;
-        perfMark('hydrate', { store: name, readMs: t1 - t0, parseMs: Date.now() - t1, kb: Math.round(raw.length / 1024) });
         slotFor(name).stored = raw;
         return value;
       } catch (err) {