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

Subscribe transactions in report preview #32469

Merged
merged 18 commits into from
Dec 22, 2023

Conversation

dukenv0307
Copy link
Contributor

@dukenv0307 dukenv0307 commented Dec 5, 2023

Details

Subscribe transactions from Onyx in report preview by using onyxSubscribe

Fixed Issues

$ #32256
PROPOSAL: #32256 (comment)

Tests

  1. Create a scan request with an invalid receipt image
  2. Go to the transaction thread report of this scan request
  3. Change the amount of the request
  4. Verify that after changing amount the error appears
  5. Go back to the chat report which contains the report preview of this request above
  6. Verify that the red dot appears
  7. Click on report preview to open IOU report and click on IOU preview to go to transaction thread report
  8. Change the merchant of the request
  9. Click on back button to go back to the IOU report and click on the back button again to back to the chat report
  10. Verify that the red dot in report preview disappears
  • Verify that no errors appear in the JS console

Offline tests

Pre-condition: Do the step 1-4 in online mode
Do the step 5 - 10 same as above

QA Steps

  1. Create a scan request with an invalid receipt image
  2. Go to the transaction thread report of this scan request
  3. Change the amount of the request
  4. Verify that after changing amount the error appears
  5. Go back to the chat report which contains the report preview of this request above
  6. Verify that the red dot appears
  7. Click on report preview to open IOU report and click on IOU preview to go to transaction thread report
  8. Change the merchant of the request
  9. Click on back button to go back to the IOU report and click on the back button again to back to the chat report
  10. Verify that the red dot in report preview disappears
  • 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.2023-12-05.at.13.03.38.mov
Android: mWeb Chrome
Screen.Recording.2023-12-05.at.12.40.07.mov
iOS: Native
Screen.Recording.2023-12-05.at.12.44.53.mov
iOS: mWeb Safari
Screen.Recording.2023-12-05.at.12.24.48.mov
MacOS: Chrome / Safari
Screen.Recording.2023-12-05.at.12.16.25.mov
MacOS: Desktop
Screen.Recording.2023-12-05.at.13.08.33.mov

@dukenv0307 dukenv0307 marked this pull request as ready for review December 5, 2023 06:09
@dukenv0307 dukenv0307 requested a review from a team as a code owner December 5, 2023 06:09
@melvin-bot melvin-bot bot requested review from hoangzinh and removed request for a team December 5, 2023 06:09
Copy link

melvin-bot bot commented Dec 5, 2023

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

