fix: resolve dupe button on one-expense report

[daledah]

Details

Fixed Issues

$ #49793
PROPOSAL: #49793 (comment)

Tests

Precondition:

1. Control WS, delayed submissions set to Weekly, had admin as approver
2. User submit an expense report, admin approved
3. User submit another report with the same amount and merchant as 2.

Steps:

1. Open the expense report submitted in step 3
2. Verify that: "Review duplicates" button appears.

• Verify that no errors appear in the JS console

Offline tests

QA Steps

Precondition:

1. Control WS, delayed submissions set to Weekly, enable Approval and have admin as approver
2. User submit an expense report, admin approved
3. User submit another report with the same amount and merchant as 2.

Steps:

1. Open the expense report submitted in step 3
2. Verify that: "Review duplicates" button appears.

• 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 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
    • If any non-english text was added/modified, I verified the translation was requested/reviewed 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.js 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.
• 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.2024-10-03.at.15.45.13.mov

Android: mWeb Chrome

Screen.Recording.2024-10-03.at.15.46.21.mov

iOS: Native

Screen.Recording.2024-10-03.at.15.49.31.mov

iOS: mWeb Safari

Screen.Recording.2024-10-03.at.15.50.31.mov

MacOS: Chrome / Safari

Screen.Recording.2024-10-03.at.15.12.26.mp4

MacOS: Desktop

Screen.Recording.2024-10-03.at.15.54.12.mov

[melvin-bot]

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

[sobitneupane]

@daledah The "Review Duplicate" button remains visible even after one of the duplicate expenses is deleted.

Steps to Reproduce:

• Delete one of the duplicate expenses.
• Open the remaining expense.
• The "Review Duplicate" option is still visible, even though the duplicate error has been removed.

Screen.Recording.2024-10-04.at.11.49.44.mov

[sobitneupane]

Screenshots/Videos

MacOS: Chrome / Safari

Existing Review Duplicate button in batched expenses:

New Review Duplicate button added by this PR:

iOS: Native

Existing Review Duplicate button in batched expenses:

New Review Duplicate button added by this PR:

iOS: mWeb Safari

Existing Review Duplicate button in batched expenses:

New Review Duplicate button added by this PR:

[sobitneupane]

@dannymcclain could you please review the screenshots attached above?

• After the change, the Approve button will appear alongside the Review duplicates button, while other buttons, such as the Submit button, will each appear on a separate row.

• Green "Review duplicates" button is currently being used for batched expenses. Should we use the same for one-expense report as well?

[daledah]

@sobitneupane Can you detail your steps in #50133 (comment)? I can't seem to replicate the exact condition as in your video.

[sobitneupane]

@daledah I can no longer reproduce the issue. I’ll follow up if I manage to replicate it again.

[dannymcclain]

The screenshots look a bit off to me. I think the Resolve duplicates button should be green if it's the only action available. If there is another, higher-priority action (like approve or submit) then it would go to our default/standard button color.

On mobile, the buttons should be next to each other instead of stacked.

cc'ing @dubielzyk-expensify & @JmillsExpensify for a gut check on all this.

[dubielzyk-expensify]

That looks right to me Danny!

[pecanoro]

@daledah Are all the buttons consistent with what @dannymcclain posted?

[daledah]

@pecanoro I'll update soon.

[daledah]

@dannymcclain @pecanoro I updated

[dannymcclain]

Updated screenshots/videos are looking good.

On mobile, it looks like there's a second or two when the report is loading that the big green button (Approve for example) is full-width, and then the Resolve duplicates button flashes in and the layout changes—is there any way to get rid of that jump or is it just a consequence of how we're loading the state of the report?

Otherwise layout is looking good to me.

[pecanoro]

@sobitneupane Ready for you to do another review!

[sobitneupane]

• fix: resolve dupe button on one-expense report #50133 (comment)
• Padding off for Review Duplicates button when it is the only button (gap between button and the search icon)

• When shouldShowIntegrationButton is true, Review Duplicates button takes more space.

[sobitneupane]

Things to be considered shouldDuplicateButtonBeSuccess:

• Looks like the Submit button is not success in employer's end

- I think ExportIntegrationButton will always have default color.

[daledah]

@sobitneupane I think submit button not being success-themed is expected:

App/src/components/MoneyReportHeader.tsx

Line 244 in 392d56a

// The submit button should be success green colour only if the user is submitter and the policy does not have Scheduled Submit turned on

[sobitneupane]

I believe so. In that case, should we have Review duplicates button success? cc: @dannymcclain

[dannymcclain]

🤔 Hmm, maybe? In this case I'm not sure. I don't think it's wrong to have two regular buttons here. But maybe @JmillsExpensify will have a better informed opinion on if the review duplicates button should be success colored in this situation.

[JmillsExpensify]

It's not wrong to have two regular buttons. This is the case of delayed submission being enabled, with a submission frequency set.

[daledah]

@sobitneupane I updated, please review again.
Regarding #50133 (comment), I believe there are no delays from the UI side, it's all about loading states of the component.