Removing compose.ts #42069

abzokhattab · 2024-05-13T14:07:36Z

Details

Fixed Issues

Tests

Verify that no errors appear in the JS console

LocaleContextProvider:
interact with app .. LocaleContextProvider is used in withLocalize and and withLocalize is used in AutoUpdateTime which updates the app time automatically.

MapView:

Click on '+' -> 'submit expense' -> 'distance tab'
Pick a start and end locations and make sure the map is shown without errors

TestToolMenu:
this file is only used in Development.

go to settings -> troubleshoot
ensure that the Testing preferences section is shown and no errors are shown

withReportAndReportActionOrNotFound:

Click on '+' -> 'Split Expense' -> 'Manual'
enter any amount and choose two or more participants then confirm the split.
click on the split preview action.
ensure that the details RHP is opened and the split details is shown without error.

withPolicyAndFullscreenLoading:

create a workspace
navigate to workspace settings
ensure that no error is shown up

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-06-11.at.2.33.52.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-06-11.at.2.42.05.PM.mov

iOS: Native

Screen.Recording.2024-06-11.at.2.29.39.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-06-11.at.2.42.05.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-06-11.at.2.38.28.PM.mov

MacOS: Desktop

Screen.Recording.2024-06-11.at.2.45.08.PM.mov

melvin-bot · 2024-05-13T14:07:41Z

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

src/pages/home/report/withReportAndReportActionOrNotFound.tsx

blazejkustra · 2024-05-17T15:29:31Z

Any updates here @abzokhattab?

shubham1206agra · 2024-05-20T13:36:24Z

src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage.tsx

-    withPolicy,
-    withNetwork(),
-)(WorkspaceRateAndUnitPage);
+export default withNetwork()(


I am not getting the use of withNetwork here. @abzokhattab Can you please find out why this was introduced in the first place?

I believe it's not needed since the network object is not used anywhere

App/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage.tsx

Lines 28 to 31 in 4400aca

type WorkspaceRateAndUnitPageBaseProps = WithPolicyProps & {

// eslint-disable-next-line react/no-unused-prop-types

network: OnyxEntry<Network>;

};

this change was introduced here but there is no reference for why it was introduced.

since it not used anymore we should consider removing this

fabioh8010 · 2024-05-24T18:21:18Z

Any updates here? cc @abzokhattab @shubham1206agra

Why is this PR still on Draft? Is it WIP or can we open to review?

abzokhattab · 2024-05-28T14:16:42Z

what kind of manual tests should I make here @shubham1206agra ?

abzokhattab · 2024-06-04T16:58:35Z

Kindly reminder on this @shubham1206agra

shubham1206agra · 2024-06-05T10:18:21Z

@abzokhattab Can you please add tests and screenshots?

fabioh8010 · 2024-06-07T17:15:47Z

@abzokhattab @shubham1206agra Whats the status of this PR? What can we do to get this moving faster?

abzokhattab · 2024-06-07T17:33:46Z

The PR is ready .. i will update the description today

at the mean time please let me know if you have any comments on the changes made.

thanks

fabioh8010 · 2024-06-07T17:36:22Z

The PR is ready .. i will update the description today

at the mean time please let me know if you have any comments on the changes made.

thanks

Thanks, please let us know once you update the description and add tests / screenshots

shubham1206agra · 2024-06-08T01:24:36Z

@abzokhattab Please use useOnyx now since withOnyx is officially deprecated.
cc @blazejkustra

abzokhattab · 2024-06-10T10:45:04Z

Updating the PR description now.
@shubham1206agra i see that withOynx is still not deprecated.

should we keep it then?

shubham1206agra · 2024-06-10T12:13:07Z

No, please use useOnyx now.

fabioh8010 · 2024-06-10T15:51:48Z

@shubham1206agra just curious, but what replace to useOnyx are we talking about here? As discussed previously in the GH issue we should focus only on removing compose rather than doing migrations to useOnyx here.

shubham1206agra · 2024-06-10T15:53:33Z

There was an announcement for deprecation of withOnyx.

abzokhattab · 2024-06-11T12:54:47Z

Okay, i reverted the useOnyx change ..
The PR is now ready.

blazejkustra · 2024-06-12T11:18:54Z

@shubham1206agra Let's test these components, shouldn't make any difference but watch out for any regressions 🚀

blazejkustra · 2024-06-12T11:21:56Z

We can also consider adjusting contributing guides:

### Composition 

Avoid the usage of `compose` function to compose HOCs in TypeScript files. Use nesting instead.

> Why? `compose` function doesn't work well with TypeScript when dealing with several HOCs being used in a component, many times resulting in wrong types and errors. Instead, nesting can be used to allow a seamless use of multiple HOCs and result in a correct return type of the compoment. Also, you can use [hooks instead of HOCs](#hooks-instead-of-hocs) whenever possible to minimize or even remove the need of HOCs in the component.

abzokhattab · 2024-06-12T15:17:06Z

We can also consider adjusting contributing guides:

should we remove the mentioned section ?

@blazejkustra

shubham1206agra · 2024-06-13T11:36:33Z

@abzokhattab Yes, please remove that.

abzokhattab · 2024-06-13T12:29:39Z

@abzokhattab Yes, please remove that.

okay i removed the composition section from the readme because the whole section is not relatable now

shubham1206agra · 2024-06-13T12:31:25Z

@abzokhattab Please merge main

abzokhattab · 2024-06-13T12:34:01Z

Done

ishpaul777 · 2024-06-14T13:22:59Z

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

VIDEO-2024-06-14-21-20-29.mp4

Android: mWeb Chrome

VIDEO-2024-06-14-21-13-56.mp4

iOS: Native

Screen.Recording.2024-06-14.at.8.32.57.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-06-14.at.8.27.19.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-06-14.at.7.48.17.PM.mov

MacOS: Desktop

Screen.Recording.2024-06-14.at.9.28.55.PM-1.mov

ishpaul777

LGTM!

mountiny

@abzokhattab one question

mountiny · 2024-06-14T16:42:44Z

src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage.tsx

@@ -159,7 +157,5 @@ export default compose(
        workspaceRateAndUnit: {
            key: ONYXKEYS.WORKSPACE_RATE_AND_UNIT,
        },
-    }),
-    withPolicy,
-    withNetwork(),


