[CP Staging] Fix next steps loading state #62768

SzymczakJ · 2025-05-26T06:53:56Z

Explanation of Change

Fixed Issues

$ #62685
$ #62719
PROPOSAL:

Tests

Test steps for Next step action shows skeleton loading when workflows are disabled

have a workspace that has workflows disabled
Create an expense in that workspace and open it.
Make sure that next steps loading state dissappears after the report fully loads
Check workspace with workflows enabled and make sure the next steps loading state behave correctly.
Test steps for When expense is submitted offline,next step is loading,report title shows unavailable workspace
Go to self DM.
Track a manual expense.
Go offline.
Click Share it with my accountant.
Enter merchant.
Click Create expense.
On the workspace chat, click on the expense preview.
Make sure that next step loading state doesn't show.

Precondition:

Account has self DM.
Account does not have workspace.

Go to staging.new.expensify.com
Go to self DM.
Track a manual expense.
Go offline.
Click Share it with my account.
Enter merchant.
Click Create expense.
On the workspace chat, click on the expense preview.
Next step action will not show skeleton loading when the expense is submitted in offline mode.
Report title will not contain "Unavailable workspace" and negative amount.

Offline tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

Screen.Recording.2025-05-26.at.10.38.39.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-05-26.at.10.30.54.mov

MacOS: Desktop

melvin-bot · 2025-05-26T06:54:10Z

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

mountiny · 2025-05-26T07:12:55Z

src/components/MoneyReportHeader.tsx

@@ -284,7 +284,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
    const isSubmitterSameAsNextApprover = isReportOwner(moneyRequestReport) && nextApproverAccountID === moneyRequestReport?.ownerAccountID;
    const optimisticNextStep = isSubmitterSameAsNextApprover && policy?.preventSelfApproval ? buildOptimisticNextStepForPreventSelfApprovalsEnabled() : nextStep;

-    const shouldShowNextStep = isFromPaidPolicy && !isInvoiceReport && !shouldShowStatusBar;
+    const shouldShowNextStep = isFromPaidPolicy && !isInvoiceReport && !shouldShowStatusBar && policy?.areWorkflowsEnabled;


As mentioned in Slack, I dont think this is the right fix, the report has some next steps even if the worflows are not enabled on the policy

DylanDylann · 2025-05-26T08:40:41Z

src/components/MoneyReportHeader.tsx

@@ -892,7 +903,8 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                            />
                        </View>
                    )}
-                    {shouldShowNextStep && (optimisticNextStep?.message?.length ? <MoneyReportHeaderStatusBar nextStep={optimisticNextStep} /> : <MoneyReportHeaderStatusBarSkeleton />)}
+                    {shouldShowNextStep && !!optimisticNextStep?.message?.length && <MoneyReportHeaderStatusBar nextStep={optimisticNextStep} />}
+                    {shouldShowNextStep && !optimisticNextStep?.message?.length && !!isLoadingInitialReportActions && <MoneyReportHeaderStatusBarSkeleton />}


What do you think about this approach?

Suggested change

{shouldShowNextStep && !optimisticNextStep?.message?.length && !!isLoadingInitialReportActions && <MoneyReportHeaderStatusBarSkeleton />}

const [nextStep, nextStepResult] = useOnyx(`${ONYXKEYS.COLLECTION.NEXT_STEP}${moneyRequestReport?.reportID}`, {canBeMissing: true});

..........................

{shouldShowNextStep && !optimisticNextStep?.message?.length && isLoadingOnyxValue(nextStepResult) && <MoneyReportHeaderStatusBarSkeleton />}

In your solution, I am not sure why we use isLoadingInitialReportActions as a loading flag for nextStep data

I'm using isLoadingInitialReportActions because that value is set to "loading" when openReport command is running, openReport command is also responsible for downloading the nextSteps, so I use is as a loading indicator for nextSteps

Unfortunately isLoadingOnyxValue approach doesn't work, because when nextSteps are not present in onyx then the isLoadingOnyxValue returns false and it doesn't know that it's being downloaded by openReport

DylanDylann · 2025-05-26T09:18:21Z

@SzymczakJ Our PR also fix #62719

DylanDylann · 2025-05-26T09:18:45Z

Could you include #62719 in the PR description?

DylanDylann · 2025-05-26T09:27:27Z

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-26.at.16.39.58.mov

Android: mWeb Chrome

Screen.Recording.2025-05-26.at.16.34.48.mov

iOS: HybridApp

Screen.Recording.2025-05-26.at.16.35.26.mov

iOS: mWeb Safari

Screen.Recording.2025-05-26.at.16.33.32.mov

MacOS: Chrome / Safari

Screen.Recording.2025-05-26.at.16.27.31.mov

MacOS: Desktop

Screen.Recording.2025-05-26.at.16.32.18.mov

DylanDylann

