fix: [P2P Distance] Split - Participants amount displayed 0.00 briefly on confirmation screen.#47370
Conversation
…y on confirmation screen. Signed-off-by: krishna2323 <belivethatkg@gmail.com>
|
@parasharrajat 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] |
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
|
@parasharrajat, while testing, I found a bug that is not related to our issue. Should we handle it in this PR, or is it better to open a new issue to avoid regressions? BUG: When we start split a distance request with multiple participants and go back and change the participant to a policy, an error message is shown. STEPS:
Monosnap.screencast.2024-08-18.16-15-06.mp4 |
|
@Krishna2323 Is this issue happening on staging? |
Yes, I can reproduce on latest main without any changes. |
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
|
I see. So let's not solve it here. |
|
We can discuss this on the issue and ask to create a new PR for this. |
|
@parasharrajat, do we need to update anything here? |
|
@parasharrajat, friendly bump. |
|
@Krishna2323 I am currently in a priority task. I will take a look as soon as possible. |
|
@Krishna2323 Thanks for waiting. my availability was low last week. I will for sure review this tomorrow. |
|
@Krishna2323 Could you please merge main? |
|
Merged main. |
|
@parasharrajat bump. |
| // Sets `amount` and `split` share data before moving to the next step to avoid briefly showing `0.00` as the split share for participants | ||
| const setDistanceRequestData = useCallback( | ||
| (isPolicyExpenseChat: boolean) => { | ||
| // Get policy report based on transaction participants | ||
| const policyReport = transaction?.participants?.[0] ? ReportUtils.getReport(selectedReportID.current) : report; | ||
|
|
||
| const policyID = IOU.getIOURequestPolicyID(transaction, policyReport); | ||
| const policy = PolicyUtils.getPolicy(report?.policyID ?? policyID); | ||
| const policyCurrency = policy?.outputCurrency ?? PolicyUtils.getPersonalPolicy()?.outputCurrency ?? CONST.CURRENCY.USD; | ||
|
|
||
| const customUnitRateID = TransactionUtils.getRateID(transaction) ?? '-1'; | ||
| const mileageRates = DistanceRequestUtils.getMileageRates(policy); | ||
| const defaultMileageRate = DistanceRequestUtils.getDefaultMileageRate(policy); | ||
| const mileageRate: MileageRate = TransactionUtils.isCustomUnitRateIDForP2P(transaction) | ||
| ? DistanceRequestUtils.getRateForP2P(policyCurrency) | ||
| : mileageRates?.[customUnitRateID] ?? defaultMileageRate; | ||
|
|
||
| const {unit, rate} = mileageRate ?? {}; | ||
| const distance = TransactionUtils.getDistanceInMeters(transaction, unit); | ||
| const currency = mileageRate?.currency ?? policyCurrency; | ||
| const amount = DistanceRequestUtils.getDistanceRequestAmount(distance, unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES, rate ?? 0); | ||
| IOU.setMoneyRequestAmount(transactionID, amount, currency); | ||
|
|
||
| const participantAccountIDs: number[] | undefined = transaction?.participants?.map((participant) => participant.accountID ?? -1); | ||
| if (isSplitRequest && amount && currency && !isPolicyExpenseChat) { | ||
| IOU.setSplitShares(transaction, amount, currency ?? '', participantAccountIDs ?? []); | ||
| } | ||
| }, | ||
| [report, transaction, transactionID, isSplitRequest], | ||
| ); |
There was a problem hiding this comment.
Don't we have to remove the similar logic from IOURequestStepConfirmation page after we added it here?
There was a problem hiding this comment.
@parasharrajat, yeah you are right. I was looking at the wrong code and thought that it should be there to avoid regressions but we have a similar logic which only runs once when the IOURequestStepConfirmation mounts.
I have removed the code on IOURequestStepConfirmation page, please check and let me know. Thanks
|
done. |
|
@parasharrajat, any updates? |
|
@parasharrajat, friendly bump. |
|
@parasharrajat, can you please review this? |
|
@Krishna2323 I will have it completed tested by tomorrow. |
parasharrajat
left a comment
There was a problem hiding this comment.
Please fix lint issues. merge main.
| const policyID2 = IOU.getIOURequestPolicyID(transaction, policyReport); | ||
| const policy2 = PolicyUtils.getPolicy(report?.policyID ?? policyID2); |
There was a problem hiding this comment.
what is policy2? Please rename it.
|
@Krishna2323 I was checking and I am not able to reproduce the problem on main. Are you? can you please share a vid of same? |
|
|
Oh, I see. But it does not cause a real user problem. let me discuss this on the issue. |
parasharrajat
left a comment
There was a problem hiding this comment.
- Lint issues.
- Update Tests.
|
Please let me know when done. |
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
|
@parasharrajat, test steps and lint issues are fixed. |
Screenshots🔲 iOS / native16.10.2024_03.21.58_REC.mp4🔲 iOS / Safari16.10.2024_03.22.56_REC.mp4🔲 MacOS / Desktop16.10.2024_03.30.26_REC.mp4🔲 MacOS / Chrome16.10.2024_03.00.07_REC.mp4🔲 Android / Chrome16.10.2024_03.29.33_REC.mp4🔲 Android / native16.10.2024_03.20.55_REC.mp4 |
|
@Krishna2323 Your Offline tests are not correct. We don't see any amount while offline on the confirm page. Please fix that. |
|
I noticed that I wasn't able to create Split request while offline same as Staging. |
parasharrajat
left a comment
There was a problem hiding this comment.
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 Issuessection 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
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - 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 verified the steps for local testing are in the
- 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.
toggleReportand notonIconClick). - 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 Copylabel 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
- 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.
- 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 usingAvatarhave 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
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - 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
Avataris modified, I verified thatAvataris 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
Designlabel so the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/jasperhuangg in version: 9.0.50-0 🚀
|
|
🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.50-8 🚀
|
|
I've created an un-revert PR that was CP'ed to staging. |
Details
Fixed Issues
$ #47100
PROPOSAL: #47100 (comment)
Tests
Offline tests
QA Steps
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)myBool && <MyComponent />.src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
android_native.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: Native
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome.mp4
MacOS: Desktop
desktop_app.mp4