Skip to content

Fix [Exploratory] Onboarding Task - Tap Organise spend & Somethng Else, Rotate phone 2 Landscpe can't scroll - #104069

Merged
chuckdries merged 3 commits into
Expensify:mainfrom
software-mansion-labs:@GCyganek/landscape-mode/fix-personal-track-goal-screen
Oct 20, 2026
Merged

chuckdries merged 3 commits into
Expensify:mainfrom
software-mansion-labs:@GCyganek/landscape-mode/fix-personal-track-goal-screen

Conversation

@GCyganek

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixes the Personal Track Goal onboarding screen in landscape mode. The header is wrapped in CollapsibleHeaderOnKeyboard, and in landscape the Continue button moves inside the ScrollView so it stays reachable above the keyboard. Selecting "Something else" scrolls to the end once the text input renders. Change is in BaseOnboardingPersonalTrackGoal.tsx.

Fixed Issues

$ #103924
PROPOSAL: N/A

Tests

Precondition: Logged into the Expensify App.

  1. Create a new user account.
  2. Select "Organize my personal spending" in the onboarding modal.
  3. Select "Something else" in the " What are you tracking field.
  4. Rotate the phone to landscape.
  5. Try to scroll.
  6. Verify that tapping the Organize Spend & Something Else links, rotating the phone to landscape, and trying to scroll is be possible.
  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

  • Verify that no errors appear in the JS console

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

Android: Native
Screen.Recording.2026-10-15.at.12.05.40.mov
iOS: Native
Screen.Recording.2026-10-15.at.12.04.34.mov

@GCyganek

Copy link
Copy Markdown
Contributor Author

@codex please review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 15, 2026 •

Copy link
Copy Markdown

Codex Review Summary

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

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-15T11:11:17.180235Z 036f4c4 Draft marked ready
ℹ️ 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.

@codecov

codecov Bot commented Oct 15, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
.../OnboardingAccounting/BaseOnboardingAccounting.tsx 97.87% <100.00%> (+0.09%) ⬆️
src/libs/scrollFocusedInputToTop/index.ts 0.00% <0.00%> (ø)
...sonalTrackGoal/BaseOnboardingPersonalTrackGoal.tsx 93.65% <88.88%> (-2.19%) ⬇️
src/libs/scrollFocusedInputToTop/index.ios.ts 25.00% <25.00%> (ø)
... and 874 files with indirect coverage changes

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Bravo.

Reviewed commit: 036f4c4e06

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@GCyganek
GCyganek marked this pull request as ready for review October 15, 2026 10:55
@GCyganek
GCyganek requested review from a team as code owners October 15, 2026 10:55
@melvin-bot
melvin-bot Bot requested review from JmillsExpensify and truph01 and removed request for a team October 15, 2026 10:55
@melvin-bot

melvin-bot Bot commented Oct 15, 2026

Copy link
Copy Markdown

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

@melvin-bot
melvin-bot Bot removed the request for review from a team October 15, 2026 10:55

@JmillsExpensify JmillsExpensify 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.

LGTM

@truph01

truph01 commented Oct 15, 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 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 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)
  • 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)
  • 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.
  • 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-10-16.at.00.39.19.mov
Android: mWeb Chrome
iOS: HybridApp
Screen.Recording.2026-10-16.at.19.08.21.mov
iOS: mWeb Safari
MacOS: Chrome / Safari

@truph01

truph01 commented Oct 15, 2026

Copy link
Copy Markdown
Contributor

@GCyganek In IOS, it doesn't work. Could you help check?

Screen.Recording.2026-10-16.at.00.53.59.mov

</View>
)}

{isSomethingElseSelected && isInLandscapeMode && continueButton}

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.

What do you think about using useShouldFooterBeInsideList() here, like TextInputFilterContent does? It only moves the button into the ScrollView when the keyboard is actually open in landscape, so the button stays pinned when there's room.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I was thinking about that, but wanted to have the same behaviour as in BaseOnboardingAccounting, but I can just use useShouldFooterBeInsideList() for both

@GCyganek

Copy link
Copy Markdown
Contributor Author

Should be fixed now, I also added changes to BaseOnboardingAccounting to make sure they work the same

Screen.Recording.2026-10-16.at.10.47.09.mov
Screen.Recording.2026-10-16.at.10.51.06.mov
Screen.Recording.2026-10-16.at.10.51.33.mov
Screen.Recording.2026-10-16.at.10.46.51.mov

@melvin-bot

melvin-bot Bot commented Oct 16, 2026

Copy link
Copy Markdown

We did not find an internal engineer to review this PR, trying to assign a random engineer to #103924 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@melvin-bot
melvin-bot Bot requested a review from chuckdries October 16, 2026 12:13

@chuckdries chuckdries 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.

Looks good overall! Sorry for the review delay

@chuckdries
chuckdries merged commit 1a3ef35 into Expensify:main Oct 20, 2026
34 of 35 checks passed
@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.

@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/chuckdries in version: 9.5.15-1 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed. This PR only fixes scrolling and the Continue button position on the onboarding screens in landscape mode. It doesn't change any feature, label, or step that a help article describes.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.5.15-3 🚀

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

Bundle Size Analysis (Sentry):

@truph01

truph01 commented Oct 29, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot Please identify the PR that introduced the bug fixed by this PR. If possible, add a comment directly on the specific line of code that caused the issue, explaining the root cause

@MelvinBot MelvinBot mentioned this pull request Oct 29, 2026
58 tasks done
@MelvinBot

Copy link
Copy Markdown
Contributor

The bug came from Add personal track goal onboarding screen, which first added this screen. I left an inline comment on the line that causes it.

Root cause: That PR put the Continue button outside the ScrollView, under a header that never collapses (BaseOnboardingPersonalTrackGoal.tsx:144-160). Selecting "Something else" auto-focuses the input and opens the keyboard. In landscape, the header and button fill the space above the keyboard, so the ScrollView has no room to scroll.

Supporting evidence
  • The layout this PR replaces (fixed HeaderWithBackButton, ScrollView, and a footer button outside it) dates back to that PR. Later commits only renamed the header and changed the button API.
  • The Accounting onboarding screen had the same problem. GCyganek fixed it in August 2026 with landscape handling. That fix was never applied to this screen, so the bug stayed here until this PR.
  • I confirmed this by reading the code, not by running the app.

view run

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants