[CP Staging] Fix amount value in header & report preview by JakubKorytko · Pull Request #60824 · Expensify/App

JakubKorytko · 2025-04-24T13:01:53Z

Explanation of Change

Currently the amount is calculated correctly for the Better Expense Report view, but it does not work on the current view.
This PR reuses the same logic for the buttons on the current view.

Fixed Issues

$ #60778
PROPOSAL: N/A

Tests

Open Expensify app.
Tap on FAB and select "Create Expense"
Create a manual expense and submit it to Self DM.
Once redirected to chat, tap on "Share with my accountant" on system message below the expense preview.
Select a workspace, add a merchant and submit the expense.
Tap on "Submit" on expense preview.
Verify that correct amount is displayed on preview after the last action.
Open the expense report.
Verify that correct amount is displayed on the green button on top of the report.

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Web.mov

MacOS: Desktop

melvin-bot · 2025-04-24T15:08:33Z

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

src/components/MoneyReportHeader.tsx

src/components/ReportActionItem/ReportPreview.tsx

allgandalf · 2025-04-24T16:16:10Z

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: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-04-24.at.9.29.10.PM.mov

Screen.Recording.2025-04-24.at.9.41.32.PM.mov

MacOS: Desktop

Screen.Recording.2025-04-24.at.9.33.01.PM.mov

allgandalf

Tested on macOS and works great,

since this is a DB approving faster, heading off to dinner so didn't upload native videos yet, but tested on iOS and it worked fine, so good to merge else i will upload native videos in ~45 mins

allgandalf · 2025-04-24T16:17:50Z

@JakubKorytko conflictsssss

allgandalf · 2025-04-24T17:12:34Z

src/components/ReportActionItem/ReportPreview.tsx

        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE]: (
            <Button
-                text={translate('iou.approve')}
+                text={translate('iou.approve', {formattedAmount: getTotalAmountForIOUReportPreviewButton(iouReport, policy, CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE)})}


NOTE TO SELF:

Report issues where we sometimes use CONSt and sometimes, secondary actions on slack

allgandalf · 2025-04-24T17:13:35Z

And we are nukedddd!!!

Screen.Recording.2025-04-24.at.10.42.59.PM.mov

allgandalf · 2025-04-24T17:54:35Z

src/components/MoneyReportHeaderOld.tsx

-        }
-        return options;
-    }, [moneyRequestReport, reportActions, selectedTransactionsID, session?.accountID, setSelectedTransactionsID, translate]);
+    const selectedTransactionsOptions = useSelectedTransactionsActions({report: moneyRequestReport, reportActions, session, onExportFailed: () => setIsDownloadErrorModalVisible(true)});


Good catch!

allgandalf

Works well!!

Screen.Recording.2025-04-24.at.11.57.14.PM.mov

src/components/MoneyReportHeaderOld.tsx

mountiny

Thanks! this code was already reviewed and tested before for the new component but this is to fix issues in old previews

mountiny · 2025-04-24T17:57:51Z

src/libs/MoneyRequestReportUtils.ts

