[QA failed: do not check this off] fix: Submit expense option is not disabled for users who are invited to expense report #47373

nkdengineer · 2024-08-14T03:06:20Z

Details

Fixed Issues

$ #46340
PROPOSAL: #46340 (comment)

Tests

[User A] Submit two expenses to User B
[User A] Click on the expense preview in the main chat to go to expense report
[User A] Send a user mention containing User C
[User A] Click Invite from the whisper message
[User A] Send a message in the transaction thread
[User C] Open the invited expense report
Verify that: For IOUs, only two users can add expenses to the report, the manager (report.managerID) and the submitter (report.accountID).
Verify that: For expense reports, only the submitter/owner should be able to add expenses.

Verify that no errors appear in the JS console

Offline tests

QA Steps

[User A] Submit two expenses to User B
[User A] Click on the expense preview in the main chat to go to expense report
[User A] Send a user mention containing User C
[User A] Click Invite from the whisper message
[User A] Send a message in the transaction thread
[User C] Open the invited expense report
Verify that: For IOUs, only two users can add expenses to the report, the manager (report.managerID) and the submitter (report.accountID).
Verify that: For expense reports, only the submitter/owner should be able to add expenses.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android-mweb.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-mweb.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

…to expense report

melvin-bot · 2024-08-14T09:20:17Z

@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 · 2024-08-15T03:40:59Z

src/libs/ReportUtils.ts

