Skip to content

Commit e6b5552

Browse files
JKobrynskiJKobrynski
committed
fix lint errors
1 parent c7af449 commit e6b5552

7 files changed

+163
-134
lines changed

‎src/components/MoneyRequestConfirmationList.tsx

Lines changed: 82 additions & 61 deletions
Large diffs are not rendered by default.

‎src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
1717
import useTheme from '@hooks/useTheme';
1818
import useThemeStyles from '@hooks/useThemeStyles';
1919
import useWindowDimensions from '@hooks/useWindowDimensions';
20-
import * as Browser from '@libs/Browser';
20+
import {isSafari} from '@libs/Browser';
2121
import getIconForAction from '@libs/getIconForAction';
2222
import Navigation from '@libs/Navigation/Navigation';
23-
import * as ReportUtils from '@libs/ReportUtils';
24-
import * as SubscriptionUtils from '@libs/SubscriptionUtils';
25-
import * as IOU from '@userActions/IOU';
26-
import * as Modal from '@userActions/Modal';
27-
import * as Report from '@userActions/Report';
28-
import * as Task from '@userActions/Task';
23+
import {canCreateTaskInReport, getPayeeName, temporary_getMoneyRequestOptions} from '@libs/ReportUtils';
24+
import {shouldRestrictUserBillableActions} from '@libs/SubscriptionUtils';
25+
import {startMoneyRequest} from '@userActions/IOU';
26+
import {close} from '@userActions/Modal';
27+
import {setIsComposerFullSize} from '@userActions/Report';
28+
import {clearOutTaskInfoAndNavigate} from '@userActions/Task';
2929
import DelegateNoAccessModal from '@src/components/DelegateNoAccessModal';
3030
import type {IOUType} from '@src/CONST';
3131
import CONST from '@src/CONST';
@@ -126,7 +126,7 @@ function AttachmentPickerWithMenuItems({
126126
*/
127127
const moneyRequestOptions = useMemo(() => {
128128
const selectOption = (onSelected: () => void, shouldRestrictAction: boolean) => {
129-
if (shouldRestrictAction && policy && SubscriptionUtils.shouldRestrictUserBillableActions(policy.id)) {
129+
if (shouldRestrictAction && policy && shouldRestrictUserBillableActions(policy.id)) {
130130
Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id));
131131
return;
132132
}
@@ -138,37 +138,37 @@ function AttachmentPickerWithMenuItems({
138138
[CONST.IOU.TYPE.SPLIT]: {
139139
icon: Expensicons.Transfer,
140140
text: translate('iou.splitExpense'),
141-
onSelected: () => selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), true),
141+
onSelected: () => selectOption(() => startMoneyRequest(CONST.IOU.TYPE.SPLIT, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), true),
142142
},
143143
[CONST.IOU.TYPE.SUBMIT]: {
144144
icon: getIconForAction(CONST.IOU.TYPE.CREATE),
145145
text: translate('iou.createExpense'),
146-
onSelected: () => selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), true),
146+
onSelected: () => selectOption(() => startMoneyRequest(CONST.IOU.TYPE.SUBMIT, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), true),
147147
},
148148
[CONST.IOU.TYPE.PAY]: {
149149
icon: getIconForAction(CONST.IOU.TYPE.SEND),
150-
text: translate('iou.paySomeone', {name: ReportUtils.getPayeeName(report)}),
150+
text: translate('iou.paySomeone', {name: getPayeeName(report)}),
151151
onSelected: () => {
152152
if (isDelegateAccessRestricted) {
153153
setIsNoDelegateAccessMenuVisible(true);
154154
return;
155155
}
156-
selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.PAY, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), false);
156+
selectOption(() => startMoneyRequest(CONST.IOU.TYPE.PAY, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), false);
157157
},
158158
},
159159
[CONST.IOU.TYPE.TRACK]: {
160160
icon: getIconForAction(CONST.IOU.TYPE.CREATE),
161161
text: translate('iou.createExpense'),
162-
onSelected: () => selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), true),
162+
onSelected: () => selectOption(() => startMoneyRequest(CONST.IOU.TYPE.TRACK, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), true),
163163
},
164164
[CONST.IOU.TYPE.INVOICE]: {
165165
icon: Expensicons.InvoiceGeneric,
166166
text: translate('workspace.invoices.sendInvoice'),
167-
onSelected: () => selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.INVOICE, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), false),
167+
onSelected: () => selectOption(() => startMoneyRequest(CONST.IOU.TYPE.INVOICE, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID)), false),
168168
},
169169
};
170170