Was this not needed in the page?

Yes its not used anywhere as specified in the props types:

App/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage.tsx

Lines 28 to 31 in 4400aca

type WorkspaceRateAndUnitPageBaseProps = WithPolicyProps & {

// eslint-disable-next-line react/no-unused-prop-types

network: OnyxEntry<Network>;

};

also i forgot to remove this type, i just removed it.

actually, as i mentioned here #42069 (comment) the whole ( InitialPage, RatePage,UnitPage ) pages are not used anywhere so i am not sure if we should remove these components or not and if so should we do it in the same PR or in a new one.

mountiny

I think they will be removed in another project that deprecates anything related to Free policies

mountiny · 2024-06-14T21:21:57Z

Thanks for all the hard work

OSBotify · 2024-06-14T21:31:57Z

✋ 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-06-14T23:16:18Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.84-0 🚀

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

OSBotify · 2024-06-17T23:48:31Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.4.84-3 🚀

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

Removing compose.ts

4400aca

abzokhattab requested a review from a team as a code owner May 13, 2024 14:07

melvin-bot bot requested review from shubham1206agra and removed request for a team May 13, 2024 14:07

abzokhattab marked this pull request as draft May 13, 2024 14:07

abzokhattab mentioned this pull request May 13, 2024

[HOLD for payment 2024-06-28] [$250] [TS Migration] Remove compose completely #39117

Closed

abzokhattab added 2 commits May 13, 2024 16:09

removing compose.ts

7556c60

Merge remote-tracking branch 'origin/main' into remove-compose

731031f

blazejkustra reviewed May 13, 2024

View reviewed changes

src/pages/home/report/withReportAndReportActionOrNotFound.tsx Show resolved Hide resolved

shubham1206agra reviewed May 20, 2024

View reviewed changes