@@ -6218,7 +6226,7 @@ function canRequestMoney(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, o
    // which is tied to their workspace chat.
    if (isMoneyRequestReport(report)) {
        const canAddTransactions = canAddTransaction(report);
-        return isReportInGroupPolicy(report) ? isOwnPolicyExpenseChat && canAddTransactions : canAddTransactions;
+        return isReportInGroupPolicy(report) || isExpenseReport(report) ? isOwnPolicyExpenseChat && canAddTransactions : canAddTransactions;


Do we need that check? We already do that in canAddOrDeleteTransactions

@dukenv0307 I updated

dukenv0307 · 2024-08-15T04:11:35Z

@nkdengineer Pls remove steps 7, 8

dukenv0307 · 2024-08-15T04:18:47Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

dukenv0307 · 2024-08-15T04:23:09Z

LGTM

OSBotify · 2024-08-15T18:03:28Z

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

youssef-lr · 2024-08-16T21:21:42Z

src/libs/ReportUtils.ts

+        return false;
+    }
+
+    if (isExpenseReport(moneyRequestReport) && currentUserAccountID !== moneyRequestReport?.managerID) {


Wouldn't this break Instant Submit report where submitters create an expense and it gets added to a processing report?

Yeah this breaks optimistic data for instant submit, we end up creating a new stale preview, but the backend adds the expense to the processing report

Screen.Recording.2024-08-16.at.22.24.26.mov

youssef-lr · 2024-08-16T21:38:50Z

@nkdengineer in case this gets deployed to staging I've marked it as failed in QA. Can you please address the issue in my comment above? Let's make sure we disable the button in the component that controls displaying it, and only for users who they shouldn't see it. AFAIK only submitters can see that button, but I'll let @trjExpensify or @JmillsExpensify confirm. Who can add expenses to a submitted report, the submitter only, or submitter, manager, and admin?

youssef-lr · 2024-08-16T21:40:18Z

I think we need to do the check in this function

App/src/libs/ReportUtils.ts

Line 6272 in 0214b3f

    
           function canRequestMoney(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, otherParticipants: number[]): boolean {

aldo-expensify · 2024-08-16T22:01:42Z

@youssef-lr since this has not been deployed yet, what about just creating a revert PR and let @nkdengineer do a new PR that works well without needing to rush because of a deploy blocker. Sounds good?

trjExpensify · 2024-08-17T10:40:48Z

AFAIK only submitters can see that button, but I'll let @trjExpensify or @JmillsExpensify confirm. Who can add expenses to a submitted report, the submitter only, or submitter, manager, and admin?

Yep, only the submitter can add expenses to the expense report.

youssef-lr · 2024-08-17T13:10:00Z

Sounds good @aldo-expensify

nkdengineer · 2024-08-19T09:41:33Z

I'll create follow PR soon

nkdengineer · 2024-08-19T10:31:25Z

@youssef-lr I don't know how to reproduce this bug
Please write in detail the steps and explain the problem we are facing 🙏
Thank you

youssef-lr · 2024-08-19T10:39:24Z

Create a workspace and add a member
As the member, submit an expense from the workspace chat
Open the expense
Click '+' and notice you can't see 'Submit expense'

OSBotify · 2024-08-19T16:15:03Z

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 9.0.22-0 🚀

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

kavimuru · 2024-08-19T16:24:42Z

@youssef-lr are we good to QA this PR?

nkdengineer · 2024-08-19T16:37:25Z

@kavimuru This PR was reverted so we don't need to QA this now.

OSBotify · 2024-08-19T17:11:43Z

🚀 Deployed to staging by https://github.com/aldo-expensify in version: 9.0.22-1 🚀

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

aldo-expensify · 2024-08-20T18:44:07Z

Thanks for handling the revert @youssef-lr

OSBotify · 2024-08-20T22:44:47Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.0.22-9 🚀

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

nkdengineer added 3 commits August 14, 2024 10:03

fix: Submit expense option is not disabled for users who are invited …

a476cdd

…to expense report

fix: jest test

3580a06

clean code

8894db7

nkdengineer marked this pull request as ready for review August 14, 2024 09:20

nkdengineer requested a review from a team as a code owner August 14, 2024 09:20

melvin-bot bot requested review from dukenv0307 and removed request for a team August 14, 2024 09:20

dukenv0307 reviewed Aug 15, 2024

View reviewed changes

remove useless code

81536da

dukenv0307 approved these changes Aug 15, 2024

View reviewed changes

melvin-bot bot requested a review from aldo-expensify August 15, 2024 04:22

aldo-expensify approved these changes Aug 15, 2024

View reviewed changes

aldo-expensify merged commit 2500d78 into Expensify:main Aug 15, 2024
17 of 18 checks passed

youssef-lr reviewed Aug 16, 2024

View reviewed changes

youssef-lr changed the title ~~fix: Submit expense option is not disabled for users who are invited to expense report~~ [QA failed: do not check this off] fix: Submit expense option is not disabled for users who are invited to expense report Aug 16, 2024

youssef-lr changed the title ~~[QA failed: do not check this off] fix: Submit expense option is not disabled for users who are invited to expense report~~ fix: Submit expense option is not disabled for users who are invited to expense report Aug 16, 2024

youssef-lr changed the title ~~fix: Submit expense option is not disabled for users who are invited to expense report~~ [QA failed: do not check this off] fix: Submit expense option is not disabled for users who are invited to expense report Aug 16, 2024

youssef-lr mentioned this pull request Aug 17, 2024

Revert "[QA failed: do not check this off] fix: Submit expense option is not disabled for users who are invited to expense report" #47595

Merged

48 tasks

github-actions bot mentioned this pull request Aug 19, 2024

Deploy Checklist: New Expensify 2024-08-19 #47639

Closed

77 tasks

nkdengineer mentioned this pull request Aug 22, 2024

re-create: Submit expense option is not disabled for users who are invited to expense report #47682

Merged

50 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[QA failed: do not check this off] fix: Submit expense option is not disabled for users who are invited to expense report #47373

[QA failed: do not check this off] fix: Submit expense option is not disabled for users who are invited to expense report #47373

nkdengineer commented Aug 14, 2024 •

edited

Loading

melvin-bot bot commented Aug 14, 2024

dukenv0307 Aug 15, 2024

nkdengineer Aug 15, 2024

dukenv0307 commented Aug 15, 2024

dukenv0307 commented Aug 15, 2024 •

edited

Loading

dukenv0307 commented Aug 15, 2024

OSBotify commented Aug 15, 2024

youssef-lr Aug 16, 2024

youssef-lr Aug 16, 2024 •

edited

Loading

youssef-lr commented Aug 16, 2024

youssef-lr commented Aug 16, 2024 •

edited

Loading

aldo-expensify commented Aug 16, 2024

trjExpensify commented Aug 17, 2024

youssef-lr commented Aug 17, 2024

nkdengineer commented Aug 19, 2024

nkdengineer commented Aug 19, 2024

youssef-lr commented Aug 19, 2024

OSBotify commented Aug 19, 2024

kavimuru commented Aug 19, 2024

nkdengineer commented Aug 19, 2024

OSBotify commented Aug 19, 2024

aldo-expensify commented Aug 20, 2024

OSBotify commented Aug 20, 2024

[QA failed: do not check this off] fix: Submit expense option is not disabled for users who are invited to expense report #47373

[QA failed: do not check this off] fix: Submit expense option is not disabled for users who are invited to expense report #47373

Conversation

nkdengineer commented Aug 14, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 14, 2024

dukenv0307 Aug 15, 2024

Choose a reason for hiding this comment

nkdengineer Aug 15, 2024

Choose a reason for hiding this comment

dukenv0307 commented Aug 15, 2024

dukenv0307 commented Aug 15, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

dukenv0307 commented Aug 15, 2024

OSBotify commented Aug 15, 2024

youssef-lr Aug 16, 2024

Choose a reason for hiding this comment

youssef-lr Aug 16, 2024 • edited Loading

Choose a reason for hiding this comment

youssef-lr commented Aug 16, 2024

youssef-lr commented Aug 16, 2024 • edited Loading

aldo-expensify commented Aug 16, 2024

trjExpensify commented Aug 17, 2024

youssef-lr commented Aug 17, 2024

nkdengineer commented Aug 19, 2024

nkdengineer commented Aug 19, 2024

youssef-lr commented Aug 19, 2024

OSBotify commented Aug 19, 2024

kavimuru commented Aug 19, 2024

nkdengineer commented Aug 19, 2024

OSBotify commented Aug 19, 2024

aldo-expensify commented Aug 20, 2024

OSBotify commented Aug 20, 2024

nkdengineer commented Aug 14, 2024 •

edited

Loading

dukenv0307 commented Aug 15, 2024 •

edited

Loading

youssef-lr Aug 16, 2024 •

edited

Loading

youssef-lr commented Aug 16, 2024 •

edited

Loading