Merge pull request Expensify#63323 from ZhenjaHorbach/split-expense-flow-fix-new-bugs

Split expense flow (bug fixes)

Author: lakchote

src/libs/actions/IOU.ts

@@ -11906,6 +11906,7 @@ function saveSplitTransactions(draftTransaction: OnyxEntry<OnyxTypes.Transaction
             policyParams,
             transactionParams,
             moneyRequestReportID: report?.reportID,
+            existingTransaction: originalTransaction,
             existingTransactionID,
             isSplitExpense: true,
         });

src/pages/iou/SplitExpenseEditPage.tsx

@@ -7,6 +7,7 @@ import FixedFooter from '@components/FixedFooter';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {removeSplitExpenseField, updateSplitExpenseField} from '@libs/actions/IOU';
@@ -15,9 +16,11 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SplitExpenseParamList} from '@libs/Navigation/types';
 import Parser from '@libs/Parser';
-import {getPolicy} from '@libs/PolicyUtils';
+import {getPolicy, getTagLists} from '@libs/PolicyUtils';
 import type {TransactionDetails} from '@libs/ReportUtils';
 import {getParsedComment, getReportOrDraftReport, getTransactionDetails} from '@libs/ReportUtils';
+import {hasEnabledTags} from '@libs/TagsOptionsListUtils';
+import {getTag} from '@libs/TransactionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -31,9 +34,13 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
     const {translate} = useLocalize();
 
     const {reportID, transactionID, splitExpenseTransactionID = '', backTo} = route.params;
+    const report = getReportOrDraftReport(reportID);
 
     const [splitExpenseDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`, {canBeMissing: false});
     const splitExpenseDraftTransactionDetails = useMemo<Partial<TransactionDetails>>(() => getTransactionDetails(splitExpenseDraftTransaction) ?? {}, [splitExpenseDraftTransaction]);
+    const policy = getPolicy(report?.policyID);
+    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`, {canBeMissing: false});
+    const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${report?.policyID}`, {canBeMissing: false});
 
     const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {canBeMissing: false});
     const transactionDetails = useMemo<Partial<TransactionDetails>>(() => getTransactionDetails(transaction) ?? {}, [transaction]);
@@ -45,8 +52,11 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
     const currentAmount = transactionDetailsAmount >= 0 ? Math.abs(Number(splitExpenseDraftTransactionDetails?.amount)) : Number(splitExpenseDraftTransactionDetails?.amount);
     const currentDescription = getParsedComment(Parser.htmlToMarkdown(splitExpenseDraftTransactionDetails?.comment ?? ''));
 
-    const report = getReportOrDraftReport(reportID);
-    const policy = getPolicy(report?.policyID);
+    const transactionTag = getTag(splitExpenseDraftTransaction);
+    const policyTagLists = useMemo(() => getTagLists(policyTags), [policyTags]);
+
+    const shouldShowTag = !!policy?.areTagsEnabled && !!(transactionTag || hasEnabledTags(policyTagLists));
+    const shouldShowCategory = !!policy?.areCategoriesEnabled && !!policyCategories;
 
     return (
         <ScreenWrapper testID={SplitExpenseEditPage.displayName}>
@@ -59,7 +69,7 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
                         })}
                         onBackButtonPress={() => Navigation.goBack(backTo)}
                     />
-                    <View style={[styles.flex1]}>
+                    <ScrollView>
                         <MenuItemWithTopDescription
                             shouldShowRightIcon
                             shouldRenderAsHTML
@@ -81,7 +91,7 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
                             titleWrapperStyle={styles.flex1}
                             numberOfLinesTitle={2}
                         />
-                        {!!policy?.areCategoriesEnabled && (
+                        {shouldShowCategory && (
                             <MenuItemWithTopDescription
                                 shouldShowRightIcon
                                 key={translate('common.category')}
@@ -103,12 +113,12 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
                                 titleStyle={styles.flex1}
                             />
                         )}
-                        {!!policy?.areTagsEnabled && (
+                        {shouldShowTag && (
                             <MenuItemWithTopDescription
                                 shouldShowRightIcon
                                 key={translate('workspace.common.tags')}
                                 description={translate('workspace.common.tags')}
-                                title={splitExpenseDraftTransactionDetails?.tag}
+                                title={transactionTag}
                                 numberOfLinesTitle={2}
                                 onPress={() => {
                                     Navigation.navigate(
@@ -146,7 +156,7 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
                             style={[styles.moneyRequestMenuItem]}
                             titleStyle={styles.flex1}
                         />
-                    </View>
+                    </ScrollView>
                     <FixedFooter style={styles.mtAuto}>
                         {Number(splitExpensesList?.length) > 2 && (
                             <Button