From 73360daa970b4c3a5db1a8218fc624b8965be431 Mon Sep 17 00:00:00 2001
From: Yauheni Horbach <HorbachZhenja@yandex.by>
Date: Tue, 3 Jun 2025 10:37:56 +0200
Subject: [PATCH 1/4] Fix 63309 and 63308

---
 src/libs/actions/IOU.ts                | 1 +
 src/pages/iou/SplitExpenseEditPage.tsx | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index b6c9b35084eb..2a313eb572f9 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -11652,6 +11652,7 @@ function saveSplitTransactions(draftTransaction: OnyxEntry<OnyxTypes.Transaction
             policyParams,
             transactionParams,
             moneyRequestReportID: report?.reportID,
+            existingTransaction: originalTransaction,
             existingTransactionID,
             isSplitExpense: true,
         });
diff --git a/src/pages/iou/SplitExpenseEditPage.tsx b/src/pages/iou/SplitExpenseEditPage.tsx
index 74f5c0579afc..004e7f94cd0e 100644
--- a/src/pages/iou/SplitExpenseEditPage.tsx
+++ b/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';
@@ -59,7 +60,7 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
                         })}
                         onBackButtonPress={() => Navigation.goBack(backTo)}
                     />
-                    <View style={[styles.flex1]}>
+                    <ScrollView>
                         <MenuItemWithTopDescription
                             shouldShowRightIcon
                             shouldRenderAsHTML
@@ -146,7 +147,7 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
                             style={[styles.moneyRequestMenuItem]}
                             titleStyle={styles.flex1}
                         />
-                    </View>
+                    </ScrollView>
                     <FixedFooter style={styles.mtAuto}>
                         {Number(splitExpensesList?.length) > 2 && (
                             <Button

From 2a856c028e668af51325dfe48d5733671ca49ae8 Mon Sep 17 00:00:00 2001
From: Yauheni Horbach <HorbachZhenja@yandex.by>
Date: Tue, 3 Jun 2025 18:17:03 +0200
Subject: [PATCH 2/4] Fix 63364

---
 src/pages/iou/SplitExpenseEditPage.tsx | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/pages/iou/SplitExpenseEditPage.tsx b/src/pages/iou/SplitExpenseEditPage.tsx
index 004e7f94cd0e..89bdf3872ffa 100644
--- a/src/pages/iou/SplitExpenseEditPage.tsx
+++ b/src/pages/iou/SplitExpenseEditPage.tsx
@@ -16,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';
@@ -32,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]);
@@ -46,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}>
@@ -82,7 +91,7 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
                             titleWrapperStyle={styles.flex1}
                             numberOfLinesTitle={2}
                         />