const unsubscribeOnyxTransaction = onyxSubscribe({
key: ONYXKEYS.COLLECTION.TRANSACTION,
waitForCollectionCallback: true,
callback: (transactionAgrs) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why don't we just call ReportUtils.hasMissingSmartscanFields to update hasErrors state when there is a change from ONYXKEYS.COLLECTION.TRANSACTION? Therefore, each ReportPreview component doesn't need to carry all transaction data.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@hoangzinh How can we not carry all transaction data? Because ReportPreview has many transactions.

Copy link
Contributor

Choose a reason for hiding this comment

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

Our purpose of subscribe to Onyx change is if there is any update related to ONYXKEYS.COLLECTION.TRANSACTION we will check again ReportUtils.hasMissingSmartscanFields, won't we? So I have an idea something like this:

const [isError, setIsError] = useState(false);

const hasErrors = hasReceipts && isError;

useEffect(() => {
  onyxSubscribe({
     key: ONYXKEYS.COLLECTION.TRANSACTION,
     ....
     callback: () => {
          setIsError(ReportUtils.hasMissingSmartscanFields(props.iouReportID));
     }
  }
})

Therefore, we don't need to load all transactions for each ReportPreview component. What do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Therefore, we don't need to load all transactions for each ReportPreview component. What do you think?

I know that but I can't find a way to only subscribe the necessary transaction

Copy link
Contributor

Choose a reason for hiding this comment

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

we don't really need @dukenv0307. We subscribe to all keys change ONYXKEYS.COLLECTION.TRANSACTION.

Copy link
Contributor Author

@dukenv0307 dukenv0307 Dec 8, 2023

Choose a reason for hiding this comment

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

@hoangzinh Actually hasOnlyDistanceRequestTransactions, areAllRequestsBeingSmartScannedand hasMissingSmartscanFields functions are getting all transactions of ReportPreview in these functions, so when we subscribe transactions in ReportPreview, we can get all transactions with iouReportID and pass this to these function. That can make sure other functions will not have the same bug and we don't need to getAllReportTransactions again in these functions if we already pass transactions param.

Copy link
Contributor

Choose a reason for hiding this comment

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

looks better than previous one. Btw, have you tested all the places that are using modified methods in this PR? We have some regression bugs recently because missing params or incorrect params

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@hoangzinh I added default value for transactions param so other places which use this function will call getAllTransaction function to get data.

Copy link
Contributor

Choose a reason for hiding this comment

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

if we go this way, why don't we do something like my suggestion here? https://github.com/Expensify/App/pull/32469/files#r1417094685 (both your current implementation and this suggestion are based on the assumption that transactions in TransactionUtils.getAllReportTransactions is up-to-date

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@hoangzinh Updated.

return;
}

const allTransaction = _.filter(transactionAgrs, (transaction) => `${transaction.reportID}` === `${props.iouReportID}`);
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm thinking that is there any way that we can use share logic with the existing function here

function getAllReportTransactions(reportID?: string): Transaction[] {
// `reportID` from the `/CreateDistanceRequest` endpoint return's number instead of string for created `transaction`.
// For reference, https://github.com/Expensify/App/pull/26536#issuecomment-1703573277.
// We will update this in a follow-up Issue. According to this comment: https://github.com/Expensify/App/pull/26536#issuecomment-1703591019.
const transactions: Transaction[] = Object.values(allTransactions ?? {}).filter((transaction): transaction is Transaction => transaction !== null);
return transactions.filter((transaction) => `${transaction.reportID}` === `${reportID}`);
}

It covers the null case of transaction and centralizes the logic.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@hoangzinh Updated.

return;
}

const allTransactions = TransactionUtils.getAllReportTransactions(props.iouReportID);
Copy link
Contributor

Choose a reason for hiding this comment

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

What if the transactions cached in TransactionUtils is not updated yet? I think we will get outdated transaction data.

Copy link
Contributor Author

@dukenv0307 dukenv0307 Dec 13, 2023

Choose a reason for hiding this comment

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

@hoangzinh When we subscribe transactions here, the transactions in TransactionUtils will not be outdated.

Copy link
Contributor

Choose a reason for hiding this comment

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

Both component and util TransactionUtils are subscribed to transactions, we can't control which place is updated first or same time. How can you ensure "the transactions in TransactionUtils will not be outdated."?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@hoangzinh You can try to only subscribe transactions from Onyx in ReportPreview and do nothing. You can see that the issue is resolved.

@@ -938,8 +938,8 @@ function hasSingleParticipant(report: OnyxEntry<Report>): boolean {
*
*/
function hasOnlyDistanceRequestTransactions(iouReportID: string | undefined): boolean {
const transactions = TransactionUtils.getAllReportTransactions(iouReportID);
return transactions.every((transaction) => TransactionUtils.isDistanceRequest(transaction));
const allTransactionsOfPreview = TransactionUtils.getAllReportTransactions(iouReportID);
Copy link
Contributor

Choose a reason for hiding this comment

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

should we revert those changes @dukenv0307 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@hoangzinh Yes, reverted.

@hoangzinh
Copy link
Contributor

hoangzinh commented Dec 20, 2023

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 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 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 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.2023-12-20.at.23.06.51.android.mp4
Android: mWeb Chrome
Screen.Recording.2023-12-20.at.22.56.03.android.chrome.mov
iOS: Native
Screen.Recording.2023-12-20.at.22.58.53.-.ios.mp4
iOS: mWeb Safari
Screen.Recording.2023-12-20.at.22.58.01.-.ios.safari.mov
MacOS: Chrome / Safari
Screen.Recording.2023-12-20.at.22.45.35.-.web.mov
MacOS: Desktop
Screen.Recording.2023-12-20.at.22.49.32.-.desktop.mov

key: ONYXKEYS.COLLECTION.TRANSACTION,
waitForCollectionCallback: true,
callback: (transactionAgrs) => {
if (_.isEmpty(transactionAgrs)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

What is transactionAgrs? Can we use a more descriptive name here?

Copy link
Contributor

Choose a reason for hiding this comment

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

Let's also add a comment explaining why this can be empty

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What is transactionAgrs? Can we use a more descriptive name here?

Updated.

Let's also add a comment explaining why this can be empty

Not sure why but in other places which use onyxSubscribe also have this check and I tried to remove this check, it makes perf fail as the ReportScreen re-render many times

Screenshot 2023-12-21 at 12 36 32

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.16-5 🚀

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
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants