Fix reintroduced dependencies from conflict resolution #41152

brunovjk · 2024-04-27T18:00:21Z

Details

While resolving conflicts in: Remove MoneyTemporaryForRefactorRequestConfirmationList PR, I reintroduced dependencies that were previously removed here PR.

This issue is now again reproducible for tags. #comment

We will update the dependencies accordingly in this new PR.

Fixed Issues

$ N/A
PROPOSAL: N/A

Tests

Preconditions: Should have a collect policy with only one tag and one category and both should be required.

Go to the global FAB > Submit an Expense > Enter any amount > Proceed.
Select the collect policy that matches the preconditions.
Go to Category selection page > select a category and
Verify there is no noticeable delay before the selected category shows up.
Return to Category selection page > deselect the category and
Verify there is no noticeable delay before the selected category disappears.
Go to Tag selection page > select a tag and
Verify there is no noticeable delay before the selected tag shows up.
Return to Tag selection page > deselect the tag and
Verify there is no noticeable delay before the selected tag disappears.
Create the request and check that everything works as before.
Open the Collect policy chat report that matches the preconditions.> Click on the plus icon inside the compose box >Submit an Expense > Enter any amount > Proceed.
Go to Category selection page > select a category and
Verify there is no noticeable delay before the selected category shows up.
Return to Category selection page > deselect the category and
Verify there is no noticeable delay before the selected category disappears.
Go to Tag selection page > select a tag and
Verify there is no noticeable delay before the selected tag shows up.
Return to Tag selection page > deselect the tag and
Verify there is no noticeable delay before the selected tag disappears.

Note: There should be consistent behavior when selecting/deselecting tags and categories.

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android.-.Native.mp4

Android: mWeb Chrome

Android.-.mWeb.mp4

iOS: Native

iOS.-.Native.mp4

iOS: mWeb Safari

iOS.-.mWeb.mp4

MacOS: Chrome / Safari

MacOS.-.Chorme.mp4

MacOS: Desktop

MacOS.-.Desktop.mp4

…tion

melvin-bot · 2024-04-27T18:00:47Z

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

brunovjk · 2024-04-27T18:07:11Z

Krishna2323 identified an issue:

I think that while you were resolving conflicts, you mistakenly added back the dependencies that were removed #40176 (comment)

I believe the fix is simple, can you check it please?
Thank you and sorry for the inconvenience.

cc: @eh2077, @tgolen, @Krishna2323, @sobitneupane

brunovjk · 2024-04-27T18:07:45Z

Sorry @bondydaa, I didn't mean to assign you

eh2077 · 2024-04-28T06:47:13Z

src/components/MoneyRequestConfirmationList.tsx

@@ -520,7 +520,8 @@ function MoneyRequestConfirmationList({
        if (updatedTagsString !== TransactionUtils.getTag(transaction) && updatedTagsString) {
            IOU.setMoneyRequestTag(transactionID, updatedTagsString);
        }
-    }, [policyTagLists, transaction, transactionID, policyTags, canUseViolations]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps


I think it'll be better to document the reason why needs to have disable comments here. Yeah, I know that the original PR also didn't add the reason. Just a short reason documented will make it easier to read and maintain the code.

Great idea! Please take a look and tell me what you think.

…tion

eh2077 · 2024-04-30T15:06:24Z

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 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.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 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.
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.mov

Android: mWeb Chrome

mobile-chrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

mobile-safari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

eh2077

I can still notice delay on Android and iOS native App and I compared it with Category on production - there's also a slight delay. So I think it's expected.

Going to approve this minor case fix.

melvin-bot · 2024-04-30T15:12:53Z

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

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

OSBotify · 2024-04-30T21:07:52Z

✋ 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 · 2024-05-01T03:02:22Z

🚀 Deployed to staging by https://github.com/bondydaa in version: 1.4.69-0 🚀

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

OSBotify · 2024-05-02T13:05:57Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.69-2 🚀

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

Remove dependencies that were added by mistake during conflict resolu…

160e277

…tion

brunovjk requested a review from a team as a code owner April 27, 2024 18:00

melvin-bot bot requested review from bondydaa and removed request for a team April 27, 2024 18:00

brunovjk changed the title ~~Remove dependencies that were added by mistake during conflict resolution~~ Fix reintroduced dependencies from conflict resolution Apr 27, 2024

eh2077 reviewed Apr 28, 2024

View reviewed changes

Document exclusion of 'transaction' dependency for one-time autoselec…

9c70d9d

…tion

brunovjk requested a review from eh2077 April 28, 2024 13:02

eh2077 approved these changes Apr 30, 2024

View reviewed changes

melvin-bot bot mentioned this pull request Apr 30, 2024

Payment issue for E/App PR#41152 #41341

Closed

bondydaa approved these changes Apr 30, 2024

View reviewed changes

bondydaa merged commit 33543a6 into Expensify:main Apr 30, 2024
16 of 17 checks passed

brunovjk deleted the fix/39559 branch April 30, 2024 21:20

github-actions bot mentioned this pull request May 1, 2024

Deploy Checklist: New Expensify 2024-05-01 #41376

Closed

59 tasks

eh2077 mentioned this pull request May 5, 2024

[HOLD for payment 2024-05-02] [$250] Remove MoneyRequestConfirmationList.js and copy any changes since Nov 27 into MoneyTemporaryForRefactorRequestConfirmationList.js #39559

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix reintroduced dependencies from conflict resolution #41152

Fix reintroduced dependencies from conflict resolution #41152

brunovjk commented Apr 27, 2024 •

edited

Loading

melvin-bot bot commented Apr 27, 2024

brunovjk commented Apr 27, 2024

brunovjk commented Apr 27, 2024

eh2077 Apr 28, 2024

brunovjk Apr 28, 2024 •

edited

Loading

eh2077 commented Apr 30, 2024 •

edited

Loading

eh2077 left a comment

melvin-bot bot commented Apr 30, 2024

OSBotify commented Apr 30, 2024

OSBotify commented May 1, 2024

OSBotify commented May 2, 2024

Fix reintroduced dependencies from conflict resolution #41152

Fix reintroduced dependencies from conflict resolution #41152

Conversation

brunovjk commented Apr 27, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 27, 2024

brunovjk commented Apr 27, 2024

brunovjk commented Apr 27, 2024

eh2077 Apr 28, 2024

Choose a reason for hiding this comment

brunovjk Apr 28, 2024 • edited Loading

Choose a reason for hiding this comment

eh2077 commented Apr 30, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

eh2077 left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Apr 30, 2024

OSBotify commented Apr 30, 2024

OSBotify commented May 1, 2024

OSBotify commented May 2, 2024

brunovjk commented Apr 27, 2024 •

edited

Loading

brunovjk Apr 28, 2024 •

edited

Loading

eh2077 commented Apr 30, 2024 •

edited

Loading