update status num to correct value #56950

twilight2294 · 2025-02-17T15:02:16Z

Explanation of Change

The optimistic message was wrong and the delete option was missing if we canceled payment offline, this PR fixes that issue

Fixed Issues

$ #55319
PROPOSAL: #55319 (comment)

Tests

Same as QA test steps

Verify that no errors appear in the JS console

Offline tests

Same as QA test steps

QA Steps

Precondition:

Add approvals is Disabled
Delayed Submission is Disabled

Test Steps:

Create an expense
Go to offline
Click pay elsewhere
Click report header -> Cancel payment
Click report header again

Verify that: Delete expense button is present

Verify that: You see the message Waiting for you to pay expense(s).

Note that there is a backend bug where it will show, no further action needed when we come online, that will be fixed seperately by @jasperhuangg

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen_recording_20250218_124936.mp4

Android: mWeb Chrome

Screen_recording_20250218_125727.mp4

iOS: Native

Simulator.Screen.Recording.-.Expensify.testing.-.2025-02-18.at.12.38.54.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.Expensify.testing.-.2025-02-18.at.12.40.41.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-02-18.at.12.28.22.PM.mov

MacOS: Desktop

Screen.Recording.2025-02-18.at.12.33.46.PM.mov

melvin-bot · 2025-02-18T07:12:40Z

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

dukenv0307 · 2025-02-19T08:07:12Z

src/libs/NextStepUtils.ts


 let currentUserAccountID = -1;
 let currentUserEmail = '';
+let session: Session;


Why this change? I think we can use isPayer like what we did here

dukenv0307 · 2025-02-19T08:07:36Z

src/libs/NextStepUtils.ts

@@ -268,7 +298,7 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
        case CONST.REPORT.STATUS_NUM.APPROVED:
            if (
                isInvoiceReport(report) ||
-                !isPayer(
+                !isPayerReportUtils(


Why not using isPayer?

dukenv0307 · 2025-02-19T08:11:34Z

src/libs/NextStepUtils.ts

+                              type: 'strong',
+                          }
+                        : {
+                              text: `an admin`,


For the text an admin, do we need type strong? We don't use strong in

App/src/libs/NextStepUtils.ts

Line 293 in f2683d9

text: 'an admin',

dukenv0307 · 2025-02-19T08:13:21Z

src/libs/NextStepUtils.ts

-                message: [
+            };
+
+            if (autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT) {


Can you add the reason for this change?

twilight2294 · 2025-02-20T10:00:52Z

@dukenv0307 updated!

dukenv0307 · 2025-02-20T14:47:05Z

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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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.
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

Screen.Recording.2025-02-20.at.21.40.08.mov

Android: mWeb Chrome

Screen.Recording.2025-02-20.at.21.36.14.mov

iOS: Native

Screen.Recording.2025-02-20.at.21.41.27.mov

iOS: mWeb Safari

Screen.Recording.2025-02-20.at.21.33.36.mov

MacOS: Chrome / Safari

Screen.Recording.2025-02-20.at.21.29.37.mov

MacOS: Desktop

Screen.Recording.2025-02-20.at.21.45.55.mov

dukenv0307

LGTM

OSBotify · 2025-02-20T20:50:14Z

✋ 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 · 2025-02-20T22:19:21Z

🚀 Deployed to staging by https://github.com/jasperhuangg in version: 9.1.3-0 🚀

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

github-actions · 2025-02-21T22:51:57Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.1.3-4 🚀

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

twilight2294 added 2 commits February 17, 2025 20:31

update status num to correct value

e4a5d9b

update next step for optimistic action

a2cfd84

twilight2294 marked this pull request as ready for review February 18, 2025 07:12

twilight2294 requested a review from a team as a code owner February 18, 2025 07:12

melvin-bot bot requested review from dukenv0307 and removed request for a team February 18, 2025 07:12

dukenv0307 reviewed Feb 19, 2025

View reviewed changes

twilight2294 added 2 commits February 20, 2025 15:24

Merge branch 'Expensify:main' into patch-24

f465779

apply suggestions

523734f

dukenv0307 approved these changes Feb 20, 2025

View reviewed changes

melvin-bot bot requested a review from jasperhuangg February 20, 2025 14:47

jasperhuangg approved these changes Feb 20, 2025

View reviewed changes

jasperhuangg merged commit 61f2d50 into Expensify:main Feb 20, 2025
17 checks passed

github-actions bot mentioned this pull request Feb 20, 2025

Deploy Checklist: New Expensify 2025-02-20 #57207

Closed

36 tasks

melvin-bot bot mentioned this pull request Feb 21, 2025

[Due for payment 2025-02-28] [$250] Delete expene missing after cancel payment #55319

Closed

8 tasks

jacobkim9881 mentioned this pull request Feb 28, 2025

[$250] Next Steps - Incorrect next steps is shown when submitting expense offline. #57574

Open

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update status num to correct value #56950

update status num to correct value #56950

twilight2294 commented Feb 17, 2025 •

edited

Loading

melvin-bot bot commented Feb 18, 2025

dukenv0307 Feb 19, 2025

dukenv0307 Feb 19, 2025

dukenv0307 Feb 19, 2025 •

edited

Loading

dukenv0307 Feb 19, 2025

twilight2294 commented Feb 20, 2025

dukenv0307 commented Feb 20, 2025

dukenv0307 left a comment

OSBotify commented Feb 20, 2025

github-actions bot commented Feb 20, 2025

github-actions bot commented Feb 21, 2025

update status num to correct value #56950

update status num to correct value #56950

Conversation

twilight2294 commented Feb 17, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Feb 18, 2025

dukenv0307 Feb 19, 2025

Choose a reason for hiding this comment

dukenv0307 Feb 19, 2025

Choose a reason for hiding this comment

dukenv0307 Feb 19, 2025 • edited Loading

Choose a reason for hiding this comment

dukenv0307 Feb 19, 2025

Choose a reason for hiding this comment

twilight2294 commented Feb 20, 2025

dukenv0307 commented Feb 20, 2025

Reviewer Checklist

Screenshots/Videos

dukenv0307 left a comment

Choose a reason for hiding this comment

OSBotify commented Feb 20, 2025

github-actions bot commented Feb 20, 2025

github-actions bot commented Feb 21, 2025

twilight2294 commented Feb 17, 2025 •

edited

Loading

dukenv0307 Feb 19, 2025 •

edited

Loading