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

IOU - RBR is present in LHN with transaction thread #40460

Merged
merged 14 commits into from
Jun 3, 2024

Conversation

kaushiktd
Copy link
Contributor

@kaushiktd kaushiktd commented Apr 18, 2024

Details

Fixed Issues

$ #39689
PROPOSAL:#39689 (comment)

Tests

I've tested the scenarios with MacOS / Chrome / Safari / Android / IOS
Steps to follow:

Open the Expensify application in your device and follow below steps:

  1. Open the App
  2. Login with User A and request money from User B.
  3. User A go offline.
  4. User B pay the request.
  5. User A delete the request while offline.
  6. User A go online.
  7. User A go to transaction thread (one report view).
  8. The error "Unexpected error deleting the money request, please try again later" should be present in one transaction report view.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Open the Expensify application in your device and follow below steps:

  1. Open the App
  2. Login with User A and request money from User B.
  3. User A go offline.
  4. User B pay the request.
  5. User A delete the request while offline.
  6. User A go online.
  7. User A go to transaction thread (one report view).
  8. The error "Unexpected error deleting the money request, please try again later" should be present in one transaction report view.
  • 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
android.mp4
Android: mWeb Chrome
android-chrome.mp4
iOS: Native
ios.mp4
iOS: mWeb Safari
MacOS: Chrome / Safari
web.mp4
MacOS: Desktop
desktop.mp4

@kaushiktd kaushiktd requested a review from a team as a code owner April 18, 2024 14:40
@melvin-bot melvin-bot bot requested review from abdulrahuman5196 and removed request for a team April 18, 2024 14:40
Copy link

melvin-bot bot commented Apr 18, 2024

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

@kaushiktd
Copy link
Contributor Author

@abdulrahuman5196 PR ready. Can you please review the PR? 🙂

@abdulrahuman5196
Copy link
Contributor

Hi, Sorry for delay. Will work on review.

@kaushiktd
Copy link
Contributor Author

Hi, Sorry for delay. Will work on review.

Any update here, @abdulrahuman5196?

@abdulrahuman5196
Copy link
Contributor

abdulrahuman5196 commented Apr 26, 2024

Working now. Will close out today or reassign if not.

@kaushiktd
Copy link
Contributor Author

Thank you.

@abdulrahuman5196
Copy link
Contributor

Checking now

@kaushiktd
Copy link
Contributor Author

kaushiktd commented Apr 30, 2024

@abdulrahuman5196 I have resolved all the regressions as mentioned above. Please check the PR.

@kaushiktd kaushiktd reopened this Apr 30, 2024
@abdulrahuman5196
Copy link
Contributor

Checking now

@kaushiktd
Copy link
Contributor Author

Checking now

Any update here, sir? @abdulrahuman5196

@kaushiktd
Copy link
Contributor Author

Any update here, @abdulrahuman5196 ?

@abdulrahuman5196
Copy link
Contributor

@kaushiktd The change is not working

Screen.Recording.2024-05-13.at.7.52.57.PM.mov

Copy link
Contributor

github-actions bot commented May 14, 2024

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

@abdulrahuman5196
Copy link
Contributor

checking now

@abdulrahuman5196
Copy link
Contributor

I tested in web and the changes are looking good. Working on all platform testing

@abdulrahuman5196
Copy link
Contributor

I have a doubt, isn't the error message supposed to come below the bill image? @madmax330 @alexpensify
Or is my expectation wrong?

Screenshot 2024-05-28 at 4 57 16 PM
Screen.Recording.2024-05-28.at.4.50.02.PM.mov

cc: @kaushiktd

@kaushiktd
Copy link
Contributor Author

I have a doubt, isn't the error message supposed to come below the bill image? @madmax330 @alexpensify Or is my expectation wrong?

Screenshot 2024-05-28 at 4 57 16 PM Screen.Recording.2024-05-28.at.4.50.02.PM.mov cc: @kaushiktd

@abdulrahuman5196 Errors are showing with the OfflineWithFeedback component, and this component is displaying errors below the content. You can check here.

@abdulrahuman5196
Copy link
Contributor

@abdulrahuman5196 Errors are showing with the OfflineWithFeedback component, and this component is displaying errors below the content. You can check here.

@kaushiktd but in this pr the error message is shown above the bill image content which would be wrong then?

@kaushiktd
Copy link
Contributor Author

