Skip to content

Commit fe2af03

Browse files
committed
Drop SplitExpenseItems.ts and SplitTransactionUpdate.ts extractions
Reviewer asked to keep PR Expensify#87957 small. Roll back the additional file extractions so this PR is just the move of createDistanceRequest, createSplitsAndOnyxData, and getOrCreateOptimisticSplitChatReport from IOU/index.ts to IOU/Split.ts. The SplitExpenseItems and SplitTransactionUpdate extractions will be follow-up PRs. - Restore the 14 functions back into Split.ts (using main's structure as base so positions match main exactly). - Delete src/libs/actions/IOU/SplitExpenseItems.ts and src/libs/actions/IOU/SplitTransactionUpdate.ts. - Revert consumer imports back to @libs/actions/IOU/Split.
1 parent 110a560 commit fe2af03

11 files changed

Lines changed: 2095 additions & 2127 deletions

src/hooks/useDeleteTransactions.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import {useSearchStateContext} from '@components/Search/SearchContext';
55
import {getIOURequestPolicyID} from '@libs/actions/IOU';
66
import {deleteMoneyRequest} from '@libs/actions/IOU/DeleteMoneyRequest';
77
import {getIOUActionForTransactions} from '@libs/actions/IOU/Duplicate';
8-
import {initSplitExpenseItemData} from '@libs/actions/IOU/SplitExpenseItems';
9-
import {updateSplitTransactions} from '@libs/actions/IOU/SplitTransactionUpdate';
8+
import {initSplitExpenseItemData, updateSplitTransactions} from '@libs/actions/IOU/Split';
109
import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
1110
import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
1211
import {getActiveGroupSearchHashes} from '@libs/SearchUIUtils';

src/libs/actions/IOU/Split.ts

Lines changed: 2079 additions & 146 deletions
Large diffs are not rendered by default.

src/libs/actions/IOU/SplitExpenseItems.ts

Lines changed: 0 additions & 618 deletions
This file was deleted.

src/libs/actions/IOU/SplitTransactionUpdate.ts

Lines changed: 0 additions & 1349 deletions
This file was deleted.

src/libs/actions/SplitExpenses.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import ROUTES from '@src/ROUTES';
1313
import type {Policy, Report, Transaction} from '@src/types/onyx';
1414
import type {Attendee} from '@src/types/onyx/IOU';
1515
import type {TransactionCustomUnit} from '@src/types/onyx/Transaction';
16-
import {initSplitExpenseItemData, updateSplitExpenseDistanceFromAmount} from './IOU/SplitExpenseItems';
16+
import {initSplitExpenseItemData, updateSplitExpenseDistanceFromAmount} from './IOU/Split';
1717

1818
// We use connectWithoutView because `initSplitExpense` doesn't affect the UI rendering and
1919
// this avoids unnecessary re-rendering for components when any transaction changes. This data should ONLY

src/pages/iou/SplitExpenseCreateDateRagePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import useLocalize from '@hooks/useLocalize';
1515
import useOnyx from '@hooks/useOnyx';
1616
import usePolicy from '@hooks/usePolicy';
1717
import useThemeStyles from '@hooks/useThemeStyles';
18-
import {resetSplitExpensesByDateRange} from '@libs/actions/IOU/SplitExpenseItems';
18+
import {resetSplitExpensesByDateRange} from '@libs/actions/IOU/Split';
1919
import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
2020
import Navigation from '@libs/Navigation/Navigation';
2121
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';

src/pages/iou/SplitExpenseEditPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import usePolicy from '@hooks/usePolicy';
1818
import usePrevious from '@hooks/usePrevious';
1919
import useThemeStyles from '@hooks/useThemeStyles';
2020
import type {ViolationField} from '@hooks/useViolations';
21-
import {initDraftSplitExpenseDataForEdit, removeSplitExpenseField, updateSplitExpenseField} from '@libs/actions/IOU/SplitExpenseItems';
21+
import {initDraftSplitExpenseDataForEdit, removeSplitExpenseField, updateSplitExpenseField} from '@libs/actions/IOU/Split';
2222
import {openPolicyCategoriesPage} from '@libs/actions/Policy/Category';
2323
import {openPolicyTagsPage} from '@libs/actions/Policy/Tag';
2424
import {getDecodedCategoryName, isCategoryDescriptionRequired} from '@libs/CategoryUtils';

src/pages/iou/SplitExpensePage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import {
3535
initDraftSplitExpenseDataForEdit,
3636
initSplitExpenseItemData,
3737
updateSplitExpenseAmountField,
38-
} from '@libs/actions/IOU/SplitExpenseItems';
39-
import {updateSplitTransactionsFromSplitExpensesFlow} from '@libs/actions/IOU/SplitTransactionUpdate';
38+
updateSplitTransactionsFromSplitExpensesFlow,
39+
} from '@libs/actions/IOU/Split';
4040
import {convertToBackendAmount} from '@libs/CurrencyUtils';
4141
import DateUtils from '@libs/DateUtils';
4242
import {canUseTouchScreen} from '@libs/DeviceCapabilities';

tests/actions/IOUTest.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ import {
2525
shouldOptimisticallyUpdateSearch,
2626
} from '@libs/actions/IOU';
2727
import {putOnHold} from '@libs/actions/IOU/Hold';
28-
import {completeSplitBill, splitBill, startSplitBill} from '@libs/actions/IOU/Split';
29-
import {updateSplitTransactionsFromSplitExpensesFlow} from '@libs/actions/IOU/SplitTransactionUpdate';
28+
import {completeSplitBill, splitBill, startSplitBill, updateSplitTransactionsFromSplitExpensesFlow} from '@libs/actions/IOU/Split';
3029
import {requestMoney, trackExpense} from '@libs/actions/IOU/TrackExpense';
3130
import {removeMoneyRequestOdometerImage, setMoneyRequestOdometerImage} from '@libs/actions/OdometerTransactionUtils';
3231
import initOnyxDerivedValues from '@libs/actions/OnyxDerived';

tests/actions/IOUTest/SplitTest.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import Onyx from 'react-native-onyx';
55
import type {OnyxCollection, OnyxEntry, OnyxMergeCollectionInput} from 'react-native-onyx';
66
import {getReportPreviewAction} from '@libs/actions/IOU';
77
import {putOnHold} from '@libs/actions/IOU/Hold';
8-
import {createDistanceRequest} from '@libs/actions/IOU/Split';
98
import {requestMoney} from '@libs/actions/IOU/TrackExpense';
109
import initOnyxDerivedValues from '@libs/actions/OnyxDerived';
1110
import {createWorkspace, generatePolicyID, setWorkspaceApprovalMode} from '@libs/actions/Policy/Policy';
@@ -15,18 +14,23 @@ import {WRITE_COMMANDS} from '@libs/API/types';
1514
import {rand64} from '@libs/NumberUtils';
1615
import {getIOUActionForReportID, getOriginalMessage, isActionOfType, isAddCommentAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
1716
import {buildOptimisticIOUReportAction, getAncestors, getReportOrDraftReport} from '@libs/ReportUtils';
18-
import {completeSplitBill, setDraftSplitTransaction, splitBill, startSplitBill} from '@userActions/IOU/Split';
1917
import {
2018
addSplitExpenseField,
19+
completeSplitBill,
20+
createDistanceRequest,
2121
evenlyDistributeSplitExpenseAmounts,
2222
initDraftSplitExpenseDataForEdit,
2323
initSplitExpenseItemData,
2424
removeSplitExpenseField,
2525
resetSplitExpensesByDateRange,
26+
setDraftSplitTransaction,
27+
splitBill,
28+
startSplitBill,
2629
updateSplitExpenseAmountField,
2730
updateSplitExpenseField,
28-
} from '@userActions/IOU/SplitExpenseItems';
29-
import {updateSplitTransactions, updateSplitTransactionsFromSplitExpensesFlow} from '@userActions/IOU/SplitTransactionUpdate';
31+
updateSplitTransactions,
32+
updateSplitTransactionsFromSplitExpensesFlow,
33+
} from '@userActions/IOU/Split';
3034
import CONST from '@src/CONST';
3135
import IntlStore from '@src/languages/IntlStore';
3236
import DateUtils from '@src/libs/DateUtils';

0 commit comments

Comments
 (0)