From b828e807708f3b6f6de0c01127a16acdd77217d1 Mon Sep 17 00:00:00 2001
From: lorretheboy <lorretheboy@outlook.com>
Date: Fri, 10 Oct 2025 23:16:16 +0800
Subject: [PATCH 1/5] fix: add button is hidden

---
 src/pages/AddUnreportedExpense.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/AddUnreportedExpense.tsx b/src/pages/AddUnreportedExpense.tsx
index e5143d40e3d7..2a2ad9b4c64b 100644
--- a/src/pages/AddUnreportedExpense.tsx
+++ b/src/pages/AddUnreportedExpense.tsx
@@ -217,7 +217,7 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) {
 
     return (
         <ScreenWrapper
-            shouldEnableKeyboardAvoidingView={false}
+            shouldEnableKeyboardAvoidingView
             includeSafeAreaPaddingBottom
             shouldEnablePickerAvoiding={false}
             testID={NewChatSelectorPage.displayName}

From 2a8169b50917da98f51727ed3e56d30cad222b9f Mon Sep 17 00:00:00 2001
From: lorretheboy <lorretheboy@outlook.com>
Date: Fri, 10 Oct 2025 23:32:49 +0800
Subject: [PATCH 2/5] fix: safari

---
 src/pages/AddUnreportedExpense.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/AddUnreportedExpense.tsx b/src/pages/AddUnreportedExpense.tsx
index 2a2ad9b4c64b..9079cb3d5ebf 100644
--- a/src/pages/AddUnreportedExpense.tsx
+++ b/src/pages/AddUnreportedExpense.tsx
@@ -220,6 +220,8 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) {
             shouldEnableKeyboardAvoidingView
             includeSafeAreaPaddingBottom
             shouldEnablePickerAvoiding={false}
+            shouldEnableMaxHeight
+            enableEdgeToEdgeBottomSafeAreaPadding
             testID={NewChatSelectorPage.displayName}
             focusTrapSettings={{active: false}}
         >

From ecac3a06cc3a423ca0e946119814fc35d11b46ed Mon Sep 17 00:00:00 2001
From: lorretheboy <lorretheboy@outlook.com>
Date: Sat, 11 Oct 2025 20:25:26 +0800
Subject: [PATCH 3/5] fix: err message

---
 src/pages/AddUnreportedExpense.tsx | 88 +++++++++++++++++-------------
 1 file changed, 51 insertions(+), 37 deletions(-)

diff --git a/src/pages/AddUnreportedExpense.tsx b/src/pages/AddUnreportedExpense.tsx
index 9079cb3d5ebf..866b0b6fca69 100644
--- a/src/pages/AddUnreportedExpense.tsx
+++ b/src/pages/AddUnreportedExpense.tsx
@@ -1,6 +1,7 @@
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {InteractionManager} from 'react-native';
 import type {OnyxCollection} from 'react-native-onyx';
+import Button from '@components/Button';
 import EmptyStateComponent from '@components/EmptyStateComponent';
 import FormHelpMessage from '@components/FormHelpMessage';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -143,6 +144,54 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) {
         return transactions.length >= CONST.SEARCH_ITEM_LIMIT;
     }, [transactions.length]);
 