-                        {!!policy?.areCategoriesEnabled && (
+                        {shouldShowCategory && (
                             <MenuItemWithTopDescription
                                 shouldShowRightIcon
                                 key={translate('common.category')}
@@ -104,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(

From 4a6b3dd4cb1c1cb9ad987fcf3789cce21175366f Mon Sep 17 00:00:00 2001
From: Yauheni Horbach <HorbachZhenja@yandex.by>
Date: Tue, 3 Jun 2025 19:38:13 +0200
Subject: [PATCH 3/4] Fix 63376

---
 src/pages/iou/SplitExpenseEditPage.tsx | 62 +++++++++++++++-----------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/pages/iou/SplitExpenseEditPage.tsx b/src/pages/iou/SplitExpenseEditPage.tsx
index 89bdf3872ffa..4bcda85d5792 100644
--- a/src/pages/iou/SplitExpenseEditPage.tsx
+++ b/src/pages/iou/SplitExpenseEditPage.tsx
@@ -15,12 +15,13 @@ import {convertToDisplayString} from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SplitExpenseParamList} from '@libs/Navigation/types';
+import {hasEnabledOptions} from '@libs/OptionsListUtils';
 import Parser from '@libs/Parser';
-import {getPolicy, getTagLists} from '@libs/PolicyUtils';
+import {getPolicy, getTagLists, isMultiLevelTags as isMultiLevelTagsPolicyUtils} 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 {getTag, getTagForDisplay} from '@libs/TransactionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -55,7 +56,8 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
     const transactionTag = getTag(splitExpenseDraftTransaction);
     const policyTagLists = useMemo(() => getTagLists(policyTags), [policyTags]);
 
-    const shouldShowTag = !!policy?.areTagsEnabled && !!(transactionTag || hasEnabledTags(policyTagLists));
+    const shouldShowTags = !!policy?.areTagsEnabled && !!(transactionTag || hasEnabledTags(policyTagLists));
+    const isMultilevelTags = useMemo(() => isMultiLevelTagsPolicyUtils(policyTags), [policyTags]);
     const shouldShowCategory = !!policy?.areCategoriesEnabled && !!policyCategories;
 
     return (
@@ -113,29 +115,37 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
                                 titleStyle={styles.flex1}
                             />
                         )}
-                        {shouldShowTag && (
-                            <MenuItemWithTopDescription
-                                shouldShowRightIcon
-                                key={translate('workspace.common.tags')}
-                                description={translate('workspace.common.tags')}
-                                title={transactionTag}
-                                numberOfLinesTitle={2}
-                                onPress={() => {
-                                    Navigation.navigate(
-                                        ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(
-                                            CONST.IOU.ACTION.EDIT,
-                                            CONST.IOU.TYPE.SPLIT_EXPENSE,
-                                            0,
-                                            CONST.IOU.OPTIMISTIC_TRANSACTION_ID,
-                                            reportID,
-                                            Navigation.getActiveRoute(),
-                                        ),
-                                    );
-                                }}
-                                style={[styles.moneyRequestMenuItem]}
-                                titleStyle={styles.flex1}
-                            />
-                        )}
+                        {policyTagLists.map(({name, required, tags}, index) => {
+                            const isTagRequired = required ?? false;
+                            const shouldShow = shouldShowTags && (!isMultilevelTags || hasEnabledOptions(tags));
+                            if (!shouldShow) {
+                                return null;
+                            }
+                            return (
+                                <MenuItemWithTopDescription
+                                    key={name}
+                                    shouldShowRightIcon
+                                    title={getTagForDisplay(splitExpenseDraftTransaction, index)}
+                                    description={name}
+                                    numberOfLinesTitle={2}
+                                    onPress={() => {
+                                        Navigation.navigate(
+                                            ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(
+                                                CONST.IOU.ACTION.EDIT,
+                                                CONST.IOU.TYPE.SPLIT_EXPENSE,
+                                                index,
+                                                CONST.IOU.OPTIMISTIC_TRANSACTION_ID,
+                                                reportID,
+                                                Navigation.getActiveRoute(),
+                                            ),
+                                        );
+                                    }}
+                                    rightLabel={isTagRequired ? translate('common.required') : ''}
+                                    style={[styles.moneyRequestMenuItem]}
+                                    titleStyle={styles.flex1}
+                                />
+                            );
+                        })}
                         <MenuItemWithTopDescription
                             shouldShowRightIcon
                             key={translate('common.date')}

From cc26e0ae51b04ff78baf5c8f7a9a6baa754295fa Mon Sep 17 00:00:00 2001
From: Yauheni Horbach <HorbachZhenja@yandex.by>
Date: Wed, 4 Jun 2025 22:12:25 +0200
Subject: [PATCH 4/4] Revert fix for 63376

---
 src/pages/iou/SplitExpenseEditPage.tsx | 62 +++++++++++---------------
 1 file changed, 26 insertions(+), 36 deletions(-)

diff --git a/src/pages/iou/SplitExpenseEditPage.tsx b/src/pages/iou/SplitExpenseEditPage.tsx
index 4bcda85d5792..89bdf3872ffa 100644
--- a/src/pages/iou/SplitExpenseEditPage.tsx
+++ b/src/pages/iou/SplitExpenseEditPage.tsx
@@ -15,13 +15,12 @@ import {convertToDisplayString} from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SplitExpenseParamList} from '@libs/Navigation/types';
-import {hasEnabledOptions} from '@libs/OptionsListUtils';
 import Parser from '@libs/Parser';
-import {getPolicy, getTagLists, isMultiLevelTags as isMultiLevelTagsPolicyUtils} 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, getTagForDisplay} from '@libs/TransactionUtils';
+import {getTag} from '@libs/TransactionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -56,8 +55,7 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
     const transactionTag = getTag(splitExpenseDraftTransaction);
     const policyTagLists = useMemo(() => getTagLists(policyTags), [policyTags]);
 
-    const shouldShowTags = !!policy?.areTagsEnabled && !!(transactionTag || hasEnabledTags(policyTagLists));
-    const isMultilevelTags = useMemo(() => isMultiLevelTagsPolicyUtils(policyTags), [policyTags]);
+    const shouldShowTag = !!policy?.areTagsEnabled && !!(transactionTag || hasEnabledTags(policyTagLists));
     const shouldShowCategory = !!policy?.areCategoriesEnabled && !!policyCategories;
 
     return (
@@ -115,37 +113,29 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
                                 titleStyle={styles.flex1}
                             />
                         )}
-                        {policyTagLists.map(({name, required, tags}, index) => {
-                            const isTagRequired = required ?? false;
-                            const shouldShow = shouldShowTags && (!isMultilevelTags || hasEnabledOptions(tags));
-                            if (!shouldShow) {
-                                return null;
-                            }
-                            return (
-                                <MenuItemWithTopDescription
-                                    key={name}
-                                    shouldShowRightIcon
-                                    title={getTagForDisplay(splitExpenseDraftTransaction, index)}
-                                    description={name}
-                                    numberOfLinesTitle={2}
-                                    onPress={() => {
-                                        Navigation.navigate(
-                                            ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(
-                                                CONST.IOU.ACTION.EDIT,
-                                                CONST.IOU.TYPE.SPLIT_EXPENSE,
-                                                index,
-                                                CONST.IOU.OPTIMISTIC_TRANSACTION_ID,
-                                                reportID,
-                                                Navigation.getActiveRoute(),
-                                            ),
-                                        );
-                                    }}
-                                    rightLabel={isTagRequired ? translate('common.required') : ''}
-                                    style={[styles.moneyRequestMenuItem]}
-                                    titleStyle={styles.flex1}
-                                />
-                            );
-                        })}
+                        {shouldShowTag && (
+                            <MenuItemWithTopDescription
+                                shouldShowRightIcon
+                                key={translate('workspace.common.tags')}
+                                description={translate('workspace.common.tags')}
+                                title={transactionTag}
+                                numberOfLinesTitle={2}
+                                onPress={() => {
+                                    Navigation.navigate(
+                                        ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(
+                                            CONST.IOU.ACTION.EDIT,
+                                            CONST.IOU.TYPE.SPLIT_EXPENSE,
+                                            0,
+                                            CONST.IOU.OPTIMISTIC_TRANSACTION_ID,
+                                            reportID,
+                                            Navigation.getActiveRoute(),
+                                        ),
+                                    );
+                                }}
+                                style={[styles.moneyRequestMenuItem]}
+                                titleStyle={styles.flex1}
+                            />
+                        )}
                         <MenuItemWithTopDescription
                             shouldShowRightIcon
                             key={translate('common.date')}