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.

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

Allow detaching receipts from transactions #26219

Merged
merged 44 commits into from
Oct 11, 2023

Conversation

Beamanator
Copy link
Contributor

@Beamanator Beamanator commented Aug 29, 2023

To be tested with https://github.com/Expensify/Web-Expensify/pull/39018

Details

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/295255

Tests

Currently for testing, you need this Auth PR: https://github.com/Expensify/Auth/pull/8620

  1. Make sure you're on the scanReceipts beta (or you have 'all' betas enabled)
  2. Log into Newdot, open a chat and click + -> Request Money -> Scan and upload a receipt. It should create a "smartscanning" request
  3. Open the Money Requeste and click on the receipt. The Receipt preview modal should show. Click on the ... in the upper-right corner. There should be no "Remove" option:
Screenshot 2023-09-28 at 2 57 49 PM
  1. Close the receipt preview and stop smartscanning, either by completing it in expensiworks or manually adding an amount.
  2. After that, open the receipt preview again. You should now see the remove option:
Screenshot 2023-09-28 at 2 59 00 PM
  1. Click on it. You should see a confirm modal. Click Delete:
Screenshot 2023-09-28 at 4 45 52 PM
  1. Confirm the receipt is removed from everywhere:
Screenshot 2023-09-28 at 3 00 19 PM Screenshot 2023-09-28 at 3 00 28 PM Screenshot 2023-09-28 at 3 00 38 PM
  1. Open the transaction again and click on the .... Confirm you can now add a receipt:
Screenshot 2023-09-28 at 3 01 56 PM
  1. Add it and confirm it all works correctly. Remove it again and confirm it behaves as expected
  • Verify that no errors appear in the JS console

Offline tests

Make sure we optimistically, correctly show that the receipt has been removed

QA Steps

Same as above

  • 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 / Chrome
    • iOS / native
    • iOS / 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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web Screenshot 2023-10-09 at 11 32 17 AM
Mobile Web - Chrome Screenshot 2023-10-09 at 11 43 15 AM
Mobile Web - Safari Screenshot 2023-10-09 at 11 33 45 AM
Desktop
iOS
Android

@Beamanator Beamanator self-assigned this Aug 29, 2023
@luacmartins luacmartins self-requested a review August 29, 2023 16:57
@Beamanator Beamanator changed the title Add context menu in attachment modal for receipts & allow detaching receipts from transactions [HOLD Web-E#38613] Add context menu in attachment modal for receipts & allow detaching receipts from transactions Aug 30, 2023
@Beamanator
Copy link
Contributor Author

Can't merge till web-e PR (https://github.com/Expensify/Web-Expensify/pull/38613) gets to prod, but can start testing very soon!

@Beamanator Beamanator changed the title [HOLD Web-E#38613] Add context menu in attachment modal for receipts & allow detaching receipts from transactions Add context menu in attachment modal for receipts & allow detaching receipts from transactions Sep 1, 2023
@Beamanator
Copy link
Contributor Author

Frick, we need Auth changes for this too (https://github.com/Expensify/Auth/pull/8620) - & even more web-e changes

So I'm de-prioritizing this for a week ish

@Beamanator Beamanator changed the title Add context menu in attachment modal for receipts & allow detaching receipts from transactions Allow detaching receipts from transactions Sep 20, 2023
@luacmartins
Copy link
Contributor

I think you can fix the issue by moving these modals inside this closing Modal tag

@luacmartins
Copy link
Contributor

luacmartins commented Oct 11, 2023

I pushed a commit with the fix since Alberto is ooo. @mananjadhav wanna retest and re-review? @Beamanator can you also review since the last commit is now mine?

@mananjadhav
Copy link
Collaborator

Just took the pull and testing again.

@mananjadhav
Copy link
Collaborator

@luacmartins Thanks for fixing this. I've completed the checklist. I've updated the iOS screencast and also retested on Web and Android to check if it caused any other issue. All good here.

🎀 👀 🎀 C+ reviewed.

mountiny
mountiny previously approved these changes Oct 11, 2023
@luacmartins luacmartins merged commit c952f9c into main Oct 11, 2023
15 checks passed
@luacmartins luacmartins deleted the beaman-addContextMenuForReceipts branch October 11, 2023 19:28
@OSBotify
Copy link
Contributor

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

@jasperhuangg
Copy link
Contributor

This was associated with a deploy blocker #29452, I'm going to revert it so @Beamanator can fix those issues at his own pace.

@luacmartins
Copy link
Contributor

We're not reverting this, we'll work on a fix instead

@sakluger
Copy link
Contributor

Hey everyone, I'm managing the payment GH issue for @mananjadhav's PR review and wanted to check in on what's going on.

It looks like this PR caused a deploy blocker, and now you'll be working on a fix to resolve that issue. Should I wait until that fix is complete before completing any payments?

@mananjadhav
Copy link
Collaborator

@sakluger Yes it had a regression. The fix was deployed to staging, but will wait for fix to go live before we can proceed for payment.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

platform result
🤖 android 🤖 skipped 🚫
🖥 desktop 🖥 skipped 🚫
🍎 iOS 🍎 skipped 🚫
🕸 web 🕸 skipped 🚫

2 similar comments
@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

platform result
🤖 android 🤖 skipped 🚫
🖥 desktop 🖥 skipped 🚫
🍎 iOS 🍎 skipped 🚫
🕸 web 🕸 skipped 🚫

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

platform result
🤖 android 🤖 skipped 🚫
🖥 desktop 🖥 skipped 🚫
🍎 iOS 🍎 skipped 🚫
🕸 web 🕸 skipped 🚫

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

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

@Gonals
Copy link
Contributor

Gonals commented Oct 16, 2023

I pushed a commit with the fix since Alberto is ooo. @mananjadhav wanna retest and re-review? @Beamanator can you also review since the last commit is now mine?

Thanks!

@sakluger
Copy link
Contributor

@mananjadhav thanks for clarifying! Looks like it was deployed to staging on Friday, I can set a payment date now.

title={translate('receipt.deleteReceipt')}
isVisible={isDeleteReceiptConfirmModalVisible}
onConfirm={deleteAndCloseModal}
onCancel={closeConfirmModal}
Copy link
Contributor

Choose a reason for hiding this comment

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

fyi, if there are 2 Modals in a screen, we have to handle onClose callback on each Modal properly #31256 (comment). Otherwise, it will cause an issue here #30045

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants