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

fix: track-merchant field is shown instead of distance and rate field #54273

Rate limit · GitHub

Whoa there!

You have triggered an abuse detection mechanism.

Please wait a few minutes before you try again;
in some cases this may take up to an hour.

Conversation

linhvovan29546
Copy link
Contributor

@linhvovan29546 linhvovan29546 commented Dec 18, 2024

Explanation of Change

Fixed Issues

$ #53712
PROPOSAL: #53712 (comment)

Tests

Same as QA Steps

  • Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

  1. Go to self DM
  2. Track a distance expense
  3. Go to Troubleshoot > Clear cache and restart > Reset and refresh
  4. Go to self DM
  5. Click Categorize it (click Upgrade if there is no workspace)
  6. Select category and submit the expense to the workspace
  7. Go to transaction thread in the workspace chat
  8. Verify the expense is a distance expense, there will be Distance and Rate field

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 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 used JaimeGPT to get English > Spanish translation. I then posted it 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.ts 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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
OneCameraFinalVideo.mp4
Android: mWeb Chrome
Android-mweb.mp4
iOS: Native
Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-12-18.at.10.16.00.mp4
iOS: mWeb Safari
Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-12-18.at.10.11.36.mp4
MacOS: Chrome / Safari
Screen.Recording.2024-12-18.at.9.07.45.AM.mp4
MacOS: Desktop
Screen.Recording.2024-12-18.at.10.04.19.AM.mp4
Rate limit · GitHub

Whoa there!

You have triggered an abuse detection mechanism.

Please wait a few minutes before you try again;
in some cases this may take up to an hour.

Copy link
Contributor

github-actions bot commented Dec 18, 2024

All contributors have signed the CLA ✍️ ✅
Posted by the CLA Assistant Lite bot.

@linhvovan29546
Copy link
Contributor Author

I have read the CLA Document and I hereby sign the CLA

CLABotify added a commit to Expensify/CLA that referenced this pull request Dec 18, 2024
@linhvovan29546 linhvovan29546 marked this pull request as ready for review December 18, 2024 04:09
@linhvovan29546 linhvovan29546 requested a review from a team as a code owner December 18, 2024 04:09
@melvin-bot melvin-bot bot requested review from mananjadhav and removed request for a team December 18, 2024 04:09
Copy link

melvin-bot bot commented Dec 18, 2024

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

@linhvovan29546
Copy link
Contributor Author

linhvovan29546 commented Dec 18, 2024

App/src/libs/actions/IOU.ts

Lines 2276 to 2278 in fae8b36

