[CP Staging] [Better Expense Reports]: Fix disabled arrow function #61840

Guccio163 · 2025-05-12T08:39:03Z

Explanation of Change

This is a follow-up to the #61161 to not break navigation by '>' arrow button, when window is wide enough:

Previously, the offending PR changed View which invokes onLayout, what resulted in visibleItemsOnEndCount being incorrectly calculated and disabling handleChange wrongly when window was wide enough to fit extra TransactionPreview. This PR splits those two onLayouts to utilise both of them in correct cases.

problem.mov

Fixed Issues

$ #61161
$ #61925
PROPOSAL:

Tests

Add exactly 3 expenses to the report
Open Report Preview in the wide view
Try to navigate through the Carousel with < and > arrows with a couple of widths of the window - it should work in every one of them.

Verify that no errors appear in the JS console

Offline tests

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
- MacOS: Desktop
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 followed proper code patterns (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
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
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)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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.
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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2025-05-12T09:14:06Z

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

…-fork into Guccio163/wideViewFollowups

mountiny · 2025-05-12T15:28:10Z

@DylanDylann how is this looking?

DylanDylann · 2025-05-12T15:46:53Z

I am on it

DylanDylann · 2025-05-12T16:09:44Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
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.2025-05-12.at.23.08.22.mov

Android: mWeb Chrome

Screen.Recording.2025-05-12.at.23.03.51.mov

iOS: HybridApp

Screen.Recording.2025-05-12.at.23.08.39.mov

iOS: mWeb Safari

Screen.Recording.2025-05-12.at.23.02.10.mov

MacOS: Chrome / Safari

Screen.Recording.2025-05-12.at.22.58.54.mov

MacOS: Desktop

Screen.Recording.2025-05-12.at.23.09.03.mov

DylanDylann

LGTM

DylanDylann · 2025-05-12T16:11:02Z

cc @mountiny

shawnborton · 2025-05-12T16:55:33Z

Videos look good to me 👍 let's send it

mountiny · 2025-05-12T20:48:28Z

Ah we got conflicts @Guccio163

…-fork into Guccio163/wideViewFollowups

Guccio163 · 2025-05-13T09:42:25Z

@mountiny resolved ✅

mountiny

Lgtm

OSBotify · 2025-05-14T11:55:15Z

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

…ewFollowups (cherry picked from commit d919997) (cherry-picked to staging by mountiny)

github-actions · 2025-05-14T12:17:48Z

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

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2025-05-15T17:08:21Z

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

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2025-05-15T19:03:10Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.1.45-21 🚀

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

Guccio163 added 3 commits May 12, 2025 10:38

fix disabled arrow navigation

74b24f0

prettier

5d68229

storybook

1f18455

Guccio163 marked this pull request as ready for review May 12, 2025 09:14

Guccio163 requested review from a team as code owners May 12, 2025 09:14

melvin-bot bot requested review from DylanDylann and removed request for a team May 12, 2025 09:14

mountiny assigned Guccio163 May 12, 2025

extract TRANSACTION_PREVIEW_WIDTH_WIDE

b32bd8f

mountiny self-requested a review May 12, 2025 09:37

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

a0d298d

…-fork into Guccio163/wideViewFollowups

DylanDylann approved these changes May 12, 2025

View reviewed changes

Guccio163 added 2 commits May 13, 2025 11:39

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

f04588f

…-fork into Guccio163/wideViewFollowups

Mobile-Exp

eabdfdf

trjExpensify mentioned this pull request May 13, 2025

[Better Expense Report View] WS Chat - Nothing happens when clicking carousel arrows #61925

Open

8 tasks

mountiny changed the title ~~[Better Expense Reports]: Fix disabled arrow function~~ [CP Staging] [Better Expense Reports]: Fix disabled arrow function May 14, 2025

mountiny approved these changes May 14, 2025

View reviewed changes

mountiny merged commit d919997 into Expensify:main May 14, 2025
18 checks passed

OSBotify pushed a commit that referenced this pull request May 14, 2025

Merge pull request #61840 from software-mansion-labs/Guccio163/wideVi…

7759a31

…ewFollowups (cherry picked from commit d919997) (cherry-picked to staging by mountiny)

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

github-actions bot mentioned this pull request May 14, 2025

Deploy Checklist: New Expensify 2025-05-13 #61917

Closed

trjExpensify mentioned this pull request May 14, 2025

Expense - Navigation arrows are missing on report header RHP when expense is created via FAB #62020

Closed

16 tasks

melvin-bot bot mentioned this pull request May 15, 2025

[Due for payment 2025-05-22] [Better Expense Report View] Improve TransactionPreview viewability #61161

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] [Better Expense Reports]: Fix disabled arrow function #61840

[CP Staging] [Better Expense Reports]: Fix disabled arrow function #61840

Guccio163 commented May 12, 2025 •

edited

Loading

melvin-bot bot commented May 12, 2025

mountiny commented May 12, 2025

DylanDylann commented May 12, 2025

DylanDylann commented May 12, 2025

DylanDylann left a comment

DylanDylann commented May 12, 2025

shawnborton commented May 12, 2025

mountiny commented May 12, 2025

Guccio163 commented May 13, 2025

mountiny left a comment

OSBotify commented May 14, 2025

github-actions bot commented May 14, 2025

github-actions bot commented May 15, 2025

github-actions bot commented May 15, 2025

[CP Staging] [Better Expense Reports]: Fix disabled arrow function #61840

[CP Staging] [Better Expense Reports]: Fix disabled arrow function #61840

Conversation

Guccio163 commented May 12, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 12, 2025

mountiny commented May 12, 2025

DylanDylann commented May 12, 2025

DylanDylann commented May 12, 2025

Reviewer Checklist

Screenshots/Videos

DylanDylann left a comment

Choose a reason for hiding this comment

DylanDylann commented May 12, 2025

shawnborton commented May 12, 2025

mountiny commented May 12, 2025

Guccio163 commented May 13, 2025

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented May 14, 2025

github-actions bot commented May 14, 2025

github-actions bot commented May 15, 2025

github-actions bot commented May 15, 2025

Guccio163 commented May 12, 2025 •

edited

Loading