LGTM

mountiny

Changes look good to me, thanks!

OSBotify · 2025-05-26T10:27:45Z

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

…xt-steps-loading-state [CP Staging] Fix next steps loading state (cherry picked from commit a76fe90) (cherry-picked to staging by mountiny)

github-actions · 2025-05-26T12:59:04Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.1.51-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-05-26T19:18:26Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.1.51-6 🚀

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

SzymczakJ marked this pull request as ready for review May 26, 2025 06:54

SzymczakJ requested a review from a team as a code owner May 26, 2025 06:54

melvin-bot bot requested a review from hoangzinh May 26, 2025 06:54

melvin-bot bot removed the request for review from a team May 26, 2025 06:54

mountiny requested review from DylanDylann and removed request for hoangzinh May 26, 2025 07:06

mountiny assigned SzymczakJ May 26, 2025

mountiny requested changes May 26, 2025

View reviewed changes

fix next steps loading state

c471722

SzymczakJ force-pushed the @szymczak/fix-next-steps-loading-state branch from 46ba54c to c471722 Compare May 26, 2025 08:09

mountiny self-requested a review May 26, 2025 08:33

DylanDylann reviewed May 26, 2025

View reviewed changes

DylanDylann approved these changes May 26, 2025

View reviewed changes

mountiny changed the title ~~Fix next steps loading state~~ [CP Staging] Fix next steps loading state May 26, 2025

mountiny approved these changes May 26, 2025

View reviewed changes

mountiny merged commit a76fe90 into Expensify:main May 26, 2025
20 of 27 checks passed

SzymczakJ mentioned this pull request May 26, 2025

[$250] Report -"Wating for you to submit expense" becomes infinite loading when changing report´s WS #62729

Open

8 tasks

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

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

Deploy Checklist: New Expensify 2025-05-23 #62662

Closed

This was referenced May 26, 2025

Revert "Refactor table view report loading state" #62708

Closed

[Due for payment 2025-06-05] [Due for payment 2025-06-02] When expense is submitted offline,next step is loading,report title shows unavailable workspace #62719

Open

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

[Due for payment 2025-06-05] [Due for payment 2025-06-02] Expense - Next step action shows skeleton loading when workflows are disabled #62685

Open

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[CP Staging] Fix next steps loading state #62768

[CP Staging] Fix next steps loading state #62768

SzymczakJ commented May 26, 2025 •

edited by mountiny

Loading

Uh oh!

melvin-bot bot commented May 26, 2025

Uh oh!

mountiny May 26, 2025

Uh oh!

DylanDylann May 26, 2025 •

edited

Loading

Uh oh!

DylanDylann May 26, 2025

Uh oh!

SzymczakJ May 26, 2025

Uh oh!

SzymczakJ May 26, 2025

Uh oh!

DylanDylann commented May 26, 2025

Uh oh!

DylanDylann commented May 26, 2025

Uh oh!

DylanDylann commented May 26, 2025 •

edited

Loading

Uh oh!

DylanDylann left a comment

Uh oh!

mountiny left a comment

Uh oh!

Uh oh!

OSBotify commented May 26, 2025

Uh oh!

github-actions bot commented May 26, 2025

Uh oh!

github-actions bot commented May 26, 2025

Uh oh!

Uh oh!

-                    {shouldShowNextStep && !optimisticNextStep?.message?.length && !!isLoadingInitialReportActions && <MoneyReportHeaderStatusBarSkeleton />}
+    const [nextStep, nextStepResult] = useOnyx(`${ONYXKEYS.COLLECTION.NEXT_STEP}${moneyRequestReport?.reportID}`, {canBeMissing: true});
+    ..........................
+                    {shouldShowNextStep && !optimisticNextStep?.message?.length && isLoadingOnyxValue(nextStepResult) && <MoneyReportHeaderStatusBarSkeleton />}

[CP Staging] Fix next steps loading state #62768

[CP Staging] Fix next steps loading state #62768

Conversation

SzymczakJ commented May 26, 2025 • edited by mountiny 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 May 26, 2025

Uh oh!

mountiny May 26, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann May 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DylanDylann May 26, 2025

Choose a reason for hiding this comment

Uh oh!

SzymczakJ May 26, 2025

Choose a reason for hiding this comment

Uh oh!

SzymczakJ May 26, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented May 26, 2025

Uh oh!

DylanDylann commented May 26, 2025

Uh oh!

DylanDylann commented May 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

DylanDylann left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented May 26, 2025

Uh oh!

github-actions bot commented May 26, 2025

Uh oh!

github-actions bot commented May 26, 2025

Uh oh!

Uh oh!

SzymczakJ commented May 26, 2025 •

edited by mountiny

Loading

DylanDylann May 26, 2025 •

edited

Loading

DylanDylann commented May 26, 2025 •

edited

Loading