abzokhattab added 2 commits May 28, 2024 15:59

Merge remote-tracking branch 'origin/main' into remove-compose

ae290e5

Reversing dependencies order

6f73081

abzokhattab marked this pull request as ready for review May 28, 2024 14:16

abzokhattab requested a review from shubham1206agra May 28, 2024 14:17

Merge remote-tracking branch 'origin/main' into remove-compose

e520fbc

Merge remote-tracking branch 'origin/main' into remove-compose

87c8b5a

abzokhattab added 2 commits June 11, 2024 12:14

Merge remote-tracking branch 'origin/main' into remove-compose

5906a1a

Merge remote-tracking branch 'origin/main' into remove-compose

a8eb8e8

blazejkustra approved these changes Jun 12, 2024

View reviewed changes

Removing composition section from documentation

ee1ff62

Merge remote-tracking branch 'origin/main' into remove-compose

f81f094

removing withNetwork inside the initialPage

fdf3e04

ishpaul777 approved these changes Jun 14, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny June 14, 2024 16:03

mountiny assigned abzokhattab Jun 14, 2024

mountiny previously approved these changes Jun 14, 2024

View reviewed changes

initalpage props cleanup

8674e0d

abzokhattab dismissed mountiny’s stale review via 8674e0d June 14, 2024 17:02

mountiny approved these changes Jun 14, 2024

View reviewed changes

mountiny merged commit 578e6e9 into Expensify:main Jun 14, 2024
18 checks passed

github-actions bot mentioned this pull request Jun 14, 2024

Deploy Checklist: New Expensify 2024-06-14 #43793

Closed

53 tasks

This was referenced Jun 15, 2024

Split - Error splitting expense after submitting a distance expense #43798

Closed

[HOLD for payment 2024-06-28] [HOLD for payment 2024-06-24] Workspace - Workspace list reloads when returning online #43799

Closed

	type WorkspaceRateAndUnitPageBaseProps = WithPolicyProps & {
	// eslint-disable-next-line react/no-unused-prop-types
	network: OnyxEntry<Network>;
	};

Removing compose.ts #42069

Removing compose.ts #42069

Conversation

abzokhattab commented May 13, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 13, 2024

blazejkustra commented May 17, 2024

shubham1206agra May 20, 2024

Choose a reason for hiding this comment

abzokhattab May 20, 2024

Choose a reason for hiding this comment

ishpaul777 Jun 14, 2024

Choose a reason for hiding this comment

abzokhattab Jun 14, 2024

Choose a reason for hiding this comment

fabioh8010 commented May 24, 2024

abzokhattab commented May 28, 2024

abzokhattab commented Jun 4, 2024

shubham1206agra commented Jun 5, 2024

fabioh8010 commented Jun 7, 2024

abzokhattab commented Jun 7, 2024

fabioh8010 commented Jun 7, 2024

shubham1206agra commented Jun 8, 2024

abzokhattab commented Jun 10, 2024 • edited Loading

shubham1206agra commented Jun 10, 2024

fabioh8010 commented Jun 10, 2024

shubham1206agra commented Jun 10, 2024

abzokhattab commented Jun 11, 2024

blazejkustra commented Jun 12, 2024

blazejkustra commented Jun 12, 2024

abzokhattab commented Jun 12, 2024

shubham1206agra commented Jun 13, 2024

abzokhattab commented Jun 13, 2024

shubham1206agra commented Jun 13, 2024

abzokhattab commented Jun 13, 2024

ishpaul777 commented Jun 14, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

ishpaul777 left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

mountiny Jun 14, 2024

Choose a reason for hiding this comment

abzokhattab Jun 14, 2024

Choose a reason for hiding this comment

abzokhattab Jun 14, 2024

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

mountiny commented Jun 14, 2024

OSBotify commented Jun 14, 2024

OSBotify commented Jun 14, 2024

OSBotify commented Jun 17, 2024

abzokhattab commented May 13, 2024 •

edited

Loading

abzokhattab commented Jun 10, 2024 •

edited

Loading

ishpaul777 commented Jun 14, 2024 •

edited

Loading