fix invoice category #49142

Nodebrute · 2024-09-12T22:49:06Z

Details

Fixed Issues

$ #47922
PROPOSAL: #47922 (comment)

Tests

Create two new workspaces
Log out and log in
Go to FAB > Send invoice > Proceed to the confirmation page
Click "Send from" and select any other workspace
On the confirmation page click show more
Verify category field is present

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Create two new workspaces
Log out and log in
Go to FAB > Send invoice > Proceed to the confirmation page
Click "Send from" and select any other workspace
On the confirmation page click show more
Verify category field is present

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-09-13.at.6.06.17.AM.mov

Android: mWeb Chrome

Screen.Recording.2024-09-13.at.6.10.26.AM.mov

iOS: Native

Screen.Recording.2024-09-13.at.5.13.28.AM.mov

iOS: mWeb Safari

Screen.Recording.2024-09-13.at.4.03.37.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-09-13.at.3.57.13.AM.1.1.mov

MacOS: Desktop

Screen.Recording.2024-09-13.at.3.58.48.AM.mov

melvin-bot · 2024-09-13T01:23:57Z

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

rayane-djouah · 2024-09-15T19:39:35Z

src/pages/iou/request/step/IOURequestStepConfirmation.tsx

@@ -168,6 +168,10 @@ function IOURequestStepConfirmation({
        if (policyExpenseChat?.policyID && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
            openDraftWorkspaceRequest(policyExpenseChat.policyID);
        }
+        const isSender = participants?.find((participant) => participant.isSender);


Suggested change

const isSender = participants?.find((participant) => participant.isSender);

const senderPolicyParticipant = participants?.find((participant) => participant.isSender);

src/pages/iou/request/step/IOURequestStepConfirmation.tsx

rayane-djouah · 2024-09-15T20:29:13Z

src/pages/iou/request/step/IOURequestStepConfirmation.tsx

@@ -168,6 +168,10 @@ function IOURequestStepConfirmation({
        if (policyExpenseChat?.policyID && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
            openDraftWorkspaceRequest(policyExpenseChat.policyID);
        }
+        const isSender = participants?.find((participant) => participant.isSender);
+        if (isSender?.policyID && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {


I've noticed that when we change the invoice sender policy, the effect runs twice because the participants change and then the policy changes. This causes the API request to run twice. To prevent this, we need to add a check to ensure the API is called only once:

Suggested change

if (isSender?.policyID && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {

if (senderPolicyParticipant?.policyID && policy?.id === senderPolicyParticipant?.policyID && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {

Hey @rayane-djouah, Even on the latest main branch, the effect runs three times and the API is called three times when we use submit expense flow.

Screen.Recording.2024-09-16.at.3.00.24.AM.mov

@Nodebrute I believe this is a bug. We only need to call the API once when the policy changes, so isOffline, participants, and policy?.pendingAction should be the only necessary useEffect dependencies.

@rayane-djouah With the recent changes, I tested it again, and it’s working fine now.

Co-authored-by: rayane-djouah <[email protected]>

rayane-djouah · 2024-09-16T15:38:25Z

src/libs/ReportUtils.ts

@@ -458,6 +458,7 @@ type OptionData = {
    tabIndex?: 0 | -1;
    isConciergeChat?: boolean;
    isBold?: boolean;
+    isSender?: boolean;


This property is not used, let's remove it

If we remove this property, we get a type error 'isSender' does not exist on type 'OptionData | Participant'. Property 'isSender' does not exist on type 'OptionData'.

@Nodebrute Let's update the condition to:

const senderPolicyParticipant = participants?.find((participant) => !!participant && 'isSender' in participant && participant.isSender);

and remove isSender property from OptionData type.

rayane-djouah · 2024-09-19T00:49:49Z

@Nodebrute Friendly bump

Nodebrute · 2024-09-19T02:22:06Z

@rayane-djouah Thank you for your patience! I’ve made and tested the suggested changes, and they work well.

rayane-djouah · 2024-09-22T16:59:59Z

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-09-22.at.5.17.42.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-09-22.at.5.56.47.PM.mov

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-09-22.at.17.14.19.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-09-22.at.17.24.27.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-09-22.at.5.16.37.PM.mov

MacOS: Desktop

Screen.Recording.2024-09-22.at.5.17.15.PM.mov

rayane-djouah

LGTM and tests well

rayane-djouah · 2024-09-22T17:02:24Z

@stitesExpensify all yours!

stitesExpensify · 2024-09-23T22:18:39Z

@Nodebrute looks like there is an eslint failure

stitesExpensify · 2024-09-23T22:19:00Z

/home/runner/work/App/App/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
  667:44  error  'withOnyx' is deprecated. Use `useOnyx` instead of `withOnyx` whenever possible.

Nodebrute · 2024-09-23T23:50:17Z

@stitesExpensify It seems to be failing because of this. Do you think we should address it in this PR?

stitesExpensify · 2024-09-24T15:46:49Z

The intention and expectation that generally you should fix these errors, even if you didn't introduce the usage.

Based on that comment, I think that we should

Nodebrute · 2024-09-24T17:38:16Z

@stitesExpensify I’ve migrated this to useOnyx! 🎉 It was a bit complicated. I’ve tested it, everything’s looking good on my end. Just so we’re clear, I’m not taking the fall if anything goes haywire 😁

@rayane-djouah can you review this again?

rayane-djouah

LGTM and tests well

rayane-djouah · 2024-09-25T13:51:04Z

@stitesExpensify all yours!

OSBotify · 2024-09-25T15:34:59Z

✋ 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 · 2024-09-27T17:58:50Z

🚀 Deployed to staging by https://github.com/stitesExpensify in version: 9.0.41-0 🚀

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

kavimuru · 2024-09-30T15:58:02Z

Failing with original KI #47922 in iOS https://platform.applause.com/services/links/v1/external/be5003de470290723ceaa71e84a45cf6e02372b1bc208704e2ea71aff36b42f6

rayane-djouah · 2024-09-30T16:14:25Z

@kavimuru This feature requires internet connection

github-actions · 2024-09-30T22:40:37Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.41-10 🚀

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

fix invoice category

021d61e

Nodebrute marked this pull request as ready for review September 13, 2024 01:23

Nodebrute requested a review from a team as a code owner September 13, 2024 01:23

melvin-bot bot requested review from rayane-djouah and removed request for a team September 13, 2024 01:23

rayane-djouah suggested changes Sep 15, 2024

View reviewed changes

Nodebrute and others added 8 commits September 16, 2024 02:57

Update src/pages/iou/request/step/IOURequestStepConfirmation.tsx

fc706e9

Co-authored-by: rayane-djouah <[email protected]>

Update src/pages/iou/request/step/IOURequestStepConfirmation.tsx

d4007d4

Co-authored-by: rayane-djouah <[email protected]>

Update src/pages/iou/request/step/IOURequestStepConfirmation.tsx

6d9836a

Co-authored-by: rayane-djouah <[email protected]>

Merge branch 'Expensify:main' into invoicefix

50d7a25

fix dependancy

63f8dc3

main

5e6887e

add transaction?.billable

88b3289

fix useeffect dependancy

7cd4281

rayane-djouah suggested changes Sep 16, 2024

View reviewed changes

Nodebrute and others added 2 commits September 19, 2024 07:00

Merge branch 'Expensify:main' into invoicefix

77ae666

fix isSender type

8616749

rayane-djouah approved these changes Sep 22, 2024

View reviewed changes

melvin-bot bot requested a review from stitesExpensify September 22, 2024 17:00

Merge branch 'Expensify:main' into invoicefix

8c0f55a

Nodebrute added 2 commits September 24, 2024 22:16

migrate to useOnyx

68e75a0

fix lint errors

cffd880

Nodebrute requested a review from rayane-djouah September 24, 2024 17:29

rayane-djouah approved these changes Sep 25, 2024

View reviewed changes

stitesExpensify approved these changes Sep 25, 2024

View reviewed changes

stitesExpensify merged commit f74fc3a into Expensify:main Sep 25, 2024
17 checks passed

github-actions bot mentioned this pull request Sep 27, 2024

Deploy Checklist: New Expensify 2024-09-27 #49855

Closed

rayane-djouah mentioned this pull request Oct 2, 2024

[$250] Invoice - Category field does not show up on confirmation page after relogin #47922

Closed

6 tasks

NikkiWines mentioned this pull request Oct 4, 2024

[HOLD for payment 2024-11-14] [$250] Track expense - Add receipt modal is missing on confirmation page when sharing with accountant #50246

Open

6 tasks

Nodebrute deleted the invoicefix branch October 29, 2024 19:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix invoice category #49142

fix invoice category #49142

Nodebrute commented Sep 12, 2024 •

edited

Loading

melvin-bot bot commented Sep 13, 2024

rayane-djouah Sep 15, 2024

rayane-djouah Sep 15, 2024

Nodebrute Sep 15, 2024

rayane-djouah Sep 15, 2024

Nodebrute Sep 16, 2024

rayane-djouah Sep 16, 2024

Nodebrute Sep 16, 2024

rayane-djouah Sep 17, 2024 •

edited

Loading

rayane-djouah commented Sep 19, 2024

Nodebrute commented Sep 19, 2024

rayane-djouah commented Sep 22, 2024

rayane-djouah left a comment

rayane-djouah commented Sep 22, 2024

stitesExpensify commented Sep 23, 2024

stitesExpensify commented Sep 23, 2024

Nodebrute commented Sep 23, 2024

stitesExpensify commented Sep 24, 2024

Nodebrute commented Sep 24, 2024

rayane-djouah left a comment

rayane-djouah commented Sep 25, 2024

OSBotify commented Sep 25, 2024

github-actions bot commented Sep 27, 2024

kavimuru commented Sep 30, 2024

rayane-djouah commented Sep 30, 2024

github-actions bot commented Sep 30, 2024

	const isSender = participants?.find((participant) => participant.isSender);
	const senderPolicyParticipant = participants?.find((participant) => participant.isSender);

	if (isSender?.policyID && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
	if (senderPolicyParticipant?.policyID && policy?.id === senderPolicyParticipant?.policyID && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {

fix invoice category #49142

fix invoice category #49142

Conversation

Nodebrute commented Sep 12, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 13, 2024

rayane-djouah Sep 15, 2024

Choose a reason for hiding this comment

rayane-djouah Sep 15, 2024

Choose a reason for hiding this comment

Nodebrute Sep 15, 2024

Choose a reason for hiding this comment

rayane-djouah Sep 15, 2024

Choose a reason for hiding this comment

Nodebrute Sep 16, 2024

Choose a reason for hiding this comment

rayane-djouah Sep 16, 2024

Choose a reason for hiding this comment

Nodebrute Sep 16, 2024

Choose a reason for hiding this comment

rayane-djouah Sep 17, 2024 • edited Loading

Choose a reason for hiding this comment

rayane-djouah commented Sep 19, 2024

Nodebrute commented Sep 19, 2024

rayane-djouah commented Sep 22, 2024

Reviewer Checklist

Screenshots/Videos

rayane-djouah left a comment

Choose a reason for hiding this comment

rayane-djouah commented Sep 22, 2024

stitesExpensify commented Sep 23, 2024

stitesExpensify commented Sep 23, 2024

Nodebrute commented Sep 23, 2024

stitesExpensify commented Sep 24, 2024

Nodebrute commented Sep 24, 2024

rayane-djouah left a comment

Choose a reason for hiding this comment

rayane-djouah commented Sep 25, 2024

OSBotify commented Sep 25, 2024

github-actions bot commented Sep 27, 2024

kavimuru commented Sep 30, 2024

rayane-djouah commented Sep 30, 2024

github-actions bot commented Sep 30, 2024

Nodebrute commented Sep 12, 2024 •

edited

Loading

rayane-djouah Sep 17, 2024 •

edited

Loading