Skip to content

Commit 4400aca

Browse files
abzokhattababzokhattab
committed
Removing compose.ts
1 parent 5730ba4 commit 4400aca

File tree

8 files changed

+42
-58
lines changed

8 files changed

+42
-58
lines changed

‎src/components/LocaleContextProvider.tsx

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React, {createContext, useMemo} from 'react';
22
import type {OnyxEntry} from 'react-native-onyx';
33
import {withOnyx} from 'react-native-onyx';
44
import type {ValueOf} from 'type-fest';
5-
import compose from '@libs/compose';
65
import DateUtils from '@libs/DateUtils';
76
import * as LocaleDigitUtils from '@libs/LocaleDigitUtils';
87
import * as LocalePhoneNumber from '@libs/LocalePhoneNumber';
@@ -125,18 +124,17 @@ function LocaleContextProvider({preferredLocale, currentUserPersonalDetails = {}
125124
return <LocaleContext.Provider value={contextValue}>{children}</LocaleContext.Provider>;
126125
}
127126

128-
const Provider = compose(
127+
const Provider = withCurrentUserPersonalDetails(
129128
withOnyx<LocaleContextProviderProps, LocaleContextProviderOnyxProps>({
130129
preferredLocale: {
131130
key: ONYXKEYS.NVP_PREFERRED_LOCALE,
132131
selector: (preferredLocale) => preferredLocale,
133132
},
134-
}),
135-
withCurrentUserPersonalDetails,
136-
)(LocaleContextProvider);
133+
})(LocaleContextProvider),
134+
);
137135

138136
Provider.displayName = 'withOnyx(LocaleContextProvider)';
139137

140-
export {Provider as LocaleContextProvider, LocaleContext};
138+
export {LocaleContext, Provider as LocaleContextProvider};
141139

142-
export type {LocaleContextProps, Locale};
140+
export type {Locale, LocaleContextProps};

‎src/components/MapView/MapView.tsx

+3-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {View} from 'react-native';
66
import {withOnyx} from 'react-native-onyx';
77
import useThemeStyles from '@hooks/useThemeStyles';
88
import setUserLocation from '@libs/actions/UserLocation';
9-
import compose from '@libs/compose';
109
import getCurrentPosition from '@libs/getCurrentPosition';
1110
import CONST from '@src/CONST';
1211
import useLocalize from '@src/hooks/useLocalize';
@@ -196,11 +195,10 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
196195
},
197196
);
198197

199-
export default compose(
198+
export default memo(
200199
withOnyx<ComponentProps, MapViewOnyxProps>({
201200
userLocation: {
202201
key: ONYXKEYS.USER_LOCATION,
203202
},
204-
}),
205-
memo,
206-
)(MapView);
203+
})(MapView),
204+
);

‎src/components/TestToolMenu.tsx

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {withOnyx} from 'react-native-onyx';
44
import useLocalize from '@hooks/useLocalize';
55
import useThemeStyles from '@hooks/useThemeStyles';
66
import * as ApiUtils from '@libs/ApiUtils';
7-
import compose from '@libs/compose';
87
import Navigation from '@libs/Navigation/Navigation';
98
import * as Network from '@userActions/Network';
109
import * as Session from '@userActions/Session';
@@ -109,11 +108,10 @@ function TestToolMenu({user = USER_DEFAULT, network}: TestToolMenuProps) {
109108

110109
TestToolMenu.displayName = 'TestToolMenu';
111110

112-
export default compose(
111+
export default withNetwork()(
113112
withOnyx<TestToolMenuProps, TestToolMenuOnyxProps>({
114113
user: {
115114
key: ONYXKEYS.USER,
116115
},
117-
}),
118-
withNetwork(),
119-
)(TestToolMenu);
116+
})(TestToolMenu),
117+
);

‎src/pages/home/report/withReportAndReportActionOrNotFound.tsx

+3-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {withOnyx} from 'react-native-onyx';
77
import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
88
import withWindowDimensions from '@components/withWindowDimensions';
99
import type {WindowDimensionsProps} from '@components/withWindowDimensions/types';
10-
import compose from '@libs/compose';
1110
import getComponentDisplayName from '@libs/getComponentDisplayName';
1211
import type {FlagCommentNavigatorParamList, SplitDetailsNavigatorParamList} from '@libs/Navigation/types';
1312
import * as ReportUtils from '@libs/ReportUtils';
@@ -103,7 +102,7 @@ export default function <TProps extends WithReportAndReportActionOrNotFoundProps
103102

104103
WithReportOrNotFound.displayName = `withReportOrNotFound(${getComponentDisplayName(WrappedComponent)})`;
105104

106-
return compose(
105+
return withWindowDimensions(
107106
withOnyx<TProps & RefAttributes<TRef>, OnyxProps>({
108107
report: {
109108
key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID}`,
@@ -138,9 +137,8 @@ export default function <TProps extends WithReportAndReportActionOrNotFoundProps
138137
},
139138
canEvict: false,
140139
},
141-
}),
142-
withWindowDimensions,
143-
)(React.forwardRef(WithReportOrNotFound));
140+
})(React.forwardRef(WithReportOrNotFound)),
141+
);
144142
}
145143

146144
export type {WithReportAndReportActionOrNotFoundProps};

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

+15-16
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
import Str from 'expensify-common/lib/str';
22
import React, {useEffect} from 'react';
33
import {View} from 'react-native';
4-
import {withOnyx} from 'react-native-onyx';
54
import type {OnyxEntry} from 'react-native-onyx';
5+
import {withOnyx} from 'react-native-onyx';
66
import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
77
import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
88
import OfflineWithFeedback from '@components/OfflineWithFeedback';
99
import {withNetwork} from '@components/OnyxProvider';
1010
import ScrollView from '@components/ScrollView';
1111
import useLocalize from '@hooks/useLocalize';
1212
import useThemeStyles from '@hooks/useThemeStyles';
13-
import compose from '@libs/compose';
1413
import * as CurrencyUtils from '@libs/CurrencyUtils';
1514
import Navigation from '@libs/Navigation/Navigation';
1615
import {getUnitTranslationKey} from '@libs/WorkspacesSettingsUtils';
17-
import withPolicy from '@pages/workspace/withPolicy';
1816
import type {WithPolicyProps} from '@pages/workspace/withPolicy';
17+
import withPolicy from '@pages/workspace/withPolicy';
1918
import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
2019
import * as BankAccounts from '@userActions/BankAccounts';
2120
import * as Policy from '@userActions/Policy';
@@ -150,16 +149,16 @@ function WorkspaceRateAndUnitPage(props: WorkspaceRateAndUnitPageProps) {
150149

151150
WorkspaceRateAndUnitPage.displayName = 'WorkspaceRateAndUnitPage';
152151

153-
export default compose(
154-
withOnyx<WorkspaceRateAndUnitPageProps, WorkspaceRateAndUnitOnyxProps>({
155-
// @ts-expect-error: ONYXKEYS.REIMBURSEMENT_ACCOUNT is conflicting with ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM
156-
reimbursementAccount: {
157-
key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
158-
},
159-
workspaceRateAndUnit: {
160-
key: ONYXKEYS.WORKSPACE_RATE_AND_UNIT,
161-
},
162-
}),
163-
withPolicy,
164-
withNetwork(),
165-
)(WorkspaceRateAndUnitPage);
152+
export default withNetwork()(
153+
withPolicy(
154+
withOnyx<WorkspaceRateAndUnitPageProps, WorkspaceRateAndUnitOnyxProps>({
155+
// @ts-expect-error: ONYXKEYS.REIMBURSEMENT_ACCOUNT is conflicting with ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM
156+
reimbursementAccount: {
157+
key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
158+
},
159+
workspaceRateAndUnit: {
160+
key: ONYXKEYS.WORKSPACE_RATE_AND_UNIT,
161+
},
162+
})(WorkspaceRateAndUnitPage),
163+
),
164+
);

‎src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/RatePage.tsx

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import React, {useCallback, useEffect, useMemo} from 'react';
2-
import {withOnyx} from 'react-native-onyx';
32
import type {OnyxEntry} from 'react-native-onyx';
3+
import {withOnyx} from 'react-native-onyx';
44
import AmountForm from '@components/AmountForm';
55
import FormProvider from '@components/Form/FormProvider';
66
import InputWrapperWithRef from '@components/Form/InputWrapper';
77
import type {FormOnyxValues} from '@components/Form/types';
88
import useLocalize from '@hooks/useLocalize';
99
import useThemeStyles from '@hooks/useThemeStyles';
10-
import compose from '@libs/compose';
1110
import Navigation from '@libs/Navigation/Navigation';
1211
import {validateRateValue} from '@libs/PolicyDistanceRatesUtils';
13-
import withPolicy from '@pages/workspace/withPolicy';
1412
import type {WithPolicyProps} from '@pages/workspace/withPolicy';
13+
import withPolicy from '@pages/workspace/withPolicy';
1514
import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
1615
import * as Policy from '@userActions/Policy';
1716
import CONST from '@src/CONST';
@@ -99,11 +98,10 @@ function WorkspaceRatePage(props: WorkspaceRatePageProps) {
9998

10099
WorkspaceRatePage.displayName = 'WorkspaceRatePage';
101100

102-
export default compose(
101+
export default withPolicy(
103102
withOnyx<WorkspaceRatePageProps, WorkspaceRateAndUnitOnyxProps>({
104103
workspaceRateAndUnit: {
105104
key: ONYXKEYS.WORKSPACE_RATE_AND_UNIT,
106105
},
107-
}),
108-
withPolicy,
109-
)(WorkspaceRatePage);
106+
})(WorkspaceRatePage),
107+
);

‎src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/UnitPage.tsx

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import React, {useEffect, useMemo} from 'react';
2-
import {withOnyx} from 'react-native-onyx';
32
import type {OnyxEntry} from 'react-native-onyx';
3+
import {withOnyx} from 'react-native-onyx';
44
import Text from '@components/Text';
55
import type {UnitItemType} from '@components/UnitPicker';
66
import UnitPicker from '@components/UnitPicker';
77
import useLocalize from '@hooks/useLocalize';
88
import useThemeStyles from '@hooks/useThemeStyles';
9-
import compose from '@libs/compose';
109
import Navigation from '@libs/Navigation/Navigation';
11-
import withPolicy from '@pages/workspace/withPolicy';
1210
import type {WithPolicyProps} from '@pages/workspace/withPolicy';
11+
import withPolicy from '@pages/workspace/withPolicy';
1312
import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
1413
import * as Policy from '@userActions/Policy';
1514
import CONST from '@src/CONST';
@@ -70,12 +69,10 @@ function WorkspaceUnitPage(props: WorkspaceUnitPageProps) {
7069
}
7170

7271
WorkspaceUnitPage.displayName = 'WorkspaceUnitPage';
73-
74-
export default compose(
72+
export default withPolicy(
7573
withOnyx<WorkspaceUnitPageProps, WorkspaceRateAndUnitOnyxProps>({
7674
workspaceRateAndUnit: {
7775
key: ONYXKEYS.WORKSPACE_RATE_AND_UNIT,
7876
},
79-
}),
80-
withPolicy,
81-
)(WorkspaceUnitPage);
77+
})(WorkspaceUnitPage),
78+
);

‎src/pages/workspace/withPolicyAndFullscreenLoading.tsx

+3-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import React, {forwardRef} from 'react';
44
import type {OnyxEntry} from 'react-native-onyx';
55
import {withOnyx} from 'react-native-onyx';
66
import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
7-
import compose from '@libs/compose';
87
import ONYXKEYS from '@src/ONYXKEYS';
98
import type {PersonalDetailsList} from '@src/types/onyx';
109
import type {WithPolicyOnyxProps, WithPolicyProps} from './withPolicy';
@@ -49,17 +48,16 @@ export default function withPolicyAndFullscreenLoading<TProps extends WithPolicy
4948

5049
WithPolicyAndFullscreenLoading.displayName = `WithPolicyAndFullscreenLoading`;
5150

52-
return compose(
51+
return withPolicy(
5352
withOnyx<TProps & RefAttributes<TRef>, WithPolicyAndFullscreenLoadingOnyxProps>({
5453
isLoadingReportData: {
5554
key: ONYXKEYS.IS_LOADING_REPORT_DATA,
5655
},
5756
personalDetails: {
5857
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
5958
},
60-
}),
61-
withPolicy,
62-
)(forwardRef(WithPolicyAndFullscreenLoading));
59+
})(forwardRef(WithPolicyAndFullscreenLoading)),
60+
);
6361
}
6462

6563
export type {WithPolicyAndFullscreenLoadingProps};

0 commit comments

Comments
 (0)