Add confirmation prompt when approving held request via report preview #42896

nkdengineer · 2024-05-31T05:32:00Z

Details

Add confirmation prompt when approving held request via report preview

Fixed Issues

$ #39335
PROPOSAL: #39335 (comment)

Tests

Precondition: Workspace enabled approval

Go to the WS chat
Create two expenses
Open transaction thread report of one expense and hold the request
Submit the expense
As approver, open WS chat and click on approve in report preview
Verify that confirmation prompt appears

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Precondition: Workspace enabled approval

Go to the WS chat
Create two expenses
Open transaction thread report of one expense and hold the request
Submit the expense
As approver, open WS chat and click on approve in report preview
Verify that confirmation prompt appears

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-05-31.at.12.16.58.mov

Android: mWeb Chrome

Screen.Recording.2024-05-31.at.12.16.39.mov

iOS: Native

Screen.Recording.2024-05-31.at.12.19.29.mov

iOS: mWeb Safari

Screen.Recording.2024-05-31.at.12.18.28.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-31.at.12.10.35.mov

MacOS: Desktop

Screen.Recording.2024-05-31.at.12.20.51.mov

melvin-bot · 2024-05-31T05:32:13Z

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

src/components/ReportActionItem/ReportPreview.tsx

DylanDylann · 2024-05-31T07:50:13Z

src/components/ReportActionItem/ReportPreview.tsx

+        }
+    };
+
+    const confirmApproval = () => {


Should we create a utility function to avoid code repetition?

In this these function, we also have logic to set state of the component so we shouldn't create a util for this.

we also have logic to set state of the component so we shouldn't create a util for this.

Do you mean we shouldn't pass setIsHoldMenuVisible,... to the util function? Could you explain more why we shouldn't do that

I mean we shouldn't create a util function for this case since this function also controls the state of a component.

And Since we only use this logic for report preview and MoneyReportHeader, the duplicate is acceptable.

src/components/ReportActionItem/ReportPreview.tsx

DylanDylann · 2024-06-04T08:28:42Z

src/CONST.ts

@@ -1552,6 +1552,10 @@ const CONST = {
            CATEGORIZE: 'categorize',
            SHARE: 'share',
        },
+        ACTION_TYPE: {


@nkdengineer IMO, we don't need to create a new type here. Let's reuse REPORT_ACTION_TYPE and create a new type PreviewPaymentMethodType like this

type PreviewPaymentMethodType = DeepValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE.PAY | typeof CONST.IOU.REPORT_ACTION_TYPE.APPROVE>;

@DylanDylann I updated.

src/components/ReportActionItem/ReportPreview.tsx

src/libs/ReportUtils.ts

DylanDylann · 2024-06-04T10:02:26Z

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.2024-06-05.at.14.10.47.mov

Android: mWeb Chrome

Screen.Recording.2024-06-05.at.14.09.25.mov

iOS: Native

Screen.Recording.2024-06-05.at.14.09.49.mov

iOS: mWeb Safari

Screen.Recording.2024-06-05.at.14.08.46.mov

MacOS: Chrome / Safari

Screen.Recording.2024-06-05.at.14.08.03.mov

MacOS: Desktop

Screen.Recording.2024-06-05.at.14.07.07.mov

DylanDylann · 2024-06-05T07:01:55Z

@nkdengineer Please merge the latest main

DylanDylann

Look good

nkdengineer · 2024-06-05T07:24:58Z

@DylanDylann Merged the latest main.

nkdengineer · 2024-06-06T09:43:32Z

@bondydaa Please help to review the PR when you have a chance. Thanks.

OSBotify · 2024-06-10T15:26:22Z

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

OSBotify · 2024-06-11T22:28:23Z

🚀 Deployed to staging by https://github.com/bondydaa in version: 1.4.82-0 🚀

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

OSBotify · 2024-06-13T15:30:59Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.82-4 🚀

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

Add confirmation prompt when approving held request via report preview

2974def

nkdengineer marked this pull request as ready for review May 31, 2024 05:32

nkdengineer requested a review from a team as a code owner May 31, 2024 05:32

melvin-bot bot removed the request for review from a team May 31, 2024 05:32

melvin-bot bot requested a review from DylanDylann May 31, 2024 05:32

nkdengineer mentioned this pull request May 31, 2024

[HOLD for payment 2024-06-20] [$500] [Held requests] No confirmation prompt when approving held request via the report preview #39335

Closed

6 tasks

nkdengineer added 2 commits May 31, 2024 13:19

fix lint

68aa796

safely check iouReport

4c67715

DylanDylann reviewed May 31, 2024

View reviewed changes

nkdengineer added 8 commits May 31, 2024 15:15

fix test

21b35f7

Merge branch 'main' into fix/39335

b34f9da

fix perf test

ac8b499

fix lint

fca320f

Merge branch 'main' into fix/39335

78f8f52

add new const

99eebd8

fix lint

0091e82

Merge branch 'main' into fix/39335

5866cb9

DylanDylann reviewed Jun 4, 2024

View reviewed changes

nkdengineer added 3 commits June 4, 2024 15:53

fix perf test

7392bd5

update suggestion

fd6d0f7

fix perf test

2897d7f

DylanDylann reviewed Jun 4, 2024

View reviewed changes

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

nkdengineer added 2 commits June 4, 2024 16:56

fix type

e7969de

refactor suggestion

7ccb8ff

run prettier

28220dd

DylanDylann approved these changes Jun 5, 2024

View reviewed changes

melvin-bot bot requested a review from bondydaa June 5, 2024 07:12

merge main

3df8d03

resolve conflict

dfad444

nkdengineer mentioned this pull request Jun 6, 2024

Hold-Full report gets approved automatically even if there is an expense on hold #43138

Closed

6 tasks

Merge branch 'main' into fix/39335

083823d

bondydaa approved these changes Jun 10, 2024

View reviewed changes

bondydaa merged commit 664f743 into Expensify:main Jun 10, 2024
15 checks passed

github-actions bot mentioned this pull request Jun 11, 2024

Deploy Checklist: New Expensify 2024-06-11 #43515

Closed

59 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add confirmation prompt when approving held request via report preview #42896

Add confirmation prompt when approving held request via report preview #42896

nkdengineer commented May 31, 2024

melvin-bot bot commented May 31, 2024

DylanDylann May 31, 2024

nkdengineer May 31, 2024

DylanDylann May 31, 2024

nkdengineer Jun 3, 2024

nkdengineer Jun 3, 2024

DylanDylann Jun 4, 2024

nkdengineer Jun 4, 2024

DylanDylann commented Jun 4, 2024 •

edited

Loading

DylanDylann commented Jun 5, 2024

DylanDylann left a comment

nkdengineer commented Jun 5, 2024

nkdengineer commented Jun 6, 2024

OSBotify commented Jun 10, 2024

OSBotify commented Jun 11, 2024

OSBotify commented Jun 13, 2024

Add confirmation prompt when approving held request via report preview #42896

Add confirmation prompt when approving held request via report preview #42896

Conversation

nkdengineer commented May 31, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 31, 2024

DylanDylann May 31, 2024

Choose a reason for hiding this comment

nkdengineer May 31, 2024

Choose a reason for hiding this comment

DylanDylann May 31, 2024

Choose a reason for hiding this comment

nkdengineer Jun 3, 2024

Choose a reason for hiding this comment

nkdengineer Jun 3, 2024

Choose a reason for hiding this comment

DylanDylann Jun 4, 2024

Choose a reason for hiding this comment

nkdengineer Jun 4, 2024

Choose a reason for hiding this comment

DylanDylann commented Jun 4, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

DylanDylann commented Jun 5, 2024

DylanDylann left a comment

Choose a reason for hiding this comment

nkdengineer commented Jun 5, 2024

nkdengineer commented Jun 6, 2024

OSBotify commented Jun 10, 2024

OSBotify commented Jun 11, 2024

OSBotify commented Jun 13, 2024

DylanDylann commented Jun 4, 2024 •

edited

Loading