171-
const moneyRequestOptionsList = ReportUtils.temporary_getMoneyRequestOptions(report, policy, reportParticipantIDs ?? []).map((option) => ({
171+
const moneyRequestOptionsList = temporary_getMoneyRequestOptions(report, policy, reportParticipantIDs ?? []).map((option) => ({
172172
...options[option],
173173
}));
174174

@@ -179,15 +179,15 @@ function AttachmentPickerWithMenuItems({
179179
* Determines if we can show the task option
180180
*/
181181
const taskOption: PopoverMenuItem[] = useMemo(() => {
182-
if (!ReportUtils.canCreateTaskInReport(report)) {
182+
if (!canCreateTaskInReport(report)) {
183183
return [];
184184
}
185185

186186
return [
187187
{
188188
icon: Expensicons.Task,
189189
text: translate('newTaskPage.assignTask'),
190-
onSelected: () => Task.clearOutTaskInfoAndNavigate(reportID, report),
190+
onSelected: () => clearOutTaskInfoAndNavigate(reportID, report),
191191
},
192192
];
193193
}, [report, reportID, translate]);
@@ -295,7 +295,7 @@ function AttachmentPickerWithMenuItems({
295295
onPress={(e) => {
296296
e?.preventDefault();
297297
raiseIsScrollLikelyLayoutTriggered();
298-
Report.setIsComposerFullSize(reportID, false);
298+
setIsComposerFullSize(reportID, false);
299299
}}
300300
// Keep focus on the composer when Collapse button is clicked.
301301
onMouseDown={(e) => e.preventDefault()}
@@ -316,7 +316,7 @@ function AttachmentPickerWithMenuItems({
316316
onPress={(e) => {
317317
e?.preventDefault();
318318
raiseIsScrollLikelyLayoutTriggered();
319-
Report.setIsComposerFullSize(reportID, true);
319+
setIsComposerFullSize(reportID, true);
320320
}}
321321
// Keep focus on the composer when Expand button is clicked.
322322
onMouseDown={(e) => e.preventDefault()}
@@ -347,11 +347,11 @@ function AttachmentPickerWithMenuItems({
347347
// function must be called from within a event handler that was initiated
348348
// by the user on Safari.
349349
if (index === menuItems.length - 1) {
350-
if (Browser.isSafari()) {
350+
if (isSafari()) {
351351
triggerAttachmentPicker();
352352
return;
353353
}
354-
Modal.close(() => {
354+
close(() => {
355355
triggerAttachmentPicker();
356356
});
357357
}

‎src/pages/iou/MoneyRequestAmountForm.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import useLocalize from '@hooks/useLocalize';
1515
import usePrevious from '@hooks/usePrevious';
1616
import useResponsiveLayout from '@hooks/useResponsiveLayout';
1717
import useThemeStyles from '@hooks/useThemeStyles';
18-
import * as CurrencyUtils from '@libs/CurrencyUtils';
19-
import * as DeviceCapabilities from '@libs/DeviceCapabilities';
20-
import * as MoneyRequestUtils from '@libs/MoneyRequestUtils';
18+
import {convertToDisplayString, convertToFrontendAmountAsInteger, convertToFrontendAmountAsString} from '@libs/CurrencyUtils';
19+
import {canUseTouchScreen as canUseTouchScreenUtil} from '@libs/DeviceCapabilities';
20+
import {addLeadingZero} from '@libs/MoneyRequestUtils';
2121
import Navigation from '@libs/Navigation/Navigation';
2222
import variables from '@styles/variables';
2323
import type {BaseTextInputRef} from '@src/components/TextInput/BaseTextInput/types';
@@ -72,7 +72,7 @@ type MoneyRequestAmountFormProps = {
7272

7373
const isAmountInvalid = (amount: string) => !amount.length || parseFloat(amount) < 0.01;
7474
const isTaxAmountInvalid = (currentAmount: string, taxAmount: number, isTaxAmountForm: boolean, currency: string) =>
75-
isTaxAmountForm && Number.parseFloat(currentAmount) > CurrencyUtils.convertToFrontendAmountAsInteger(Math.abs(taxAmount), currency);
75+
isTaxAmountForm && Number.parseFloat(currentAmount) > convertToFrontendAmountAsInteger(Math.abs(taxAmount), currency);
7676

7777
const AMOUNT_VIEW_ID = 'amountView';
7878
const NUM_PAD_CONTAINER_VIEW_ID = 'numPadContainerView';
@@ -109,7 +109,7 @@ function MoneyRequestAmountForm(
109109
const isFocused = useIsFocused();
110110
const wasFocused = usePrevious(isFocused);
111111

112-
const formattedTaxAmount = CurrencyUtils.convertToDisplayString(Math.abs(taxAmount), currency);
112+
const formattedTaxAmount = convertToDisplayString(Math.abs(taxAmount), currency);
113113

114114
/**
115115
* Event occurs when a user presses a mouse button over an DOM element.
@@ -151,7 +151,7 @@ function MoneyRequestAmountForm(
151151

152152
const initializeAmount = useCallback(
153153
(newAmount: number) => {
154-
const frontendAmount = newAmount ? CurrencyUtils.convertToFrontendAmountAsString(newAmount, currency) : '';
154+
const frontendAmount = newAmount ? convertToFrontendAmountAsString(newAmount, currency) : '';
155155
moneyRequestAmountInput.current?.changeAmount(frontendAmount);
156156
moneyRequestAmountInput.current?.changeSelection({
157157
start: frontendAmount.length,
@@ -186,11 +186,11 @@ function MoneyRequestAmountForm(
186186
if (currentAmount.length > 0) {
187187
const selectionStart = selection.start === selection.end ? selection.start - 1 : selection.start;
188188
const newAmount = `${currentAmount.substring(0, selectionStart)}${currentAmount.substring(selection.end)}`;
189-
moneyRequestAmountInput.current?.setNewAmount(MoneyRequestUtils.addLeadingZero(newAmount));
189+
moneyRequestAmountInput.current?.setNewAmount(addLeadingZero(newAmount));
190190
}
191191
return;
192192
}
193-
const newAmount = MoneyRequestUtils.addLeadingZero(`${currentAmount.substring(0, selection.start)}${key}${currentAmount.substring(selection.end)}`);
193+
const newAmount = addLeadingZero(`${currentAmount.substring(0, selection.start)}${key}${currentAmount.substring(selection.end)}`);
194194
moneyRequestAmountInput.current?.setNewAmount(newAmount);
195195
},
196196
[shouldUpdateSelection],
@@ -242,7 +242,7 @@ function MoneyRequestAmountForm(
242242
return isEditing ? translate('common.save') : translate('common.next');
243243
}, [skipConfirmation, iouType, isEditing, translate]);
244244

245-
const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
245+
const canUseTouchScreen = canUseTouchScreenUtil();
246246

247247
useEffect(() => {
248248
setFormError('');

‎src/pages/iou/request/IOURequestStartPage.tsx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import useLocalize from '@hooks/useLocalize';
1111
import usePermissions from '@hooks/usePermissions';
1212
import usePolicy from '@hooks/usePolicy';
1313
import useThemeStyles from '@hooks/useThemeStyles';
14-
import * as DeviceCapabilities from '@libs/DeviceCapabilities';
14+
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
1515
import Navigation from '@libs/Navigation/Navigation';
1616
import OnyxTabNavigator, {TabScreenWithFocusTrapWrapper, TopTab} from '@libs/Navigation/OnyxTabNavigator';
17-
import * as PolicyUtils from '@libs/PolicyUtils';
18-
import * as ReportUtils from '@libs/ReportUtils';
17+
import {getActivePolicies, getPerDiemCustomUnit} from '@libs/PolicyUtils';
18+
import {getPayeeName} from '@libs/ReportUtils';
1919
import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
2020
import type {IOURequestType} from '@userActions/IOU';
21-
import * as IOU from '@userActions/IOU';
21+
import {initMoneyRequest} from '@userActions/IOU';
2222
import CONST from '@src/CONST';
2323
import ONYXKEYS from '@src/ONYXKEYS';
2424
import type SCREENS from '@src/SCREENS';
@@ -57,8 +57,8 @@ function IOURequestStartPage({
5757
const tabTitles = {
5858
[CONST.IOU.TYPE.REQUEST]: translate('iou.createExpense'),
5959
[CONST.IOU.TYPE.SUBMIT]: translate('iou.createExpense'),
60-
[CONST.IOU.TYPE.SEND]: translate('iou.paySomeone', {name: ReportUtils.getPayeeName(report)}),
61-
[CONST.IOU.TYPE.PAY]: translate('iou.paySomeone', {name: ReportUtils.getPayeeName(report)}),
60+
[CONST.IOU.TYPE.SEND]: translate('iou.paySomeone', {name: getPayeeName(report)}),
61+
[CONST.IOU.TYPE.PAY]: translate('iou.paySomeone', {name: getPayeeName(report)}),
6262
[CONST.IOU.TYPE.SPLIT]: translate('iou.createExpense'),
6363
[CONST.IOU.TYPE.TRACK]: translate('iou.createExpense'),
6464
[CONST.IOU.TYPE.INVOICE]: translate('workspace.invoices.sendInvoice'),
@@ -75,7 +75,7 @@ function IOURequestStartPage({
7575
if (transaction?.reportID === reportID || isLoadingSelectedTab) {
7676
return;
7777
}
78-
IOU.initMoneyRequest(reportID, policy, isFromGlobalCreate, transaction?.iouRequestType, transactionRequestType);
78+
initMoneyRequest(reportID, policy, isFromGlobalCreate, transaction?.iouRequestType, transactionRequestType);
7979
}, [transaction, policy, reportID, iouType, isFromGlobalCreate, transactionRequestType, isLoadingSelectedTab]);
8080

8181
const navigateBack = () => {
@@ -87,7 +87,7 @@ function IOURequestStartPage({
8787
if (transaction?.iouRequestType === newIOUType) {
8888
return;
8989
}
90-
IOU.initMoneyRequest(reportID, policy, isFromGlobalCreate, transaction?.iouRequestType, newIOUType);
90+
initMoneyRequest(reportID, policy, isFromGlobalCreate, transaction?.iouRequestType, newIOUType);
9191
},
9292
[policy, reportID, isFromGlobalCreate, transaction],
9393
);
@@ -100,15 +100,15 @@ function IOURequestStartPage({
100100
return [headerWithBackBtnContainerElement, tabBarContainerElement, activeTabContainerElement].filter((element) => !!element) as HTMLElement[];
101101
}, [headerWithBackBtnContainerElement, tabBarContainerElement, activeTabContainerElement]);
102102

103-
const perDiemCustomUnits = PolicyUtils.getActivePolicies(allPolicies, session?.email)
104-
.map((mappedPolicy) => ({policyID: mappedPolicy.id, customUnit: PolicyUtils.getPerDiemCustomUnit(mappedPolicy)}))
103+
const perDiemCustomUnits = getActivePolicies(allPolicies, session?.email)
104+
.map((mappedPolicy) => ({policyID: mappedPolicy.id, customUnit: getPerDiemCustomUnit(mappedPolicy)}))
105105
.filter(({customUnit}) => !isEmptyObject(customUnit) && !!customUnit.enabled);
106106

107107
const doesPerDiemPolicyExist = perDiemCustomUnits.length > 0;
108108

109109
const moreThanOnePerDiemExist = perDiemCustomUnits.length > 1;
110110

111-
const currentPolicyPerDiemUnit = PolicyUtils.getPerDiemCustomUnit(policy);
111+
const currentPolicyPerDiemUnit = getPerDiemCustomUnit(policy);
112112

113113
const doesCurrentPolicyPerDiemExist = !isEmptyObject(currentPolicyPerDiemUnit) && !!currentPolicyPerDiemUnit.enabled;
114114

@@ -134,7 +134,7 @@ function IOURequestStartPage({
134134
>
135135
<ScreenWrapper
136136
shouldEnableKeyboardAvoidingView={false}
137-
shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
137+
shouldEnableMinHeight={canUseTouchScreen()}
138138
headerGapStyles={isDraggingOver ? [styles.receiptDropHeaderGap] : []}
139139
testID={IOURequestStartPage.displayName}
140140
focusTrapSettings={{containerElements: focusTrapContainerElements}}

‎src/pages/iou/request/step/IOURequestStepDestination.tsx

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,17 @@ import useNetwork from '@hooks/useNetwork';
1414
import useTheme from '@hooks/useTheme';
1515
import useThemeStyles from '@hooks/useThemeStyles';
1616
import Navigation from '@libs/Navigation/Navigation';
17-
import * as PolicyUtils from '@libs/PolicyUtils';
18-
import * as ReportUtils from '@libs/ReportUtils';
19-
import * as IOU from '@userActions/IOU';
17+
import {getPerDiemCustomUnit, isPolicyAdmin} from '@libs/PolicyUtils';
18+
import {getPolicyExpenseChat} from '@libs/ReportUtils';
19+
import {
20+
clearSubrates,
21+
getIOURequestPolicyID,
22+
setCustomUnitID,
23+
setCustomUnitRateID,
24+
setMoneyRequestCategory,
25+
setMoneyRequestCurrency,
26+
setMoneyRequestParticipantsFromReport,
27+
} from '@userActions/IOU';
2028
import CONST from '@src/CONST';
2129
import ONYXKEYS from '@src/ONYXKEYS';
2230
import ROUTES from '@src/ROUTES';
@@ -44,11 +52,11 @@ function IOURequestStepDestination({
4452
openedFromStartPage = false,
4553
explicitPolicyID,
4654
}: IOURequestStepDestinationProps) {
47-
const [policy, policyMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${explicitPolicyID ?? IOU.getIOURequestPolicyID(transaction, report)}`);
55+
const [policy, policyMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${explicitPolicyID ?? getIOURequestPolicyID(transaction, report)}`);
4856
const {accountID} = useCurrentUserPersonalDetails();
49-
const policyExpenseReport = policy?.id ? ReportUtils.getPolicyExpenseChat(accountID, policy.id) : undefined;
57+
const policyExpenseReport = policy?.id ? getPolicyExpenseChat(accountID, policy.id) : undefined;
5058

51-
const customUnit = PolicyUtils.getPerDiemCustomUnit(policy);
59+
const customUnit = getPerDiemCustomUnit(policy);
5260
const selectedDestination = transaction?.comment?.customUnit?.customUnitRateID;
5361

5462
const styles = useThemeStyles();
@@ -73,13 +81,13 @@ function IOURequestStepDestination({
7381
}
7482
if (selectedDestination !== destination.keyForList) {
7583
if (openedFromStartPage) {
76-
IOU.setMoneyRequestParticipantsFromReport(transactionID, policyExpenseReport);
77-
IOU.setCustomUnitID(transactionID, customUnit.customUnitID);
78-
IOU.setMoneyRequestCategory(transactionID, customUnit?.defaultCategory ?? '');
84+
setMoneyRequestParticipantsFromReport(transactionID, policyExpenseReport);
85+
setCustomUnitID(transactionID, customUnit.customUnitID);
86+
setMoneyRequestCategory(transactionID, customUnit?.defaultCategory ?? '');
7987
}
80-
IOU.setCustomUnitRateID(transactionID, destination.keyForList ?? '');
81-
IOU.setMoneyRequestCurrency(transactionID, destination.currency);
82-
IOU.clearSubrates(transactionID);
88+
setCustomUnitRateID(transactionID, destination.keyForList ?? '');
89+
setMoneyRequestCurrency(transactionID, destination.currency);
90+
clearSubrates(transactionID);
8391
}
8492

8593
if (backTo) {
@@ -125,7 +133,7 @@ function IOURequestStepDestination({
125133
subtitle={translate('workspace.perDiem.emptyList.subtitle')}
126134
containerStyle={[styles.flex1, styles.justifyContentCenter]}
127135
/>
128-
{PolicyUtils.isPolicyAdmin(policy) && !!policy?.areCategoriesEnabled && (
136+
{isPolicyAdmin(policy) && !!policy?.areCategoriesEnabled && (
129137
<FixedFooter style={[styles.mtAuto, styles.pt5]}>
130138
<Button
131139
large

0 commit comments

Comments
 (0)