+ * @param flags.shouldShowApproveButton - Flag indicating if the approve button should be shown.
+ * @returns - Returns the type of button that should be displayed based on the input flags.
+ */
+const getIOUReportPreviewButtonType = ({


I was like I do not remember reverting this 😂

OSBotify · 2025-04-24T19:01:44Z

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

…ove-0-00 [CP Staging] Fix amount value in header & report preview (cherry picked from commit 0e0c185) (CP triggered by mountiny)

…649716162-1 🍒 Cherry pick PR #60824 to staging 🍒

github-actions · 2025-04-24T21:16:15Z

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

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

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

github-actions · 2025-04-28T19:53:28Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.1.32-8 🚀

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

JakubKorytko added 3 commits April 24, 2025 12:45

Fix amount value in header & report preview

ce6a980

Fix eslint errors

c06e5f1

Merge branch 'main' into korytko/fix-approve-0-00

2a79389

JakubKorytko marked this pull request as ready for review April 24, 2025 15:08

JakubKorytko requested a review from a team as a code owner April 24, 2025 15:08

melvin-bot bot requested review from allgandalf and removed request for a team April 24, 2025 15:08

allgandalf reviewed Apr 24, 2025

View reviewed changes

src/components/MoneyReportHeader.tsx Outdated Show resolved Hide resolved

allgandalf reviewed Apr 24, 2025

View reviewed changes

src/components/MoneyReportHeader.tsx Outdated Show resolved Hide resolved

allgandalf reviewed Apr 24, 2025

View reviewed changes

src/components/MoneyReportHeader.tsx Outdated Show resolved Hide resolved

allgandalf reviewed Apr 24, 2025

View reviewed changes

src/components/ReportActionItem/ReportPreview.tsx Outdated Show resolved Hide resolved

Fix iouSettled name

961d15f

JakubKorytko requested a review from allgandalf April 24, 2025 15:57

allgandalf approved these changes Apr 24, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny April 24, 2025 16:17

JakubKorytko added 2 commits April 24, 2025 18:58

Merge branch 'main' into korytko/fix-approve-0-00

ff1376c

Fix Eslint errors

ed21c74

JakubKorytko requested a review from allgandalf April 24, 2025 17:05

allgandalf reviewed Apr 24, 2025

View reviewed changes

mountiny assigned JakubKorytko Apr 24, 2025

mountiny changed the title ~~Fix amount value in header & report preview~~ [CP Staging] Fix amount value in header & report preview Apr 24, 2025

JakubKorytko added 2 commits April 24, 2025 19:34

Revert changing new components

5ad07c7

Add old version of displaying amount in IOU

1b854a2

JakubKorytko requested a review from allgandalf April 24, 2025 17:45

allgandalf reviewed Apr 24, 2025

View reviewed changes

This comment was marked as outdated.

Sign in to view

allgandalf approved these changes Apr 24, 2025

View reviewed changes

src/components/MoneyReportHeaderOld.tsx Show resolved Hide resolved

Remove redundant suspense

212b075

mountiny approved these changes Apr 24, 2025

View reviewed changes

mountiny merged commit 0e0c185 into Expensify:main Apr 24, 2025
18 checks passed

os-botify bot mentioned this pull request Apr 24, 2025

🍒 Cherry pick PR #60824 to staging 🍒 #60861

Merged

48 tasks

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

mountiny added a commit that referenced this pull request Apr 24, 2025

Merge pull request #60824 from software-mansion-labs/korytko/fix-appr…

2830993

…ove-0-00 [CP Staging] Fix amount value in header & report preview (cherry picked from commit 0e0c185) (CP triggered by mountiny)

luacmartins added a commit that referenced this pull request Apr 24, 2025

Merge pull request #60861 from Expensify/cherry-pick-staging-60824-14…

76520a6

…649716162-1 🍒 Cherry pick PR #60824 to staging 🍒

github-actions bot mentioned this pull request Apr 24, 2025

Deploy Checklist: New Expensify 2025-04-23 #60729

Closed

91 tasks

luacmartins mentioned this pull request Apr 24, 2025

Expense - Amount disappears from "Approve" button when expense is held #60860

Closed

18 tasks

Conversation

JakubKorytko commented Apr 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Apr 24, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

allgandalf commented Apr 24, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

allgandalf left a comment

Choose a reason for hiding this comment

Uh oh!

allgandalf commented Apr 24, 2025

Uh oh!

allgandalf Apr 24, 2025

Choose a reason for hiding this comment

Uh oh!

allgandalf commented Apr 24, 2025

Uh oh!

allgandalf Apr 24, 2025

Choose a reason for hiding this comment

Uh oh!

This comment was marked as outdated.

allgandalf left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny Apr 24, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Apr 24, 2025

Uh oh!

github-actions bot commented Apr 24, 2025

Uh oh!

github-actions bot commented Apr 28, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

JakubKorytko commented Apr 24, 2025 •

edited

Loading