[CP Staging] Fix Chat - Claim offer banner is partially visible when keyboard is closed in landscape mode by GCyganek · Pull Request #90128 · Expensify/App

GCyganek · 2026-05-10T16:19:42Z

Explanation of Change

In CollapsibleHeaderOnKeyboard, the chat header could remain collapsed after navigating to a different screen in landscape mode with the keyboard open. Added a useEffect that tracks the previous isFocused value and restores the header to its natural height when the screen loses focus, preventing the banner from being partially hidden.

Fixed Issues

$ #90054
PROPOSAL: N/A

Tests

Create a workspace and upgrade it to Control plan.
Go to Concierge chat.
Turn the device to landscape.
Tap on the composer.
Tap Claim offer button.
Tap app back button.
Verify Claim offer banner is fully visible when keyboard is closed.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-05-10.at.18.09.00.mov

Android: mWeb Chrome

iOS: Native

Screen.Recording.2026-05-10.at.18.13.49.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

…losed in landscape mode

melvin-bot · 2026-05-10T16:19:48Z

@truph01 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]

truph01 · 2026-05-11T04:36:26Z

+            return;
+        }
+        animatedHeight.set(withTiming(naturalHeightValue, {duration: RESTORE_DURATION}));
+    }, [prevIsFocused, isFocused, animatedHeight, naturalHeight]);


I think only isFocused in the dependencies is enough

truph01 · 2026-05-11T07:32:57Z

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 proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained ""why"" the code was doing something instead of only explaining ""what"" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and 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)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named ""index.js"". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
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)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- 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
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- 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 any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
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 a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
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

Screen.Recording.2026-05-11.at.14.28.09.mov

Android: mWeb Chrome

iOS: HybridApp

Screen.Recording.2026-05-11.at.14.31.30.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

github-actions · 2026-05-11T10:17:27Z

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

github-actions · 2026-05-11T10:21:40Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #90128.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-09a5925-2e764a6-ca80a48ba345bde1d7a16fd1e5ced79354b3aa8e/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-09a5925-2e764a6-90d0cb4c576dc71bfa74d3fceaee0e85fbe848ed/index.html

Web 🕸️
https://90128.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

…ape-mode/restore-header-on-screen-focus-loss Fix Chat - Claim offer banner is partially visible when keyboard is closed in landscape mode (cherry picked from commit 09a5925) (cherry-picked to staging by mountiny)

OSBotify · 2026-05-11T14:52:06Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.3.69-11 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-11T14:53:23Z

No help site changes are required for this PR.

This is a purely internal UI bug fix that prevents the chat header ("Claim offer" banner) from remaining collapsed after navigating away in landscape mode with the keyboard open. The change is limited to animation/layout logic in CollapsibleHeaderOnKeyboard — no user-facing features, settings, workflows, or terminology were added or modified.

OSBotify · 2026-05-11T23:45:21Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.69-18 🚀

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

OSBotify · 2026-05-12T00:06:32Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.3.70-0 🚀

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

Bundle Size Analysis (Sentry):

iOS

MelvinBot · 2026-05-12T00:07:52Z

This PR modifies the internal CollapsibleHeaderOnKeyboard native component to fix a visual bug where the "Claim offer" banner could be partially hidden after navigating away from a screen in landscape mode with the keyboard open.

No help site changes are required — this is a native mobile UI animation fix with no impact on user-facing features, settings, or workflows documented on the help site.

OSBotify · 2026-05-13T01:20:44Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.3.72-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-13T01:21:53Z

No help site changes are required for this PR.

This PR fixes a native mobile UI bug where the chat header (e.g., the "Claim offer" banner) could remain collapsed after navigating away from a screen in landscape mode with the keyboard open. The change is a purely internal behavior fix in the CollapsibleHeaderOnKeyboard component — no user-facing features, settings, labels, or workflows were added, removed, or renamed.

OSBotify · 2026-05-13T07:02:17Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.72-1 🚀

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

Fix Chat - Claim offer banner is partially visible when keyboard is c…

963bc25

…losed in landscape mode

GCyganek requested review from a team as code owners May 10, 2026 16:19

melvin-bot Bot assigned GCyganek May 10, 2026

melvin-bot Bot requested review from flaviadefaria and truph01 and removed request for a team May 10, 2026 16:19

truph01 reviewed May 11, 2026

View reviewed changes

useEffect dependency array

1677b5e

truph01 approved these changes May 11, 2026

View reviewed changes

melvin-bot Bot requested a review from mjasikowski May 11, 2026 08:39

mjasikowski approved these changes May 11, 2026

View reviewed changes

mjasikowski merged commit 09a5925 into Expensify:main May 11, 2026
38 checks passed

mountiny changed the title ~~Fix Chat - Claim offer banner is partially visible when keyboard is closed in landscape mode~~ [CP Staging] Fix Chat - Claim offer banner is partially visible when keyboard is closed in landscape mode May 11, 2026

OSBotify added the CP Staging marks PRs that have been CP'd to staging label May 11, 2026

OSBotify mentioned this pull request May 11, 2026

Deploy Checklist: New Expensify 2026-05-08 #90006

Closed

melvin-bot Bot mentioned this pull request May 11, 2026

[Due for payment 2026-05-20] [Due for payment 2026-05-18] Chat - Claim offer banner is partially visible when keyboard is closed in landscape mode #90054

Closed

7 tasks

Conversation

GCyganek commented May 10, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented May 10, 2026

Uh oh!

truph01 May 11, 2026

Choose a reason for hiding this comment

Uh oh!

GCyganek May 11, 2026

Choose a reason for hiding this comment

Uh oh!

truph01 commented May 11, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

github-actions Bot commented May 11, 2026

Uh oh!

github-actions Bot commented May 11, 2026

Uh oh!

OSBotify commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

OSBotify commented May 11, 2026

Uh oh!

OSBotify commented May 12, 2026

Uh oh!

MelvinBot commented May 12, 2026

Uh oh!

OSBotify commented May 13, 2026

Uh oh!

MelvinBot commented May 13, 2026

Uh oh!

OSBotify commented May 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants