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

Add support for MERGED_WITH_CASH_TRANSACTION system message #41477

Merged
merged 7 commits into from
May 3, 2024

Conversation

yuwenmemon
Copy link
Contributor

@yuwenmemon yuwenmemon commented May 2, 2024

cc @arosiclair

HOLD ON https://github.com/Expensify/Auth/pull/10726

Details

Screenshot 2024-05-01 at 9 12 21 PM

Add support for the MERGED_WITH_CASH_TRANSACTION system message in NewDot.

Fixed Issues

$ #39540

Tests

  1. Follow the steps in this SO to create a merged transaction with SmartScan / Card Import
  2. Ensure that once the card is scraped, and the transaction is merged, a comment appears on the transaction thread of the report indicating that it had been matched with a card transaction:
    Screenshot 2024-05-01 at 9 12 21 PM

Offline tests

  • None

QA Steps


  1. Add a personal card to start importing transactions into Expensify if you have not done so already. (https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Personal-Credit-Cards#:~:text=Log%20into%20your%20Expensify%20account,bank%20from%20the%20list%20provided.)
  2. Have a policy that is workspace chat enabled.
  3. SmartScan a receipt for a purchase made with that same personal credit card. Make sure you do this before running an import of your personal card. Add that smartscanned expense to your workspace chat enabled policy via a report.
  4. Once the receipt is smartscanned, you should see it has the 7-day hold violation ("pending match with card transaction")
  5. Run an import of transactions from your card. You may have to wait several days for the transaction to post.
  6. Once the transaction is imported, make sure a report action shows on the transaction thread of the expense showing that it was matched with a card transaction:
    Screenshot 2024-05-01 at 9 12 21 PM

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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@yuwenmemon yuwenmemon added the InternalQA This pull request required internal QA label May 2, 2024
@yuwenmemon yuwenmemon requested a review from a team as a code owner May 2, 2024 04:14
@melvin-bot melvin-bot bot requested review from shubham1206agra and removed request for a team May 2, 2024 04:14
Copy link

melvin-bot bot commented May 2, 2024

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

@yuwenmemon yuwenmemon self-assigned this May 2, 2024
@yuwenmemon yuwenmemon changed the title [HOLD Auth#10726] Add support for MERGED_WITH_CASH_TRANSACTION system message Add support for MERGED_WITH_CASH_TRANSACTION system message May 3, 2024
@yuwenmemon
Copy link
Contributor Author

Removing HOLD! @shubham1206agra can you please review?

@shubham1206agra
Copy link
Contributor

@yuwenmemon Can you post the test steps to review this?

@yuwenmemon
Copy link
Contributor Author

@shubham1206agra Actually, because the test steps involve creating a personal card charge for a credit card connected to one's Expensify account, I'm going to get the review of someone internal who can do this in their dev environment more easily.

@yuwenmemon yuwenmemon requested review from francoisl and removed request for shubham1206agra May 3, 2024 18:39
src/CONST.ts Show resolved Hide resolved
src/languages/es.ts Outdated Show resolved Hide resolved
Co-authored-by: Francois Laithier <[email protected]>
@yuwenmemon
Copy link
Contributor Author

Updated!

@@ -311,6 +311,11 @@ type OriginalMessageMoved = {
};
};

type OriginalMessageMergedWithCashTranasction = {
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo in "transaction"

@yuwenmemon
Copy link
Contributor Author

Updated!

@francoisl francoisl merged commit 2f5173c into main May 3, 2024
14 of 15 checks passed
@francoisl francoisl deleted the yuwen-mergedWithCash branch May 3, 2024 21:56
@francoisl
Copy link
Contributor

Oh woah, the merge button was green and I didn't even realize I hadn't added the reviewer steps yet.

@OSBotify
Copy link
Contributor

OSBotify commented May 3, 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.

@yuwenmemon
Copy link
Contributor Author

Receipt is taking forever to scan:
Screenshot 2024-05-07 at 1 58 48 PM

@yuwenmemon
Copy link
Contributor Author

Nice this worked:
Screenshot 2024-05-07 at 4 24 35 PM

@OSBotify
Copy link
Contributor

OSBotify commented May 9, 2024

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.71-6 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
InternalQA This pull request required internal QA
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants