Reusable function instead of repetitive statements #22649

cristipaval · 2023-07-11T16:42:03Z

Follow-up PR after this GH conversation. cc @luacmartins

Fixed Issues

No issue, this is a follow-up PR

Tests

Have userA as an admin of the workspaceA
Have userB as a member of the workspaceA
userB is offline and requests money in the DM chat with userA. The report preview should be optimistically created in the chat
userB is offline and requests money in the workspace chat. The report preview should be optimistically created in the chat
userB is now online. userA can see all transactions from above in their account
userA is offline and pays the money request from the DM chat with userB. The report preview should be optimistically updated in the chat
userA is offline and pays the money request from the workspace chat with userB. The report preview should be optimistically updated in the chat

Verify that no errors appear in the JS console

Offline tests

Included in the steps above

QA Steps

Same as tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Money request

web.-.request.moeny.mov

Pay money request

web.-.pay.mov

Mobile Web - Chrome

Money request

chrome.mobile.-.money.request.mov

Pay money request

chrome.mobile.-.pay.mov

Mobile Web - Safari

Money request

safari.mobile.-.money.request.mov

Pay money request

safari.mobile.-.pay.mov

Desktop

Money request

desktop.-.money.request.mov

Pay money request

desktop.-.pay.mov

iOS

Money request

ios.native.-.money.request.mov

Pay money request

ios.native.-.pay.mov

Android

Money request

android.native.-.money.request.mov

Pay money request

android.native.-.pay.mov

cristipaval · 2023-07-11T16:42:23Z

Screen recordings coming soon.

luacmartins · 2023-07-11T17:00:38Z

src/libs/ReportUtils.js

@@ -1585,6 +1585,22 @@ function buildOptimisticReportPreview(chatReport, iouReport) {
    };
 }

+function updateReportPreview(iouReport, reportPreviewAction) {


Missing JSDocs

Good catch! Added for both buildOptimisticReportPreview and updateReportPreview

luacmartins

LGTM but this is still a draft

…itive-statements

melvin-bot · 2023-07-25T22:57:32Z

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

luacmartins · 2023-07-25T23:08:08Z

Why didn't we assign C+ to this PR?

cristipaval · 2023-07-26T13:53:16Z

Why didn't we assign C+ to this PR?

I thought that PullerBear assigns a C+ but it assigned an internal engineer only. I think it's because there is no issue linked in the PR description body, because this is a follow-up PR.
I'll assign a C+

situchan

I can review this

situchan · 2023-07-26T14:13:38Z

src/libs/ReportUtils.js

+        message: [
+            {
+                html: message,
+                text: message,
+                isEdited: false,
+                type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
+            },
+        ],


This will re-write existing reportPreviewAction.message[0]. Is it fine? Original code just replaced html and text inside.

yes, this is fine. The original code was introduced in the previous PR where we decided to improve the code in this follow-up PR, so we are safe.

cristipaval · 2023-07-26T17:39:57Z

Thanks @situchan!

situchan · 2023-07-26T17:48:44Z

I just requested policyExpenseChat beta permission on slack for expense report test

cristipaval · 2023-07-26T18:01:59Z

I just requested policyExpenseChat beta permission on slack for expense report test

Added

situchan · 2023-07-28T11:16:49Z

I merged main into this branch locally.

Optimistic expense request page is broken

After online: (minor avatar issue in LHN, no parent navigation subtitle in report header)

I confirmed that this also happens on main so not a blocker (reported on slack)

situchan · 2023-07-28T11:42:07Z

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 / Chrome
- iOS / native
- iOS / 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(themeColors.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 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

Web

IOU request

iou.request.mov

pay IOU request

pay.iou.request.mov

expense request

expense.request.mov

pay expense request

pay.expense.request.mov

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

situchan

melvin-bot · 2023-07-28T11:58:58Z

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

melvin-bot · 2023-07-28T11:59:01Z

🎯 @situchan, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #23788.

OSBotify · 2023-07-28T12:56:37Z

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

OSBotify · 2023-07-31T18:58:44Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 1.3.48-0 🚀

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

OSBotify · 2023-08-02T00:00:00Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.48-5 🚀

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

OSBotify · 2023-08-02T01:24:33Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 1.3.49-0 🚀

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

OSBotify · 2023-08-03T18:17:00Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.3.49-3 🚀

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

Reusable function instead of repetitive statements

50fd370

cristipaval requested a review from luacmartins July 11, 2023 16:42

cristipaval self-assigned this Jul 11, 2023

luacmartins requested changes Jul 11, 2023

View reviewed changes

Add JSDocs

bfdf241

luacmartins approved these changes Jul 11, 2023

View reviewed changes

Merge remote-tracking branch 'origin/main' into cristi_refactor-repet…

9d08fc4

…itive-statements

cristipaval marked this pull request as ready for review July 25, 2023 22:57

cristipaval requested a review from a team as a code owner July 25, 2023 22:57

melvin-bot bot requested review from AndrewGable and removed request for a team July 25, 2023 22:57

cristipaval requested a review from a team July 26, 2023 13:53

situchan reviewed Jul 26, 2023

View reviewed changes

AndrewGable removed their request for review July 27, 2023 21:10

situchan approved these changes Jul 28, 2023

View reviewed changes

melvin-bot bot requested a review from AndrewGable July 28, 2023 11:58

melvin-bot bot mentioned this pull request Jul 28, 2023

Payment issue for E/App PR#22649 #23788

Closed

cristipaval merged commit 92117c5 into main Jul 28, 2023
11 of 14 checks passed

cristipaval deleted the cristi_refactor-repetitive-statements branch July 28, 2023 12:52

OSBotify mentioned this pull request Jul 31, 2023

Deploy Checklist: New Expensify 2023-07-31 #23945

Closed

48 tasks

lanitochka17 mentioned this pull request Jul 31, 2023

[HOLD for payment 2023-08-10] [HOLD for payment 2023-08-08] [$1000] IOU - Double "request money" tab if request money #23962

Closed

6 tasks

OSBotify mentioned this pull request Aug 1, 2023

Deploy Checklist: New Expensify 2023-08-01 #24028

Closed

79 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reusable function instead of repetitive statements #22649

Reusable function instead of repetitive statements #22649

cristipaval commented Jul 11, 2023 •

edited

Loading

cristipaval commented Jul 11, 2023

luacmartins Jul 11, 2023

cristipaval Jul 11, 2023

luacmartins left a comment

melvin-bot bot commented Jul 25, 2023

luacmartins commented Jul 25, 2023

cristipaval commented Jul 26, 2023

situchan left a comment

situchan Jul 26, 2023

cristipaval Jul 26, 2023

cristipaval commented Jul 26, 2023

situchan commented Jul 26, 2023

cristipaval commented Jul 26, 2023

situchan commented Jul 28, 2023 •

edited

Loading

situchan commented Jul 28, 2023

situchan left a comment

melvin-bot bot commented Jul 28, 2023

melvin-bot bot commented Jul 28, 2023

OSBotify commented Jul 28, 2023

OSBotify commented Jul 31, 2023

OSBotify commented Aug 2, 2023

OSBotify commented Aug 2, 2023

OSBotify commented Aug 3, 2023

Reusable function instead of repetitive statements #22649

Reusable function instead of repetitive statements #22649

Conversation

cristipaval commented Jul 11, 2023 • edited Loading

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

cristipaval commented Jul 11, 2023

luacmartins Jul 11, 2023

Choose a reason for hiding this comment

cristipaval Jul 11, 2023

Choose a reason for hiding this comment

luacmartins left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jul 25, 2023

luacmartins commented Jul 25, 2023

cristipaval commented Jul 26, 2023

situchan left a comment

Choose a reason for hiding this comment

situchan Jul 26, 2023

Choose a reason for hiding this comment

cristipaval Jul 26, 2023

Choose a reason for hiding this comment

cristipaval commented Jul 26, 2023

situchan commented Jul 26, 2023

cristipaval commented Jul 26, 2023

situchan commented Jul 28, 2023 • edited Loading

situchan commented Jul 28, 2023

Reviewer Checklist

Screenshots/Videos

situchan left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jul 28, 2023

melvin-bot bot commented Jul 28, 2023

OSBotify commented Jul 28, 2023

OSBotify commented Jul 31, 2023

OSBotify commented Aug 2, 2023

OSBotify commented Aug 2, 2023

OSBotify commented Aug 3, 2023

cristipaval commented Jul 11, 2023 •

edited

Loading

situchan commented Jul 28, 2023 •

edited

Loading