// STEP 3: Build an optimistic transaction with the receipt
const isDistanceRequest = existingTransaction && existingTransaction.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
let optimisticTransaction = TransactionUtils.buildOptimisticTransaction(

App/src/libs/actions/IOU.ts

Lines 4226 to 4228 in fae8b36

const existingTransaction = allTransactionDrafts[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`];
const isDistanceRequest = existingTransaction && existingTransaction.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
let splitTransaction = TransactionUtils.buildOptimisticTransaction(

I noticed we have used this condition elsewhere. I'm checking if it leads to a similar issue.

@linhvovan29546
Copy link
Contributor Author

App/src/libs/actions/IOU.ts

Lines 2276 to 2278 in fae8b36

// STEP 3: Build an optimistic transaction with the receipt
const isDistanceRequest = existingTransaction && existingTransaction.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
let optimisticTransaction = TransactionUtils.buildOptimisticTransaction(

App/src/libs/actions/IOU.ts

Lines 4226 to 4228 in fae8b36

const existingTransaction = allTransactionDrafts[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`];
const isDistanceRequest = existingTransaction && existingTransaction.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
let splitTransaction = TransactionUtils.buildOptimisticTransaction(

I noticed we have used this condition elsewhere. I'm checking if it leads to a similar issue.

Checked, it doesn't have similar issues.

@mananjadhav
Copy link
Collaborator

@linhvovan29546 Is it possible to add a test for the same?

@linhvovan29546
Copy link
Contributor Author

linhvovan29546 commented Dec 19, 2024

@linhvovan29546 Is it possible to add a test for the same?

I tested some possible cases, and i don't see issue similar, maybe I missed something

@linhvovan29546
Copy link
Contributor Author

I've noticed 2 other bugs similar to this one (this is not related to the change in this PR, but I think it also exists in production), which seem to stem from the BE after track expenses for a user who is not in a chat:

  1. When calling the searchForReport API, the onyxData is returned without the login field.
  2. If we continue submitting the track, we receive another error: 'Report no longer exists.'
Screen.Recording.2024-12-19.at.10.55.22.PM.2.mp4

@linhvovan29546
Copy link
Contributor Author

@linhvovan29546 Is it possible to add a test for the same?

Do you mean automated test?

@linhvovan29546
Copy link
Contributor Author

Hi @mananjadhav Please help review when you have a chance. I've also left a comment here

@mananjadhav
Copy link
Collaborator

Going to review this by tomorrow.

@mananjadhav
Copy link
Collaborator

Just got back to reviewing tis and asked a question here

@linhvovan29546
Copy link
Contributor Author

Replied

@mananjadhav
Copy link
Collaborator

@linhvovan29546 Can you please sync with the latest main and resolve conflicts?

@mananjadhav
Copy link
Collaborator

@linhvovan29546 For the test steps it is okay to copy from the reproduction steps, but I think we should highlight the expected behavior in this scenario. Also if there's any precondition for the account, example if it should be a new account, etc.

@linhvovan29546 linhvovan29546 force-pushed the fix/53721-show-merchant-instead-of-distance-rate branch from 14492c1 to e5108a1 Compare January 1, 2025 11:24
@linhvovan29546
Copy link
Contributor Author

@linhvovan29546 Can you please sync with the latest main and resolve conflicts?

Sorry for this mistake, I will reopen it again.

@linhvovan29546 linhvovan29546 reopened this Jan 1, 2025
@linhvovan29546
Copy link
Contributor Author

@mananjadhav Resolved conflicts.

For the test steps it is okay to copy from the reproduction steps, but I think we should highlight the expected behavior in this scenario. Also if there's any precondition for the account, example if it should be a new account, etc.

It doesn't require any precondition account. I just updated some comments in the test. Could you please review it again? Thank you.

@mananjadhav
Copy link
Collaborator

I don't see the expected behavior in the tests. Can you please add that?

  1. Go to self DM
  2. Track a distance expense
  3. Go to Troubleshoot > Clear cache and restart > Reset and refresh
  4. Go to self DM
  5. Click Categorize it (click Upgrade if there is no workspace)
  6. Select category and submit the expense to the workspace
  7. Go to transaction thread in the workspace chat

@mananjadhav
Copy link
Collaborator

mananjadhav commented Jan 1, 2025

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 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.ts 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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • 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
android-distance-request-field.mov
Android: mWeb Chrome
mweb-chrome-distance-requerst-field.mov
iOS: Native
ios-distance-request-field.mov
iOS: mWeb Safari
mweb-safari-distance-request-field.mov
MacOS: Chrome / Safari
web-distance-request-field.mov
MacOS: Desktop
desktop-distance-request-field.mov
Rate limit · GitHub

Access has been restricted

You have triggered a rate limit.

Please wait a few minutes before you try again;
in some cases this may take up to an hour.

@melvin-bot melvin-bot bot requested a review from Julesssss January 1, 2025 20:25
@Julesssss Julesssss merged commit 3e13343 into Expensify:main Jan 2, 2025
18 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Jan 2, 2025

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

Copy link
Contributor

github-actions bot commented Jan 6, 2025

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.0.81-0 🚀

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

Copy link
Contributor

github-actions bot commented Jan 8, 2025

🚀 Deployed to production by https://github.com/puneetlath in version: 9.0.81-6 🚀

platform result
🤖 android 🤖 true ❌
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅
🤖🔄 android HybridApp 🤖🔄 failure ❌
🍎🔄 iOS HybridApp 🍎🔄 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.

Rate limit · GitHub

Whoa there!

You have triggered an abuse detection mechanism.

Please wait a few minutes before you try again;
in some cases this may take up to an hour.

4 participants