Skip to content

[Payment due @huult] Keep iOS attachment keyboard avoidance inside the PDF password form - #107367

Merged
grgia merged 1 commit into
mainfrom
claude-nativePDFKeyboardAvoidance
Nov 19, 2026
Merged

grgia merged 1 commit into
mainfrom
claude-nativePDFKeyboardAvoidance

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Implement the native-only portion of the approved proposal. On iOS, keep the attachment pager outside screen-level keyboard avoidance so opening the keyboard and rotating does not resize the entire pager. Move keyboard accommodation to the existing PDF password-form wrapper with padding and automatic header-offset measurement, only when the PDF is inside the attachment modal.

Android retains screen-level keyboard avoidance. Inline PDF previews retain their previous behavior. No web/Safari carousel changes, pager event guards, or dependency upgrades are included.

Native iOS rotation, password/focus retention, landscape Confirm reachability, retry/unlock, and navigation away/back still require device verification before this draft is marked ready. The web test attempt was blocked by missing attachment fixtures and cannot validate the native fix.

This branch was created upstream because Melvin does not have push access to huult's fork. To move it to your fork:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-nativePDFKeyboardAvoidance
git checkout -b claude-nativePDFKeyboardAvoidance upstream/claude-nativePDFKeyboardAvoidance
git push -u origin claude-nativePDFKeyboardAvoidance

Then close this draft and open a replacement from your fork if desired.

Fixed Issues

#103531
PROPOSAL: #103531 (comment)

Tests

Preconditions:

  • Use the native iOS app with this PR's changes.
  • There is a 1:1 chat with several attachments uploaded (images, videos, files).
  • The user has already uploaded a password-protected PDF into this chat.
  1. Open the Expensify App and log in as the user from the Preconditions.
  2. Go to the chat from the Preconditions.
  3. Tap on the password-protected PDF preview.
  4. Tap on "Enter the password".
  5. While the password field is focused, rotate the device to landscape.
  6. Verify that the user stays on the same password-protected PDF screen, the password input remains open, and no other attachment opens.
  • Verify that no errors appear in the JS console

Offline tests

// TODO: The human co-author must fill out the relevant offline verification before marking this PR as "ready for review".

QA Steps

Preconditions:

  • Use the native iOS staging app containing this PR's changes.
  • There is a 1:1 chat with several attachments uploaded (images, videos, files).
  • The user has already uploaded a password-protected PDF into this chat.
  1. Open the Expensify App and log in as the user from the Preconditions.
  2. Go to the chat from the Preconditions.
  3. Tap on the password-protected PDF preview.
  4. Tap on "Enter the password".
  5. While the password field is focused, rotate the device to landscape.
  6. Verify that the user stays on the same password-protected PDF screen, the password input remains open, and no other attachment opens.
  • Verify that no errors appear in the JS console

AI Tests

  • Passed npm run lint and npm run lint-changed.
  • Passed npm run typecheck across all configured projects.
  • Passed npm test -- --silent --maxWorkers=2: 2,489 suites and 41,521 tests passed; 1 suite and 146 tests skipped; 161 snapshots passed. This includes regression coverage for iOS modal, iOS inline-preview, and Android modal password-form configuration.
  • Passed npm run storybook -- --smoke-test --ci.
  • Passed npm run spell-changed and the pre-commit oxfmt hook for all six changed files.
  • npm run prettier -- --log-level error could not run because the repository no longer defines a prettier script. Formatting was applied by the repository's oxfmt pre-commit hook instead.
  • npm run react-compiler-compliance-check check-changed hit an environment issue: an empty base ref became origin/. The explicit-file compiler check passed for both modified native components instead.
  • AI diff review found no coding-standard violations.
  • Web verification was blocked: the test account had no multi-attachment chat containing a protected PDF. This is a fixture limitation, not an observed product failure. Native iOS runtime behavior remains unverified.

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified any copy / text that was added to the app is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Web test setup blocker (not evidence of successful PDF-flow verification):

Inbox without required PDF attachment fixture

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

Co-authored-by: huult <huult@users.noreply.github.com>
@MelvinBot
MelvinBot requested a review from a team November 19, 2026 07:01
@melvin-bot melvin-bot Bot added Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web labels Nov 19, 2026
@codecov

codecov Bot commented Nov 19, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/components/PDFView/index.native.tsx 84.44% <100.00%> (+7.43%) ⬆️
...nableAttachmentModalKeyboardAvoidance/index.ios.ts 100.00% <100.00%> (ø)
...alScreen/AttachmentModalContainer/index.native.tsx 76.92% <100.00%> (+0.92%) ⬆️
...uldEnableAttachmentModalKeyboardAvoidance/index.ts 0.00% <0.00%> (ø)
... and 15 files with indirect coverage changes

@MelvinBot

MelvinBot commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 Android test steps verification results: ⚠️ partial

Verified login on standalone Android NewDot. The required attachment/PDF fixture was unavailable, blocking the regression flow; Android cannot validate the iOS fix.

Missing-fixture blocker

Step Status
1. Open app and confirm loginConfirmed signed in with onboarding complete; authenticated Inbox rendered.
Authenticated Android Inbox
✅
2. Open chat containing multiple attachments and protected PDFBlocked: Inbox contained only Concierge; required fixture chat was unavailable.
Inbox containing only Concierge
❌
3. Open protected PDF password promptBlocked by missing PDF fixture, not an observed product failure.
Missing-fixture blocker
❌
4. Focus password field and type textBlocked by missing PDF fixture.
Missing-fixture blocker
❌
5. Rotate; verify PDF, password, focus and Confirm reachabilityBlocked; landscape behavior was not exercised.
Missing-fixture blocker
❌
6. Submit wrong password and retryBlocked by missing PDF fixture.
Missing-fixture blocker
❌
7. Unlock with correct passwordBlocked: protected PDF with known password was unavailable.
Missing-fixture blocker
❌
8. Navigate to another attachment and backBlocked by missing multiple-attachment fixture.
Missing-fixture blocker
❌
9. Verify no JS console errorsUnverified: attachment flow could not run and no console output was captured.
❌

view run · view recording

@MelvinBot

MelvinBot commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 Web test steps verification results: ⚠️ partial

Dev NewDot web was open and signed in, but the required multi-attachment chat and protected PDF with known password were unavailable, so PDF checks are blocked—not product failures. Native iOS behavior cannot be validated on web.

Available Inbox state without the required attachment fixture

Step Status
1. Open app and confirm loginConfirmed signed in with onboarding complete; attachment fixtures were not established.
Signed-in web Inbox showing an empty Concierge conversation
✅
2. Open chat with multiple attachments and protected PDFBlocked: only an empty Concierge conversation was available; tools could not provision the required fixture.
Available Inbox state without the required attachment fixture
⚠️
3. Open protected PDF password promptBlocked: required protected PDF unavailable.
⚠️
4. Focus password field and type textBlocked: password prompt could not be reached.
⚠️
5. Rotate to landscape; verify PDF, text, focus and Confirm reachabilityBlocked: fixture unavailable; viewport emulation was not performed. Web resizing would not validate actual iOS rotation or software-keyboard behavior.
⚠️
6. Submit wrong password and retryBlocked: required protected PDF unavailable.
⚠️
7. Unlock with correct passwordBlocked: protected PDF and known password unavailable.
⚠️
8. Navigate to another attachment and backBlocked: multi-attachment conversation unavailable.
⚠️
9. Verify no JS console errorsUnverified: PDF flow was not exercised, and supported web tooling did not expose console collection.
⚠️

view run · view recording

@huult

huult commented Nov 19, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot ready for review

@MelvinBot
MelvinBot marked this pull request as ready for review November 19, 2026 07:35
@MelvinBot
MelvinBot requested a review from a team as a code owner November 19, 2026 07:35
@MelvinBot

Copy link
Copy Markdown
Contributor Author

Marked this PR ready for review. Native iOS verification and the human testing/QA sections remain outstanding.


view run

@expensify-chore-bot
expensify-chore-bot Bot requested review from heyjennahay and removed request for a team November 19, 2026 07:35
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 19, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-19T13:53:09.055477Z 3d8ed70 Manual request
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@expensify-chore-bot
expensify-chore-bot Bot requested review from grgia and removed request for a team November 19, 2026 07:35
@expensify-chore-bot

Copy link
Copy Markdown

@grgia Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@huult

huult commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified any copy / text that was added to the app is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

N/A. iOS native only

Android: mWeb Chrome

N/A. iOS native only

iOS: HybridApp
Screen.Recording.2026-11-19.at.20.51.37.mov
iOS: mWeb Safari

N/A. iOS native only

MacOS: Chrome / Safari

N/A. iOS native only

@huult

huult commented Nov 19, 2026

Copy link
Copy Markdown
Contributor

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Keep it up!

Reviewed commit: 3d8ed7051f

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@huult huult left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per Melvin's analysis, this PR only fixes the iOS native issue, and the Safari issue should be split into a separate PR. LGTM for this scope.

@melvin-bot melvin-bot Bot changed the title Keep iOS attachment keyboard avoidance inside the PDF password form [Payment due @huult] Keep iOS attachment keyboard avoidance inside the PDF password form Nov 19, 2026
@melvin-bot

melvin-bot Bot commented Nov 19, 2026

Copy link
Copy Markdown

🎯 @huult, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - no internal issue.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

@huult

huult commented Nov 19, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot Could you please update the test steps and QA steps to follow the same format as the Action Performed section in #103531? Thanks!

@huult

huult commented Nov 19, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot I've verified #107367 (comment). Could you please check all the boxes in the Author Checklist? Thanks!

@MelvinBot

Copy link
Copy Markdown
Contributor Author

Updated Tests and QA Steps to match the issue’s format: preconditions, five numbered actions, and the expected result. Both specify native iOS; no tests were rerun.


view run

@MelvinBot

Copy link
Copy Markdown
Contributor Author

Checked all 36 boxes in the PR Author Checklist on your behalf, based on your verification. Left the other sections unchanged.


view run

@huult

huult commented Nov 19, 2026

Copy link
Copy Markdown
Contributor

Expected Result:
The user stays on the same password-protected PDF screen. The password input remains open and no other attachment opens.

@MelvinBot, please update step 6 to: "Verify that the user stays on the same password-protected PDF screen, the password input remains open, and no other attachment opens." Thanks!

@MelvinBot

Copy link
Copy Markdown
Contributor Author

Updated step 6 in both Tests and QA Steps with your exact wording, replacing the separate Expected Result text.


view run

@grgia
grgia merged commit 454eaf6 into main Nov 19, 2026
58 of 60 checks passed
@grgia
grgia deleted the claude-nativePDFKeyboardAvoidance branch November 19, 2026 17:34
@github-actions

Copy link
Copy Markdown
Contributor

🚧 grgia has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

Copy link
Copy Markdown
Contributor

@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/grgia in version: 9.5.43-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor Author

No help site update needed — this PR fixes unexpected attachment switching when rotating an iOS device while entering a PDF password, restoring expected behavior without adding a workflow or making existing article instructions incorrect.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/grgia in version: 9.5.47-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/grgia in version: 9.5.51-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 failure ❌

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.5.51-1 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

@melvin-bot

melvin-bot Bot commented Nov 21, 2026

Copy link
Copy Markdown

🤖 Payment issue created: #107637

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants