[CP Staging] Fix opening receipt page from IOU report leads to not found page #39419

bernhardoj · 2024-04-02T16:16:08Z

Details

The not found page shows because the report ID doesn't match the transaction report ID. This PR fixes it by getting the correct report ID.

Fixed Issues

$ #39404
PROPOSAL: #39404 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Open any chat without unsettled money request
Create a new scan receipt request
Press the request preview to open the IOU report
Press the receipt to open the attachment preview
Verify you are able to see the receipt instead of not found page

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-04-03.at.00.08.57.mov

Android: mWeb Chrome

Screen.Recording.2024-04-03.at.00.11.31.mov

iOS: Native

Screen.Recording.2024-04-03.at.00.08.42.mov

iOS: mWeb Safari

Screen.Recording.2024-04-03.at.00.07.33.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-03.at.00.03.42.mov

MacOS: Desktop

Screen.Recording.2024-04-03.at.00.05.21.mov

melvin-bot · 2024-04-02T16:16:13Z

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

bernhardoj · 2024-04-02T16:18:22Z

Additional video of:

It also works for expense report

Screen.Recording.2024-04-03.at.00.15.51.mov

Track expense still works fine after implementing the fix

Screen.Recording.2024-04-03.at.00.10.40.mov

Still works when viewing the receipt from the transaction thread

Screen.Recording.2024-04-03.at.00.02.06.mov

dukenv0307 · 2024-04-02T16:24:55Z

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-04-02.at.23.36.02.mov

Android: mWeb Chrome

Screen.Recording.2024-04-02.at.23.31.31.mov

iOS: Native

Screen.Recording.2024-04-02.at.23.46.04.mov

iOS: mWeb Safari

Screen.Recording.2024-04-02.at.23.32.25.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-02.at.23.25.52.mov

MacOS: Desktop

Screen.Recording.2024-04-02.at.23.47.44.mov

shubham1206agra · 2024-04-02T16:26:45Z

Hey @bernhardoj
Track expense does not work. Please try to re-login to test again.

shubham1206agra

Please fix this for track expense too

bernhardoj · 2024-04-02T16:32:40Z

Ah yes, I can reproduce it after re-login. The transaction reportID for track expense is set to chat report optimistically,

App/src/libs/actions/IOU.ts

