Fix eslint

Expensify · Dec 27, 2024 · 51b13bd · 51b13bd
1 parent 701ec8b
commit 51b13bd
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 22 deletions.
diff --git a/src/components/DestinationPicker.tsx b/src/components/DestinationPicker.tsx
@@ -34,9 +34,13 @@ function DestinationPicker({selectedDestination, policyID, onSubmit}: Destinatio
 
         const selectedRate = customUnit?.rates?.[selectedDestination];
 
+        if (!selectedRate?.customUnitRateID) {
+            return [];
+        }
+
         return [
             {
-                rateID: selectedRate?.customUnitRateID ?? '',
+                rateID: selectedRate.customUnitRateID,
                 name: selectedRate?.name ?? '',
                 currency: selectedRate?.currency ?? CONST.CURRENCY.USD,
                 isSelected: true,

diff --git a/src/libs/PerDiemRequestUtils.ts b/src/libs/PerDiemRequestUtils.ts
@@ -26,7 +26,7 @@ Onyx.connect({
 function getCustomUnitID(reportID: string) {
     const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
     const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
-    const policy = PolicyUtils.getPolicy(report?.policyID ?? parentReport?.policyID ?? '-1');
+    const policy = PolicyUtils.getPolicy(report?.policyID ?? parentReport?.policyID);
     let customUnitID: string = CONST.CUSTOM_UNITS.FAKE_P2P_ID;
     let category: string | undefined;
 
@@ -103,7 +103,7 @@ function getDestinationListSections({
 }): DestinationTreeSection[] {
     const sortedDestinations: Destination[] = lodashSortBy(destinations, 'name').map((rate) => ({
         name: rate.name ?? '',
-        rateID: rate.customUnitRateID ?? '',
+        rateID: rate.customUnitRateID,
         currency: rate.currency ?? CONST.CURRENCY.USD,
     }));
     const destinationSections: DestinationTreeSection[] = [];
@@ -187,13 +187,19 @@ function getDestinationListSections({
 }
 
 function getDestinationForDisplay(customUnit: CustomUnit | undefined, transaction: OnyxEntry<Transaction>) {
-    const customUnitRateID = transaction?.comment?.customUnit?.customUnitRateID ?? '';
+    const customUnitRateID = transaction?.comment?.customUnit?.customUnitRateID;
+    if (!customUnitRateID) {
+        return '';
+    }
     const selectedDestination = customUnit?.rates?.[customUnitRateID];
     return selectedDestination?.name ?? '';
 }
 
 function getSubratesFields(customUnit: CustomUnit | undefined, transaction: OnyxEntry<Transaction>) {
-    const customUnitRateID = transaction?.comment?.customUnit?.customUnitRateID ?? '';
+    const customUnitRateID = transaction?.comment?.customUnit?.customUnitRateID;
+    if (!customUnitRateID) {
+        return [];
+    }
     const selectedDestination = customUnit?.rates?.[customUnitRateID];
     const countSubrates = selectedDestination?.subRates?.length ?? 0;
     const currentSubrates = transaction?.comment?.customUnit?.subRates ?? [];

diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx
@@ -50,7 +50,7 @@ function IOURequestStartPage({
     const [session] = useOnyx(ONYXKEYS.SESSION);
     const isLoadingSelectedTab = shouldUseTab ? isLoadingOnyxValue(selectedTabResult) : false;
     // eslint-disable-next-line  @typescript-eslint/prefer-nullish-coalescing
-    const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${route?.params.transactionID || -1}`);
+    const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${route?.params.transactionID || CONST.DEFAULT_NUMBER_ID}`);
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const {canUseCombinedTrackSubmit, canUsePerDiem} = usePermissions();
 

diff --git a/src/pages/iou/request/step/IOURequestStepDestination.tsx b/src/pages/iou/request/step/IOURequestStepDestination.tsx
@@ -47,7 +47,7 @@ function IOURequestStepDestination({
 }: IOURequestStepDestinationProps) {
     const [policy, policyMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${explictPolicyID ?? IOU.getIOURequestPolicyID(transaction, report)}`);
     const {accountID} = useCurrentUserPersonalDetails();
-    const policyExpenseReport = ReportUtils.getPolicyExpenseChat(accountID, policy?.id ?? '-1');
+    const policyExpenseReport = policy?.id ? ReportUtils.getPolicyExpenseChat(accountID, policy.id) : undefined;
 
     const customUnit = PolicyUtils.getPerDiemCustomUnit(policy);
     const selectedDestination = transaction?.comment?.customUnit?.customUnitRateID;
@@ -70,10 +70,13 @@ function IOURequestStepDestination({
     };
 
     const updateDestination = (destination: ListItem & {currency: string}) => {
+        if (isEmptyObject(customUnit)) {
+            return;
+        }
         if (selectedDestination !== destination.keyForList) {
             if (openedFromStartPage) {
                 IOU.setMoneyRequestParticipantsFromReport(transactionID, policyExpenseReport);
-                IOU.setCustomUnitID(transactionID, customUnit?.customUnitID ?? '');
+                IOU.setCustomUnitID(transactionID, customUnit.customUnitID);
                 IOU.setMoneyRequestCategory(transactionID, customUnit?.defaultCategory ?? '');
             }
             IOU.setCustomUnitRateID(transactionID, destination.keyForList ?? '');
@@ -132,7 +135,7 @@ function IOURequestStepDestination({
                                 style={[styles.w100]}
                                 onPress={() => {
                                     InteractionManager.runAfterInteractions(() => {
-                                        Navigation.navigate(ROUTES.WORKSPACE_PER_DIEM.getRoute(policy?.id ?? '-1'));
+                                        Navigation.navigate(ROUTES.WORKSPACE_PER_DIEM.getRoute(policy.id));
                                     });
                                 }}
                                 text={translate('workspace.perDiem.editPerDiemRates')}
@@ -142,10 +145,10 @@ function IOURequestStepDestination({
                     )}
                 </View>
             )}
-            {!shouldShowEmptyState && !isLoading && !shouldShowOfflineView && (
+            {!shouldShowEmptyState && !isLoading && !shouldShowOfflineView && !!policy?.id && (
                 <DestinationPicker
                     selectedDestination={selectedDestination}
-                    policyID={report?.policyID ?? policy?.id ?? '-1'}
+                    policyID={policy.id}
                     onSubmit={updateDestination}
                 />
             )}

diff --git a/src/pages/iou/request/step/IOURequestStepPerDiemWorkspace.tsx b/src/pages/iou/request/step/IOURequestStepPerDiemWorkspace.tsx
@@ -61,7 +61,10 @@ function IOURequestStepPerDiemWorkspace({
     }, [allPolicies, currentUserLogin, selectedWorkspace]);
 
     const selectWorkspace = (item: WorkspaceListItem) => {
-        const policyExpenseReportID = ReportUtils.getPolicyExpenseChat(accountID, item.value)?.reportID ?? '-1';
+        const policyExpenseReportID = ReportUtils.getPolicyExpenseChat(accountID, item.value)?.reportID;
+        if (!policyExpenseReportID) {
+            return;
+        }
         const selectedPolicy = PolicyUtils.getPolicy(item.value, allPolicies);
         const perDiemUnit = PolicyUtils.getPerDiemCustomUnit(selectedPolicy);
         IOU.setMoneyRequestParticipants(transactionID, [

diff --git a/src/pages/iou/request/step/IOURequestStepSubrate.tsx b/src/pages/iou/request/step/IOURequestStepSubrate.tsx
@@ -1,7 +1,6 @@
 import {useNavigation} from '@react-navigation/native';
 import React, {useState} from 'react';
 import {View} from 'react-native';
-import {useOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import ConfirmModal from '@components/ConfirmModal';
@@ -18,6 +17,7 @@ import ValuePicker from '@components/ValuePicker';
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import usePermissions from '@hooks/usePermissions';
+import usePolicy from '@hooks/usePolicy';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as ErrorUtils from '@libs/ErrorUtils';
@@ -69,7 +69,7 @@ function IOURequestStepWaypoint({
 }: IOURequestStepWaypointProps) {
     const styles = useThemeStyles();
     const {canUseCombinedTrackSubmit} = usePermissions();
-    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? '-1'}`);
+    const policy = usePolicy(report?.policyID);
     const customUnit = PolicyUtils.getPerDiemCustomUnit(policy);
     const {windowWidth} = useWindowDimensions();
     const [isDeleteStopModalOpen, setIsDeleteStopModalOpen] = useState(false);
@@ -79,9 +79,9 @@ function IOURequestStepWaypoint({
     const {translate} = useLocalize();
     const {inputCallbackRef} = useAutoFocusInput();
     const parsedIndex = parseInt(pageIndex, 10);
-    const selectedDestination = transaction?.comment?.customUnit?.customUnitRateID ?? '';
+    const selectedDestination = transaction?.comment?.customUnit?.customUnitRateID;
     const allSubrates = transaction?.comment?.customUnit?.subRates ?? [];
-    const allPossibleSubrates = customUnit?.rates?.[selectedDestination]?.subRates ?? [];
+    const allPossibleSubrates = selectedDestination ? customUnit?.rates?.[selectedDestination]?.subRates ?? [] : [];
     const currentSubrate: CommentSubrate | undefined = allSubrates.at(parsedIndex) ?? undefined;
     const totalSubrateCount = allPossibleSubrates.length;
     const filledSubrateCount = allSubrates.length;

diff --git a/src/pages/iou/request/step/IOURequestStepTime.tsx b/src/pages/iou/request/step/IOURequestStepTime.tsx
@@ -78,7 +78,7 @@ function IOURequestStepTime({
         const newStart = DateUtils.combineDateAndTime(value.startTime, value.startDate);
         const newEnd = DateUtils.combineDateAndTime(value.endTime, value.endDate);
 
-        IOU.setMoneyRequestDateAttribute(transaction?.transactionID ?? '-1', newStart, newEnd);
+        IOU.setMoneyRequestDateAttribute(transactionID, newStart, newEnd);
 
         if (backTo) {
             navigateBack();

diff --git a/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx b/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
@@ -54,7 +54,7 @@ export default function <TProps extends WithFullTransactionOrNotFoundProps<Money
     // eslint-disable-next-line rulesdir/no-negated-variables
     function WithFullTransactionOrNotFound(props: Omit<TProps, keyof WithFullTransactionOrNotFoundOnyxProps>, ref: ForwardedRef<TRef>) {
         const {route} = props;
-        const transactionID = route.params.transactionID ?? -1;
+        const transactionID = route.params.transactionID;
         const userAction = 'action' in route.params && route.params.action ? route.params.action : CONST.IOU.ACTION.CREATE;
 
         const shouldUseTransactionDraft = IOUUtils.shouldUseTransactionDraft(userAction);

diff --git a/src/pages/iou/request/step/withWritableReportOrNotFound.tsx b/src/pages/iou/request/step/withWritableReportOrNotFound.tsx
@@ -56,9 +56,9 @@ export default function <TProps extends WithWritableReportOrNotFoundProps<MoneyR
     // eslint-disable-next-line rulesdir/no-negated-variables
     function WithWritableReportOrNotFound(props: Omit<TProps, keyof WithWritableReportOrNotFoundOnyxProps>, ref: ForwardedRef<TRef>) {
         const {route} = props;
-        const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID ?? '-1'}`);
+        const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID}`);
         const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP);
-        const [reportDraft] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_DRAFT}${route.params.reportID ?? '-1'}`);
+        const [reportDraft] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_DRAFT}${route.params.reportID}`);
 
         const iouTypeParamIsInvalid = !Object.values(CONST.IOU.TYPE)
             .filter((type) => shouldIncludeDeprecatedIOUType || (type !== CONST.IOU.TYPE.REQUEST && type !== CONST.IOU.TYPE.SEND))

diff --git a/src/pages/workspace/perDiem/ImportedPerDiemPage.tsx b/src/pages/workspace/perDiem/ImportedPerDiemPage.tsx
@@ -98,7 +98,7 @@ function ImportedPerDiemPage({route}: ImportedPerDiemPageProps) {
     const importPerDiemRates = useCallback(() => {
         setIsValidationEnabled(true);
         const errors = validate();
-        if (Object.keys(errors).length > 0) {
+        if (Object.keys(errors).length > 0 || !perDiemCustomUnit?.customUnitID) {
             return;
         }
 
@@ -122,7 +122,7 @@ function ImportedPerDiemPage({route}: ImportedPerDiemPageProps) {
 
         if (perDiemUnits) {
             setIsImportingPerDiemRates(true);
-            PerDiem.importPerDiemRates(policyID, perDiemCustomUnit?.customUnitID ?? '', perDiemUnits, rowsLength);
+            PerDiem.importPerDiemRates(policyID, perDiemCustomUnit.customUnitID, perDiemUnits, rowsLength);
         }
     }, [validate, spreadsheet?.columns, spreadsheet?.data, containsHeader, policyID, perDiemCustomUnit?.customUnitID]);