Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Closing receipt view using device navigation redirects user to expense report #35497

Merged
merged 19 commits into from
Mar 8, 2024
Merged

fix: Closing receipt view using device navigation redirects user to expense report #35497

merged 19 commits into from
Mar 8, 2024

Conversation

tienifr
Copy link
Contributor

@tienifr tienifr commented Jan 31, 2024 •
edited
Loading

Details

Fixed Issues

$ #33549
PROPOSAL: #33549 (comment)

Tests

  1. Go to the details page of expense request that has receipt
  2. Tap on the receipt
  3. Close the receipt view by using device navigation
  4. Verify that user returns to request details page
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Go to the details page of expense request that has receipt
  2. Tap on the receipt
  3. Close the receipt view by using device navigation
  4. Verify that user returns to request details 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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-02-01.at.10.31.22.mov
Android: mWeb Chrome
Screen.Recording.2024-02-01.at.10.35.02.mov
iOS: Native
Screen.Recording.2024-02-01.at.10.17.42.mov
iOS: mWeb Safari
Screen.Recording.2024-02-01.at.10.32.04.mov
MacOS: Chrome / Safari
Screen.Recording.2024-02-01.at.10.00.11.mov
MacOS: Desktop
Screen.Recording.2024-02-01.at.10.25.13.mov

@tienifr tienifr marked this pull request as ready for review February 1, 2024 03:37
@tienifr tienifr requested a review from a team as a code owner February 1, 2024 03:37
@melvin-bot melvin-bot bot requested review from aimane-chnaif and removed request for a team February 1, 2024 03:37
@melvin-bot Melvin Bot
Copy link

melvin-bot bot commented Feb 1, 2024

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

@aimane-chnaif
Copy link
Contributor

@tienifr please fix conflict

aimane-chnaif
aimane-chnaif suggested changes Feb 2, 2024
View reviewed changes
src/pages/TransactionReceiptPage.tsx Outdated Show resolved Hide resolved
src/pages/TransactionReceiptPage.tsx Outdated Show resolved Hide resolved
@tienifr
Copy link
Contributor Author

tienifr commented Feb 2, 2024

@aimane-chnaif fixed conflicts and comments above

@aimane-chnaif
Copy link
Contributor

@tienifr please fix typescript checks. And conflicts

@tienifr
Copy link
Contributor Author

tienifr commented Feb 5, 2024

@aimane-chnaif Fixed conflicts

@aimane-chnaif
Copy link
Contributor

Screen.Recording.2024-02-05.at.7.14.09.AM.mov

Overall looks good but let's fix edge cases:

  1. show not found page if
  • user doesn't have access to this link
  • reportID or transactionID in url param is invalid
  1. fetch data if user deep link to this page as soon as login but transaction data doesn't exist yet
  2. Now, receipt image shows when transactionID is correct even if reportID is wrong (check video above). Either remove reportID from url or show not found page if reportID is invalid

@tienifr
Copy link
Contributor Author

tienifr commented Feb 13, 2024

I'm checking

@tienifr
Copy link
Contributor Author

tienifr commented Feb 14, 2024

@aimane-chnaif I faced with the issue when implement 2. The attachment is not shown though deeplink after login. Did we face with this problem before?

Screen.Recording.2024-02-14.at.20.55.21.mp4

@aimane-chnaif
Copy link
Contributor

@aimane-chnaif I faced with the issue when implement 2. The attachment is not shown though deeplink after login. Did we face with this problem before?

Screen.Recording.2024-02-14.at.20.55.21.mp4

Not faced

@tienifr
Copy link
Contributor Author

tienifr commented Feb 19, 2024

@aimane-chnaif That weird. I faced this issue in main. OpenApp can't be called when the attachment modal is open. When I close the attachment, it's called and data is retrieved. If OpenApp is not called, we can't get the image url. Can you help re-check? Thanks

Screen.Recording.2024-02-19.at.14.34.49.mov

@tienifr
Copy link
Contributor Author

tienifr commented Feb 23, 2024

@aimane-chnaif Can you help check the comment above ^?

@tienifr
Copy link
Contributor Author

tienifr commented Feb 26, 2024 •
edited
Loading

@aimane-chnaif The error above is fixed somewhere else, no longer happening. Can you help review again? Thanks

@tienifr
Copy link
Contributor Author

tienifr commented Feb 29, 2024

@aimane-chnaif friendly bump you on 1:1 conversation

@aimane-chnaif
Copy link
Contributor

Please merge main. I will complete review today

@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@rlinoz
Copy link
Contributor

rlinoz commented Mar 7, 2024

The navigation is working well, just found two, probably related, issues

  1. When dismissing the receipt with swipe down in the native app, the receipt is gone but the screen is not dismissed.
WhatsApp.Video.2024-03-07.at.13.42.03.mp4
  1. When deleting a receipt the screen reloads instead of being dismissed.
WhatsApp.Video.2024-03-07.at.13.53.20.mp4

The receipt not getting deleted is another bug I think, but it also happens in prod, so not related to this changes.

@aimane-chnaif
Copy link
Contributor

  1. When dismissing the receipt with swipe down in the native app, the receipt is gone but the screen is not dismissed.

I am not able to reproduce on iOS.
@rlinoz can you please confirm this is not happening on other modals (i.e. workspace avatar)

@rlinoz
Copy link
Contributor

rlinoz commented Mar 7, 2024

Hmm it is happening in this builds #35497 (comment) but not in staging.

Let me build the app.

@aimane-chnaif
Copy link
Contributor

  1. When deleting a receipt the screen reloads instead of being dismissed.

@tienifr let's fix this dismiss issue

The receipt not getting deleted is another bug I think, but it also happens in prod, so not related to this changes.

This seems backend bug. The receipt is optimistically deleted successfully.

@tienifr
Copy link
Contributor Author

tienifr commented Mar 8, 2024

@aimane-chnaif I fixed the conflicts and the dismiss modal issue. Can you help check again?

@aimane-chnaif
Copy link
Contributor

@tienifr TypeScript Checks / typecheck (pull_request) Failing after 1m

@tienifr
Copy link
Contributor Author

tienifr commented Mar 8, 2024

@aimane-chnaif fixed. TY

aimane-chnaif
aimane-chnaif reviewed Mar 8, 2024
View reviewed changes
src/components/ReportActionItem/ReportActionItemImage.tsx Outdated
/** whether the receipt can be replaced */
canEditReceipt?: boolean;
/** Whether there are other images displayed in the same parent container */
isSingleImage?: boolean;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like this unnecessary diff. keep original order, so put isSingleImage under filename

diff

Visit https://github.com/Expensify/App/pull/35497/files and find & fix all occurrences

And any reason for canEditReceipt removal? Just optimization?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need to use canEditReceipt in this component anymore, we'll use it in TransactionReceiptPage

aimane-chnaif
aimane-chnaif reviewed Mar 8, 2024
View reviewed changes
src/components/ReportActionItem/MoneyRequestView.tsx Outdated
transaction={transaction}
enablePreviewModal
canEditReceipt={canEditReceipt}
filename={receiptURIs?.filename}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I updated

@aimane-chnaif
Copy link
Contributor

@rlinoz all yours

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 8, 2024

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/35497/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/35497/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/35497/NewExpensify.dmg https://35497.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

rlinoz
rlinoz approved these changes Mar 8, 2024
View reviewed changes
Copy link
Contributor

@rlinoz rlinoz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@rlinoz rlinoz merged commit 61b4b04 into Expensify:main Mar 8, 2024
16 checks passed
@melvin-bot melvin-bot bot added the Emergency label Mar 8, 2024
@melvin-bot Melvin Bot
Copy link

melvin-bot bot commented Mar 8, 2024

@rlinoz looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@rlinoz
Copy link
Contributor

rlinoz commented Mar 8, 2024

Im confused, there was no emergency but everything was green?

But apparently I skipped approveAndMerge

@rlinoz rlinoz removed the Emergency label Mar 8, 2024
@OSBotify
Copy link
Contributor

OSBotify commented Mar 8, 2024

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

@aimane-chnaif
Copy link
Contributor

Im confused, there was no emergency but everything was green?

But apparently I skipped approveAndMerge

That seems to be happening on other PRs. i.e. #37952 (comment), #37892 (comment)

@dukenv0307 dukenv0307 mentioned this pull request Mar 11, 2024
Closed
58 tasks
@github-actions github-actions bot mentioned this pull request Mar 11, 2024
Closed
49 tasks
@melvin-bot melvin-bot bot mentioned this pull request Mar 12, 2024
Closed
6 tasks
@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.50-5 🚀

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

shubham1206agra
shubham1206agra reviewed Apr 2, 2024
View reviewed changes
src/pages/TransactionReceiptPage.tsx
Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID ?? ''));
}}
isLoading={!transaction && reportMetadata?.isLoadingInitialReportActions}
shouldShowNotFoundPage={(report?.parentReportID ?? '') !== transaction?.reportID}
Copy link
Contributor

@shubham1206agra shubham1206agra Apr 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tienifr Is there a special reason to add this condition here (shouldShowNotFoundPage)?

This line is causing bugs in self DM track expense.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aimane-chnaif aimane-chnaif aimane-chnaif approved these changes

@shubham1206agra shubham1206agra shubham1206agra left review comments

@rlinoz rlinoz rlinoz approved these changes

Assignees
No one assigned
Labels
Ready To Build
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tienifr @aimane-chnaif @rlinoz @OSBotify @shubham1206agra