Lines 1252 to 1255 in 35b4d1b

    
           let optimisticTransaction = TransactionUtils.buildOptimisticTransaction( 
        
               amount, 
        
               currency, 
        
               chatReport.reportID,

but looks like BE doesn't save that, so when re-login, the reportID is lost (it becomes '0').

dukenv0307 · 2024-04-02T16:35:19Z

@shubham1206agra Do I need to review this PR?

bernhardoj · 2024-04-02T16:39:27Z

Fixed for track expense too.

shubham1206agra · 2024-04-02T16:41:20Z

@shubham1206agra Do I need to review this PR?

@dukenv0307 Please continue.

shubham1206agra · 2024-04-02T16:42:03Z

src/pages/TransactionReceiptPage.tsx

+    const moneyRequestReportID = ReportUtils.isMoneyRequestReport(report) ? report?.reportID : report?.parentReportID;
+    const isTrackExpenseReport = ReportUtils.isTrackExpenseReport(report);
+
+    const shouldShowNotFoundPage = !isTrackExpenseReport && (moneyRequestReportID ?? '') !== transaction?.reportID;


This might not be most optimal way to handle this.

Just updated again, lmk if you have any suggestion

dukenv0307 · 2024-04-02T16:49:34Z

but looks like BE doesn't save that, so when re-login, the reportID is lost (it becomes '0').

@shubham1206agra Is it the expected that BE doesn't save reportID in transaction of track expense cc @iwiznia

dukenv0307 · 2024-04-02T16:50:25Z

@bernhardoj Lint check is failing.

bernhardoj · 2024-04-02T16:51:36Z

fixed lint.

shubham1206agra · 2024-04-02T16:52:48Z

@dukenv0307 Don't worry about this. I have discussed this internally, and BE behaviour is correct. I will correct optimistic FE behaviour in other PR.

dukenv0307

LGTM, all yours @iwiznia.

NikkiWines

works great

Untitled.mov

NikkiWines · 2024-04-03T00:18:14Z

src/pages/TransactionReceiptPage.tsx

+    const isTrackExpenseReport = ReportUtils.isTrackExpenseReport(report);
+
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundPage = isTrackExpenseReport ? !transaction : (moneyRequestReportID ?? '') !== transaction?.reportID;


NAB - for brevity

Suggested change

const isTrackExpenseReport = ReportUtils.isTrackExpenseReport(report);

// eslint-disable-next-line rulesdir/no-negated-variables

const shouldShowNotFoundPage = isTrackExpenseReport ? !transaction : (moneyRequestReportID ?? '') !== transaction?.reportID;

// eslint-disable-next-line rulesdir/no-negated-variables

const shouldShowNotFoundPage = ReportUtils.isTrackExpenseReport(report) ? !transaction : (moneyRequestReportID ?? '') !== transaction?.reportID;

OSBotify · 2024-04-03T00:34:05Z

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

…-page [CP Staging] Fix opening receipt page from IOU report leads to not found page (cherry picked from commit 935df86)

OSBotify · 2024-04-03T01:55:40Z

🚀 Cherry-picked to staging by https://github.com/marcaaron in version: 1.4.59-3 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-04-08T10:57:56Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.60-13 🚀

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

get the correct report ID

8bde6bb

bernhardoj requested a review from a team as a code owner April 2, 2024 16:16

melvin-bot bot requested review from dukenv0307 and removed request for a team April 2, 2024 16:16

iwiznia previously approved these changes Apr 2, 2024

View reviewed changes

shubham1206agra suggested changes Apr 2, 2024

View reviewed changes

don't show not found page for track expense report

99a31ff

bernhardoj dismissed iwiznia’s stale review via 99a31ff April 2, 2024 16:38

shubham1206agra reviewed Apr 2, 2024

View reviewed changes

improve the not found page condition

3b474df

supress lint

b101c09

dukenv0307 approved these changes Apr 2, 2024

View reviewed changes

melvin-bot bot requested a review from iwiznia April 2, 2024 16:59

NikkiWines self-requested a review April 2, 2024 23:04

NikkiWines approved these changes Apr 3, 2024

View reviewed changes

NikkiWines changed the title ~~Fix opening receipt page from IOU report leads to not found pagev~~ [CP Staging] Fix opening receipt page from IOU report leads to not found page Apr 3, 2024

NikkiWines merged commit 935df86 into Expensify:main Apr 3, 2024
18 checks passed

OSBotify pushed a commit that referenced this pull request Apr 3, 2024

Merge pull request #39419 from bernhardoj/fix/39404-not-found-receipt…

f8c28be

…-page [CP Staging] Fix opening receipt page from IOU report leads to not found page (cherry picked from commit 935df86)

github-actions bot mentioned this pull request Apr 3, 2024

Deploy Checklist: New Expensify 2024-04-02 #39399

Closed

87 tasks

tgolen mentioned this pull request Apr 3, 2024

IOU - Comment on a deleted IOU isn't opening from the combined report view #39512

Closed

6 tasks

melvin-bot bot mentioned this pull request Apr 8, 2024

[HOLD for payment 2024-04-15] [$500] IOU - Opening IOU receipt leads to not here page #39404

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Fix opening receipt page from IOU report leads to not found page #39419

[CP Staging] Fix opening receipt page from IOU report leads to not found page #39419

bernhardoj commented Apr 2, 2024

melvin-bot bot commented Apr 2, 2024

bernhardoj commented Apr 2, 2024

dukenv0307 commented Apr 2, 2024 •

edited

Loading

shubham1206agra commented Apr 2, 2024

shubham1206agra left a comment

bernhardoj commented Apr 2, 2024

dukenv0307 commented Apr 2, 2024 •

edited

Loading

bernhardoj commented Apr 2, 2024

shubham1206agra commented Apr 2, 2024

shubham1206agra Apr 2, 2024

bernhardoj Apr 2, 2024

dukenv0307 commented Apr 2, 2024

dukenv0307 commented Apr 2, 2024 •

edited

Loading

bernhardoj commented Apr 2, 2024

shubham1206agra commented Apr 2, 2024

dukenv0307 left a comment

NikkiWines left a comment

NikkiWines Apr 3, 2024

OSBotify commented Apr 3, 2024

OSBotify commented Apr 3, 2024

OSBotify commented Apr 8, 2024

[CP Staging] Fix opening receipt page from IOU report leads to not found page #39419

[CP Staging] Fix opening receipt page from IOU report leads to not found page #39419

Conversation

bernhardoj commented Apr 2, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 2, 2024

bernhardoj commented Apr 2, 2024

dukenv0307 commented Apr 2, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

shubham1206agra commented Apr 2, 2024

shubham1206agra left a comment

Choose a reason for hiding this comment

bernhardoj commented Apr 2, 2024

dukenv0307 commented Apr 2, 2024 • edited Loading

bernhardoj commented Apr 2, 2024

shubham1206agra commented Apr 2, 2024

shubham1206agra Apr 2, 2024

Choose a reason for hiding this comment

bernhardoj Apr 2, 2024

Choose a reason for hiding this comment

dukenv0307 commented Apr 2, 2024

dukenv0307 commented Apr 2, 2024 • edited Loading

bernhardoj commented Apr 2, 2024

shubham1206agra commented Apr 2, 2024

dukenv0307 left a comment

Choose a reason for hiding this comment

NikkiWines left a comment

Choose a reason for hiding this comment

NikkiWines Apr 3, 2024

Choose a reason for hiding this comment

OSBotify commented Apr 3, 2024

OSBotify commented Apr 3, 2024

OSBotify commented Apr 8, 2024

dukenv0307 commented Apr 2, 2024 •

edited

Loading

dukenv0307 commented Apr 2, 2024 •

edited

Loading

dukenv0307 commented Apr 2, 2024 •

edited

Loading