kaushiktd commented May 28, 2024

If we need to display error below the image, I need to modify offlinewithfeedback component, and it will take effect on other pages as well. Also, it will be a completely different task from the original issue.

In component everything is being shown as children component, and image can not be separated in it. @abdulrahuman5196

https://github.com/Expensify/App/blob/main/src/components/OfflineWithFeedback.tsx#L146

@abdulrahuman5196
Copy link
Contributor

Ok anyways, I will let @madmax330 / @alexpensify respond to this #40460 (comment) to see if we need to change the order of showing the error. Or is the above fine.

@kaushiktd
Copy link
Contributor Author

kaushiktd commented May 29, 2024

@abdulrahuman5196 I have been assigned another issue and I need to make PR for that issue as well but this is not merged yet so how can I create new PR without affecting this? I am not able to see fork option because this one is still in progress.
@madmax330 @alexpensify

@kaushiktd
Copy link
Contributor Author

Friendly bump on this @madmax330 @alexpensify

@madmax330
Copy link
Contributor

madmax330 commented May 31, 2024

@abdulrahuman5196 @kaushiktd the error should not be above the receipt, but if that was not introduced in this PR let's create a separate GH for it.

Otherwise let's fix it

@kaushiktd
Copy link
Contributor Author

@madmax330 I believe it should be addressed separately since that will be a different issue than this one.

@madmax330
Copy link
Contributor

@kaushiktd was this already this way or did this PR introduce it?

@kaushiktd
Copy link
Contributor Author

@kaushiktd was this already this way or did this PR introduce it?

It was this way already. @madmax330

@madmax330
Copy link
Contributor

Ok then no need to hold this PR on it, we can make a separate issue for it 👍🏽

@abdulrahuman5196
Copy link
Contributor

abdulrahuman5196 commented May 31, 2024

@kaushiktd Android chrome and iOS safari videos are not present in the author's checklist. And the videos are old and doesn't reflect the multiple changes made. Kindly re-add the videos.

@abdulrahuman5196
Copy link
Contributor

abdulrahuman5196 commented May 31, 2024

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 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.
  • 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.2024-06-01.at.12.21.21.AM.mp4
Android: mWeb Chrome
Screen.Recording.2024-06-01.at.12.30.21.AM.mp4
iOS: Native
Screen.Recording.2024-06-01.at.12.08.20.AM.mp4
iOS: mWeb Safari
Screen.Recording.2024-06-01.at.12.15.16.AM.mp4
MacOS: Chrome / Safari
Screen.Recording.2024-05-31.at.9.37.24.PM.mp4
MacOS: Desktop
Screen.Recording.2024-05-31.at.11.16.04.PM.mp4

Copy link
Contributor

@abdulrahuman5196 abdulrahuman5196 left a comment

Choose a reason for hiding this comment

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

Changes looks good and works well. Reviewers checklist is also complete.

All yours. @madmax330

🎀 👀 🎀
C+ Reviewed

@melvin-bot melvin-bot bot requested a review from madmax330 May 31, 2024 19:04
@madmax330 madmax330 merged commit ca2d4b5 into Expensify:main Jun 3, 2024
18 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Jun 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.

@kaushiktd
Copy link
Contributor Author

@abdulrahuman5196 @madmax330 can you please manually send me upwork invite? I have not received it yet.

@abdulrahuman5196
Copy link
Contributor

@kaushiktd no worries BZ member will take during the payment time.

@kbecciv
Copy link

kbecciv commented Jun 5, 2024

This PR is failing because of issue #39689

The issue is reproducible in: Web

bandicam.2024-06-05.00-39-01-680.mp4

@kaushiktd
Copy link
Contributor Author

I've checked our PR code using the steps mentioned in the PR request. It is working properly as expected on both the development and staging servers.

https://www.loom.com/share/d676aa1541744001af10cee0bb4aef1d?sid=893bf215-5647-4516-b5e4-6ac955352ffe

@OSBotify
Copy link
Contributor

OSBotify commented Jun 6, 2024

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.79-11 🚀

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

@kaushiktd
Copy link
Contributor Author

@abdulrahuman5196 @madmax330 Ammm, have not received any manual invitation on my Upwork yet. Can you help here please?

@alexpensify
Copy link
Contributor

I'll reply to your question in the original GH.

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.

6 participants