+    const handleConfirm = useCallback(() => {
+        if (selectedIds.size === 0) {
+            setErrorMessage(translate('iou.selectUnreportedExpense'));
+            return;
+        }
+        Navigation.dismissModal();
+        // eslint-disable-next-line deprecation/deprecation
+        InteractionManager.runAfterInteractions(() => {
+            if (report && isIOUReport(report)) {
+                convertBulkTrackedExpensesToIOU([...selectedIds], report.reportID);
+            } else {
+                changeTransactionsReport(
+                    [...selectedIds],
+                    report?.reportID ?? CONST.REPORT.UNREPORTED_REPORT_ID,
+                    isASAPSubmitBetaEnabled,
+                    session?.accountID ?? CONST.DEFAULT_NUMBER_ID,
+                    session?.email ?? '',
+                    policy,
+                    reportNextStep,
+                    policyCategories,
+                );
+            }
+        });
+        setErrorMessage('');
+    }, [selectedIds, translate, report, isASAPSubmitBetaEnabled, session?.accountID, session?.email, policy, reportNextStep, policyCategories]);
+
+    const footerContent = useMemo(() => {
+        return (
+            <>
+                {!!errorMessage && (
+                    <FormHelpMessage
+                        style={[styles.ph1, styles.mb2]}
+                        isError
+                        message={errorMessage}
+                    />
+                )}
+                <Button
+                    success
+                    text={translate('iou.addUnreportedExpenseConfirm')}
+                    onPress={handleConfirm}
+                    pressOnEnter
+                    large
+                    style={[styles.justifyContentCenter]}
+                />
+            </>
+        );
+    }, [errorMessage, styles, translate, handleConfirm]);
+
     const headerMessage = useMemo(() => {
         if (debouncedSearchValue.trim() && sections.at(0)?.data.length === 0) {
             return translate('common.noResultsFound');
@@ -255,46 +304,11 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) {
                 canSelectMultiple
                 sections={sections}
                 ListItem={UnreportedExpenseListItem}
-                confirmButtonStyles={[styles.justifyContentCenter]}
-                showConfirmButton
-                confirmButtonText={translate('iou.addUnreportedExpenseConfirm')}
-                onConfirm={() => {
-                    if (selectedIds.size === 0) {
-                        setErrorMessage(translate('iou.selectUnreportedExpense'));
-                        return;
-                    }
-                    Navigation.dismissModal();
-                    // eslint-disable-next-line deprecation/deprecation
-                    InteractionManager.runAfterInteractions(() => {
-                        if (report && isIOUReport(report)) {
-                            convertBulkTrackedExpensesToIOU([...selectedIds], report.reportID);
-                        } else {
-                            changeTransactionsReport(
-                                [...selectedIds],
-                                report?.reportID ?? CONST.REPORT.UNREPORTED_REPORT_ID,
-                                isASAPSubmitBetaEnabled,
-                                session?.accountID ?? CONST.DEFAULT_NUMBER_ID,
-                                session?.email ?? '',
-                                policy,
-                                reportNextStep,
-                                policyCategories,
-                            );
-                        }
-                    });
-                    setErrorMessage('');
-                }}
                 onEndReached={fetchMoreUnreportedTransactions}
                 onEndReachedThreshold={0.75}
                 listFooterContent={shouldShowUnreportedTransactionsSkeletons ? <UnreportedExpensesSkeleton fixedNumberOfItems={3} /> : undefined}
-            >
-                {!!errorMessage && (
-                    <FormHelpMessage
-                        style={[styles.mb2, styles.ph4]}
-                        isError
-                        message={errorMessage}
-                    />
-                )}
-            </SelectionList>
+                footerContent={footerContent}
+            />
         </ScreenWrapper>
     );
 }

From c2c8fe6dfee27a8676d8306093ca6a7cc6af9b5f Mon Sep 17 00:00:00 2001
From: lorretheboy <lorretheboy@outlook.com>
Date: Sat, 11 Oct 2025 20:44:20 +0800
Subject: [PATCH 4/5] fix: empty search

---
 src/pages/AddUnreportedExpense.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pages/AddUnreportedExpense.tsx b/src/pages/AddUnreportedExpense.tsx
index 866b0b6fca69..eec0dac2cfe9 100644
--- a/src/pages/AddUnreportedExpense.tsx
+++ b/src/pages/AddUnreportedExpense.tsx
@@ -111,8 +111,13 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) {
 
     const styles = useThemeStyles();
     const selectionListRef = useRef<SelectionListHandle>(null);
+
+    const shouldShowTextInput = useMemo(() => {
+        return transactions.length >= CONST.SEARCH_ITEM_LIMIT;
+    }, [transactions.length]);
+
     const filteredTransactions = useMemo(() => {
-        if (!debouncedSearchValue.trim()) {
+        if (!debouncedSearchValue.trim() || !shouldShowTextInput) {
             return transactions;
         }
 
@@ -136,14 +141,10 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) {
 
             return searchableFields;
         });
-    }, [transactions, debouncedSearchValue]);
+    }, [debouncedSearchValue, shouldShowTextInput, transactions]);
 
     const sections: Array<SectionListDataType<Transaction & ListItem>> = useMemo(() => createUnreportedExpenseSections(filteredTransactions), [filteredTransactions]);
 
-    const shouldShowTextInput = useMemo(() => {
-        return transactions.length >= CONST.SEARCH_ITEM_LIMIT;
-    }, [transactions.length]);
-
     const handleConfirm = useCallback(() => {
         if (selectedIds.size === 0) {
             setErrorMessage(translate('iou.selectUnreportedExpense'));

From a78f3cecaaae6d81cb9d5c0f4db566501a67ded6 Mon Sep 17 00:00:00 2001
From: lorretheboy <lorretheboy@outlook.com>
Date: Sun, 12 Oct 2025 02:47:43 +0800
Subject: [PATCH 5/5] fix: add addBottomSafeAreaPadding

---
 src/pages/AddUnreportedExpense.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/AddUnreportedExpense.tsx b/src/pages/AddUnreportedExpense.tsx
index eec0dac2cfe9..c1c18f55be9d 100644
--- a/src/pages/AddUnreportedExpense.tsx
+++ b/src/pages/AddUnreportedExpense.tsx
@@ -183,11 +183,12 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) {
                 )}
                 <Button
                     success
+                    large
+                    style={[styles.w100, styles.justifyContentCenter]}
                     text={translate('iou.addUnreportedExpenseConfirm')}
                     onPress={handleConfirm}
                     pressOnEnter
-                    large
-                    style={[styles.justifyContentCenter]}
+                    enterKeyEventListenerPriority={1}
                 />
             </>
         );
@@ -307,6 +308,7 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) {
                 ListItem={UnreportedExpenseListItem}
                 onEndReached={fetchMoreUnreportedTransactions}
                 onEndReachedThreshold={0.75}
+                addBottomSafeAreaPadding
                 listFooterContent={shouldShowUnreportedTransactionsSkeletons ? <UnreportedExpensesSkeleton fixedNumberOfItems={3} /> : undefined}
                 footerContent={footerContent}
             />