From a76a0a4179d8b5bc8ba5929138f82f1159d9c27a Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 25 Jun 2025 15:44:40 +0200
Subject: [PATCH 1/9] add dropdown button to empty report

---
 src/components/EmptyStateComponent/index.tsx  | 38 ++++++++++++------
 src/components/EmptyStateComponent/types.ts   | 11 ++++-
 .../MoneyRequestReportActionsList.tsx         |  2 +-
 .../MoneyRequestReportTransactionList.tsx     |  2 +-
 .../SearchMoneyRequestReportEmptyState.tsx    | 40 ++++++++++++++++++-
 src/languages/en.ts                           |  2 +-
 6 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/src/components/EmptyStateComponent/index.tsx b/src/components/EmptyStateComponent/index.tsx
index 5bd82115fbcd..f4f17d402608 100644
--- a/src/components/EmptyStateComponent/index.tsx
+++ b/src/components/EmptyStateComponent/index.tsx
@@ -3,6 +3,7 @@ import isEmpty from 'lodash/isEmpty';
 import React, {useMemo, useState} from 'react';
 import {View} from 'react-native';
 import Button from '@components/Button';
+import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
 import ImageSVG from '@components/ImageSVG';
 import Lottie from '@components/Lottie';
 import Text from '@components/Text';
@@ -103,19 +104,30 @@ function EmptyStateComponent({
                         {subtitleText ?? <Text style={[styles.textAlignCenter, styles.textSupporting, styles.textNormal]}>{subtitle}</Text>}
                         {children}
                         {!isEmpty(buttons) && (
-                            <View style={[styles.gap2, styles.mt5, !shouldUseNarrowLayout ? styles.flexRow : styles.flexColumn]}>
-                                {buttons?.map(({buttonText, buttonAction, success, icon, isDisabled, style}) => (
-                                    <Button
-                                        key={buttonText}
-                                        success={success}
-                                        onPress={buttonAction}
-                                        text={buttonText}
-                                        icon={icon}
-                                        large
-                                        isDisabled={isDisabled}
-                                        style={[styles.flex1, style]}
-                                    />
-                                ))}
+                            <View style={[styles.gap2, styles.mt5, !shouldUseNarrowLayout ? styles.flexRow : styles.flexColumn, styles.justifyContentCenter]}>
+                                {buttons?.map(({buttonText, buttonAction, success, icon, isDisabled, style, dropDownOptions}) =>
+                                    dropDownOptions ? (
+                                        <ButtonWithDropdownMenu
+                                            onPress={() => {}}
+                                            shouldAlwaysShowDropdownMenu
+                                            customText={buttonText}
+                                            options={dropDownOptions}
+                                            isSplitButton={false}
+                                            style={[styles.flex1, style]}
+                                        />
+                                    ) : (
+                                        <Button
+                                            key={buttonText}
+                                            success={success}
+                                            onPress={buttonAction}
+                                            text={buttonText}
+                                            icon={icon}
+                                            large
+                                            isDisabled={isDisabled}
+                                            style={[styles.flex1, style]}
+                                        />
+                                    ),
+                                )}
                             </View>
                         )}
                     </View>
diff --git a/src/components/EmptyStateComponent/types.ts b/src/components/EmptyStateComponent/types.ts
index a577da797107..a3809c83444d 100644
--- a/src/components/EmptyStateComponent/types.ts
+++ b/src/components/EmptyStateComponent/types.ts
@@ -1,6 +1,7 @@
 import type {ImageStyle} from 'expo-image';
 import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
+import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
 import type DotLottieAnimation from '@components/LottieAnimations/types';
 import type SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
 import type TableRowSkeleton from '@components/Skeletons/TableRowSkeleton';
@@ -9,7 +10,15 @@ import type IconAsset from '@src/types/utils/IconAsset';
 
 type ValidSkeletons = typeof SearchRowSkeleton | typeof TableRowSkeleton;
 type MediaTypes = ValueOf<typeof CONST.EMPTY_STATE_MEDIA>;
-type EmptyStateButton = {buttonText?: string; buttonAction?: () => void; success?: boolean; icon?: IconAsset; isDisabled?: boolean; style?: StyleProp<ViewStyle>};
+type EmptyStateButton = {
+    buttonText?: string;
+    buttonAction?: () => void;
+    success?: boolean;
+    icon?: IconAsset;
+    isDisabled?: boolean;
+    style?: StyleProp<ViewStyle>;
+    dropDownOptions?: Array<DropdownOption<ValueOf<{readonly CREATE_NEW_EXPENSE: 'createNewExpense'; readonly ADD_UNREPORTED_EXPENSE: 'addUnreportedExpense'}>>>;
+};
 
 type SharedProps<T> = {
     SkeletonComponent?: ValidSkeletons;
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
index c974d45758ce..6954b2999780 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
@@ -601,7 +601,7 @@ function MoneyRequestReportActionsList({
                             report={report}
                             policy={policy}
                         />
-                        <SearchMoneyRequestReportEmptyState />
+                        <SearchMoneyRequestReportEmptyState reportId={report.reportID} />
                     </>
                 ) : (
                     <FlatList
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
index af70096f0efd..6784ab7f4f1d 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
@@ -365,7 +365,7 @@ function MoneyRequestReportTransactionList({
                     </Modal>
                 </>
             ) : (
-                <SearchMoneyRequestReportEmptyState />
+                <SearchMoneyRequestReportEmptyState reportId={report.reportID} />
             )}
             <View style={[styles.dFlex, styles.flexRow, listHorizontalPadding, styles.justifyContentBetween, styles.mb2]}>
                 <Animated.Text
diff --git a/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx b/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx
index 5b4591760f07..faba1084e750 100644
--- a/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx
+++ b/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx
@@ -1,17 +1,54 @@
 import React from 'react';
 import {View} from 'react-native';
 import EmptyStateComponent from '@components/EmptyStateComponent';
+import * as Expensicons from '@components/Icon/Expensicons';
 import LottieAnimations from '@components/LottieAnimations';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {shouldRestrictUserBillableActions} from '@libs/SubscriptionUtils';
+import Navigation from '@navigation/Navigation';
+import {startMoneyRequest} from '@userActions/IOU';
+import {openUnreportedExpense} from '@userActions/Report';
 import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {Policy} from '@src/types/onyx';
 
 const minModalHeight = 380;
 
-function SearchMoneyRequestReportEmptyState() {
+function SearchMoneyRequestReportEmptyState({reportId, policy}: {reportId?: string; policy: Policy}) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
+    const addExpenseDropdownOptions = [
+        {
+            value: CONST.REPORT.ADD_EXPENSE_OPTIONS.CREATE_NEW_EXPENSE,
+            text: translate('iou.createNewExpense'),
+            icon: Expensicons.Plus,
+            onSelected: () => {
+                if (!reportId) {
+                    return;
+                }
+                if (policy && shouldRestrictUserBillableActions(policy.id)) {
+                    Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id));
+                    return;
+                }
+                startMoneyRequest(CONST.IOU.TYPE.SUBMIT, reportId);
+            },
+        },
+        {
+            value: CONST.REPORT.ADD_EXPENSE_OPTIONS.ADD_UNREPORTED_EXPENSE,
+            text: translate('iou.addUnreportedExpense'),
+            icon: Expensicons.ReceiptPlus,
+            onSelected: () => {
+                if (policy && shouldRestrictUserBillableActions(policy.id)) {
+                    Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id));
+                    return;
+                }
+                openUnreportedExpense(reportId);
+            },
+        },
+    ];
+
     return (
         <View style={styles.flex1}>
             <EmptyStateComponent
@@ -25,6 +62,7 @@ function SearchMoneyRequestReportEmptyState() {
                 lottieWebViewStyles={styles.emptyStateFolderWebStyles}
                 headerContentStyles={styles.emptyStateFolderWebStyles}
                 minModalHeight={minModalHeight}
+                buttons={[{buttonText: translate('iou.addExpense'), buttonAction: () => {}, success: true, isDisabled: false, dropDownOptions: addExpenseDropdownOptions}]}
             />
         </View>
     );
diff --git a/src/languages/en.ts b/src/languages/en.ts
index b4a5077f2845..3429ed92f34f 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -5712,7 +5712,7 @@ const translations = {
         groupBy: 'Group by',
         moneyRequestReport: {
             emptyStateTitle: 'This report has no expenses.',
-            emptyStateSubtitle: 'You can add expenses to this report \n using the button above.',
+            emptyStateSubtitle: 'You can add expenses to this report \n using the button below or the "Add expense" option in the More menu above.',
         },
         noCategory: 'No category',
         noTag: 'No tag',

From c95eeb173a3a2f2debf7960d5f4a927b34ec3509 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 25 Jun 2025 17:16:02 +0200
Subject: [PATCH 2/9] fix tsx

---
 .../MoneyRequestReportActionsList.tsx                     | 6 +++++-
 .../MoneyRequestReportTransactionList.tsx                 | 8 +++++++-
 .../SearchMoneyRequestReportEmptyState.tsx                | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
index 6954b2999780..3133e12332ff 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
@@ -601,7 +601,10 @@ function MoneyRequestReportActionsList({
                             report={report}
                             policy={policy}
                         />
-                        <SearchMoneyRequestReportEmptyState reportId={report.reportID} />
+                        <SearchMoneyRequestReportEmptyState
+                            reportId={report.reportID}
+                            policy={policy}
+                        />
                     </>
                 ) : (
                     <FlatList
@@ -630,6 +633,7 @@ function MoneyRequestReportActionsList({
                                     hasComments={reportHasComments}
                                     isLoadingInitialReportActions={showReportActionsLoadingState}
                                     scrollToNewTransaction={scrollToNewTransaction}
+                                    policy={policy}
                                 />
                             </>
                         }
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
index 6784ab7f4f1d..57e65af46474 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
@@ -46,6 +46,8 @@ import SearchMoneyRequestReportEmptyState from './SearchMoneyRequestReportEmptyS
 type MoneyRequestReportTransactionListProps = {
     report: OnyxTypes.Report;
 
+    policy?: OnyxTypes.Policy;
+
     /** List of transactions belonging to one report */
     transactions: OnyxTypes.Transaction[];
 
@@ -111,6 +113,7 @@ function MoneyRequestReportTransactionList({
     hasComments,
     isLoadingInitialReportActions: isLoadingReportActions,
     scrollToNewTransaction,
+    policy,
 }: MoneyRequestReportTransactionListProps) {
     useCopySelectionHelper();
     const styles = useThemeStyles();
@@ -365,7 +368,10 @@ function MoneyRequestReportTransactionList({
                     </Modal>
                 </>
             ) : (
-                <SearchMoneyRequestReportEmptyState reportId={report.reportID} />
+                <SearchMoneyRequestReportEmptyState
+                    reportId={report.reportID}
+                    policy={policy}
+                />
             )}
             <View style={[styles.dFlex, styles.flexRow, listHorizontalPadding, styles.justifyContentBetween, styles.mb2]}>
                 <Animated.Text
diff --git a/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx b/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx
index faba1084e750..40617bf0862b 100644
--- a/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx
+++ b/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx
@@ -15,7 +15,7 @@ import type {Policy} from '@src/types/onyx';
 
 const minModalHeight = 380;
 
-function SearchMoneyRequestReportEmptyState({reportId, policy}: {reportId?: string; policy: Policy}) {
+function SearchMoneyRequestReportEmptyState({reportId, policy}: {reportId?: string; policy?: Policy}) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 

From a305fa67326997e0ba5f84c82a437aaa6d3e39f8 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Fri, 27 Jun 2025 16:47:07 +0200
Subject: [PATCH 3/9] add translations

---
 src/languages/de.ts      | 3 ++-
 src/languages/es.ts      | 2 +-
 src/languages/fr.ts      | 2 +-
 src/languages/it.ts      | 2 +-
 src/languages/ja.ts      | 2 +-
 src/languages/nl.ts      | 2 +-
 src/languages/pl.ts      | 2 +-
 src/languages/pt-BR.ts   | 2 +-
 src/languages/zh-hans.ts | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 3d65e58b6ac0..d1fb7d267c7f 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -5775,7 +5775,8 @@ const translations = {
         groupBy: 'Gruppe nach',
         moneyRequestReport: {
             emptyStateTitle: 'Dieser Bericht enthält keine Ausgaben.',
-            emptyStateSubtitle: 'Sie können Ausgaben zu diesem Bericht hinzufügen, indem Sie die Schaltfläche oben verwenden.',
+            emptyStateSubtitle:
+                'Sie können diesem Bericht Ausgaben hinzufügen,\\n indem Sie auf die Schaltfläche unten klicken oder die Option „Ausgabe hinzufügen“ im Menü „Mehr“ oben verwenden.',
         },
         noCategory: 'Keine Kategorie',
         noTag: 'Kein Tag',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 21582335cfa6..c270dcb8d46b 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -5765,7 +5765,7 @@ const translations = {
         groupBy: 'Agrupar por',
         moneyRequestReport: {
             emptyStateTitle: 'Este informe no tiene gastos.',
-            emptyStateSubtitle: 'Puedes añadir gastos a este informe usando el botón de arriba.',
+            emptyStateSubtitle: 'Puedes agregar gastos a este informe\\n usando el botón de abajo o la opción "Agregar gasto" en el menú Más de arriba.',
         },
         noCategory: 'Sin categoría',
         noTag: 'Sin etiqueta',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 22b2b7aee955..b5359b80bc76 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -5785,7 +5785,7 @@ const translations = {
         groupBy: 'Groupe par',
         moneyRequestReport: {
             emptyStateTitle: "Ce rapport n'a pas de dépenses.",
-            emptyStateSubtitle: 'Vous pouvez ajouter des dépenses à ce rapport en utilisant le bouton ci-dessus.',
+            emptyStateSubtitle: "Vous pouvez ajouter des dépenses à ce rapport\\n en utilisant le bouton ci-dessous ou l'option « Ajouter une dépense » dans le menu Plus ci-dessus.",
         },
         noCategory: 'Aucune catégorie',
         noTag: 'Aucun tag',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 70daee6f13ef..c9a5ab080af7 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -5761,7 +5761,7 @@ const translations = {
         groupBy: 'Gruppo per',
         moneyRequestReport: {
             emptyStateTitle: 'Questo report non ha spese.',
-            emptyStateSubtitle: 'Puoi aggiungere spese a questo rapporto utilizzando il pulsante sopra.',
+            emptyStateSubtitle: 'Puoi aggiungere spese a questo report\\n utilizzando il pulsante in basso o l\'opzione "Aggiungi spesa" nel menu Altro sopra.',
         },
         noCategory: 'Nessuna categoria',
         noTag: 'Nessun tag',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index a3b5c1252433..b71373f5603d 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -5705,7 +5705,7 @@ const translations = {
         groupBy: 'グループ',
         moneyRequestReport: {
             emptyStateTitle: 'このレポートには経費がありません。',
-            emptyStateSubtitle: 'このレポートに経費を追加するには、上のボタンを使用してください。',
+            emptyStateSubtitle: 'このレポートに経費を追加するには、\\n 下のボタンを使用するか、上の「その他」メニューから「経費を追加」を選択してください。',
         },
         noCategory: 'カテゴリなし',
         noTag: 'タグなし',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 069b519c2ed0..272df9168b62 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -5748,7 +5748,7 @@ const translations = {
         groupBy: 'Groep per',
         moneyRequestReport: {
             emptyStateTitle: 'Dit rapport heeft geen uitgaven.',
-            emptyStateSubtitle: 'Je kunt uitgaven aan dit rapport toevoegen met de knop hierboven.',
+            emptyStateSubtitle: 'U kunt uitgaven aan dit rapport toevoegen\\n via de knop hieronder of de optie "Uitgave toevoegen" in het menu Meer hierboven.\n' + '\n',
         },
         noCategory: 'Geen categorie',
         noTag: 'Geen tag',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index de01c144f06a..a53d86ef54c6 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -5732,7 +5732,7 @@ const translations = {
         groupBy: 'Agrupar por',
         moneyRequestReport: {
             emptyStateTitle: 'Ten raport nie zawiera wydatków.',
-            emptyStateSubtitle: 'Możesz dodać wydatki do tego raportu, używając przycisku powyżej.',
+            emptyStateSubtitle: 'Możesz dodać wydatki do tego raportu\\n za pomocą przycisku poniżej lub opcji „Dodaj wydatek” w menu Więcej powyżej.',
         },
         noCategory: 'Brak kategorii',
         noTag: 'Brak tagu',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index ca261585617f..29fb6a592e9a 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -5745,7 +5745,7 @@ const translations = {
         groupBy: 'Agrupar por',
         moneyRequestReport: {
             emptyStateTitle: 'Este relatório não possui despesas.',
-            emptyStateSubtitle: 'Você pode adicionar despesas a este relatório usando o botão acima.',
+            emptyStateSubtitle: 'Você pode adicionar despesas a este relatório\\n usando o botão abaixo ou a opção "Adicionar despesa" no menu Mais acima.',
         },
         noCategory: 'Sem categoria',
         noTag: 'Sem etiqueta',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 3abbd4cfb2f5..c2645a38ea8a 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -5643,7 +5643,7 @@ const translations = {
         groupBy: '组别',
         moneyRequestReport: {
             emptyStateTitle: '此报告没有费用。',
-            emptyStateSubtitle: '您可以使用上面的按钮将费用添加到此报告中。',
+            emptyStateSubtitle: '您可以使用下方按钮，或上方“更多”菜单中的“添加费用”选项，将费用添加到此报告中。',
         },
         noCategory: '无类别',
         noTag: '无标签',

From b35bd681a5841402fd0a5e64028fde658ffea465 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Fri, 27 Jun 2025 18:01:07 +0200
Subject: [PATCH 4/9] fix translation

---
 src/languages/nl.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index cc572a1be054..4a1bf4b2711c 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -5982,7 +5982,7 @@ const translations = {
         groupBy: 'Groep per',
         moneyRequestReport: {
             emptyStateTitle: 'Dit rapport heeft geen uitgaven.',
-            emptyStateSubtitle: 'U kunt uitgaven aan dit rapport toevoegen\\n via de knop hieronder of de optie "Uitgave toevoegen" in het menu Meer hierboven.\n' + '\n',
+            emptyStateSubtitle: 'U kunt uitgaven aan dit rapport toevoegen\\n via de knop hieronder of de optie "Uitgave toevoegen" in het menu Meer hierboven.',
         },
         noCategory: 'Geen categorie',
         noTag: 'Geen tag',

From 36301b64a015280be78f49cd31b3cb40f3972fa5 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Tue, 1 Jul 2025 12:43:29 +0200
Subject: [PATCH 5/9] fix empty report header

---
 src/CONST/index.ts                         | 1 -
 src/components/MoneyReportHeader.tsx       | 9 ---------
 src/libs/ReportPrimaryActionUtils.ts       | 4 ----
 src/libs/ReportSecondaryActionUtils.ts     | 2 +-
 tests/unit/ReportPrimaryActionUtilsTest.ts | 4 ++--
 5 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 04e6d43d6a4a..4cdca1e8744c 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -1059,7 +1059,6 @@ const CONST = {
             REMOVE_HOLD: 'removeHold',
             REVIEW_DUPLICATES: 'reviewDuplicates',
             MARK_AS_CASH: 'markAsCash',
-            ADD_EXPENSE: 'addExpense',
         },
         TRANSACTION_PRIMARY_ACTIONS: {
             REMOVE_HOLD: 'removeHold',
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 602cefbbb246..6c9e47223d61 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -608,15 +608,6 @@ function MoneyReportHeader({
                 }}
             />
         ),
-        [CONST.REPORT.PRIMARY_ACTIONS.ADD_EXPENSE]: (
-            <ButtonWithDropdownMenu
-                onPress={() => {}}
-                shouldAlwaysShowDropdownMenu
-                customText={translate('iou.addExpense')}
-                options={addExpenseDropdownOptions}
-                isSplitButton={false}
-            />
-        ),
     };
 
     const [offlineModalVisible, setOfflineModalVisible] = useState(false);
diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index ff5474aa80cc..6d326b634d16 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -307,10 +307,6 @@ function getReportPrimaryAction(params: GetReportPrimaryActionParams): ValueOf<t
 
     const isPayActionWithAllExpensesHeld = isPrimaryPayAction(report, policy, reportNameValuePairs, isChatReportArchived) && hasOnlyHeldExpenses(report?.reportID);
 
-    if (isAddExpenseAction(report, reportTransactions, isChatReportArchived)) {
-        return CONST.REPORT.PRIMARY_ACTIONS.ADD_EXPENSE;
-    }
-
     if (isMarkAsCashAction(report, reportTransactions, violations, policy)) {
         return CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH;
     }
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index d12e18dc975e..9f502579555a 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -57,7 +57,7 @@ import {
 function isAddExpenseAction(report: Report, reportTransactions: Transaction[], isReportArchived = false) {
     const isReportSubmitter = isCurrentUserSubmitter(report.reportID);
 
-    if (!isReportSubmitter || reportTransactions.length === 0) {
+    if (!isReportSubmitter) {
         return false;
     }
 
diff --git a/tests/unit/ReportPrimaryActionUtilsTest.ts b/tests/unit/ReportPrimaryActionUtilsTest.ts
index 398f9f75e11b..67272a1a9ea2 100644
--- a/tests/unit/ReportPrimaryActionUtilsTest.ts
+++ b/tests/unit/ReportPrimaryActionUtilsTest.ts
@@ -44,7 +44,7 @@ describe('getPrimaryAction', () => {
         await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {[CURRENT_USER_ACCOUNT_ID]: PERSONAL_DETAILS});
     });
 
-    it('should return ADD_EXPENSE for expense report with no transactions', async () => {
+    it('should return empty string for expense report with no transactions', async () => {
         const report = {
             reportID: REPORT_ID,
             type: CONST.REPORT.TYPE.EXPENSE,
@@ -54,7 +54,7 @@ describe('getPrimaryAction', () => {
         } as unknown as Report;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPrimaryAction({report, chatReport, reportTransactions: [], violations: {}, policy: {} as Policy})).toBe(CONST.REPORT.PRIMARY_ACTIONS.ADD_EXPENSE);
+        expect(getReportPrimaryAction({report, chatReport, reportTransactions: [], violations: {}, policy: {} as Policy})).toBe('');
     });
 
     it('should return SUBMIT for expense report with manual submit', async () => {

From 1e7516b36e40ee79183b7e6071d68e17196c1f89 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Thu, 3 Jul 2025 16:40:50 +0200
Subject: [PATCH 6/9] replace \\n => \n

---
 src/languages/de.ts    | 2 +-
 src/languages/es.ts    | 2 +-
 src/languages/fr.ts    | 2 +-
 src/languages/it.ts    | 2 +-
 src/languages/ja.ts    | 2 +-
 src/languages/nl.ts    | 2 +-
 src/languages/pl.ts    | 2 +-
 src/languages/pt-BR.ts | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 32f1759eb746..c75d454583cf 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -5964,7 +5964,7 @@ const translations = {
         moneyRequestReport: {
             emptyStateTitle: 'Dieser Bericht enthält keine Ausgaben.',
             emptyStateSubtitle:
-                'Sie können diesem Bericht Ausgaben hinzufügen,\\n indem Sie auf die Schaltfläche unten klicken oder die Option „Ausgabe hinzufügen“ im Menü „Mehr“ oben verwenden.',
+                'Sie können diesem Bericht Ausgaben hinzufügen,\n indem Sie auf die Schaltfläche unten klicken oder die Option „Ausgabe hinzufügen“ im Menü „Mehr“ oben verwenden.',
         },
         noCategory: 'Keine Kategorie',
         noTag: 'Kein Tag',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 456aabc506d4..7ed849cf4f2e 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -5955,7 +5955,7 @@ const translations = {
         groupBy: 'Agrupar por',
         moneyRequestReport: {
             emptyStateTitle: 'Este informe no tiene gastos.',
-            emptyStateSubtitle: 'Puedes agregar gastos a este informe\\n usando el botón de abajo o la opción "Agregar gasto" en el menú Más de arriba.',
+            emptyStateSubtitle: 'Puedes agregar gastos a este informe\n usando el botón de abajo o la opción "Agregar gasto" en el menú Más de arriba.',
         },
         noCategory: 'Sin categoría',
         noTag: 'Sin etiqueta',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 10edeed27504..4b0789d216f1 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -5972,7 +5972,7 @@ const translations = {
         groupBy: 'Groupe par',
         moneyRequestReport: {
             emptyStateTitle: "Ce rapport n'a pas de dépenses.",
-            emptyStateSubtitle: "Vous pouvez ajouter des dépenses à ce rapport\\n en utilisant le bouton ci-dessous ou l'option « Ajouter une dépense » dans le menu Plus ci-dessus.",
+            emptyStateSubtitle: "Vous pouvez ajouter des dépenses à ce rapport\n en utilisant le bouton ci-dessous ou l'option « Ajouter une dépense » dans le menu Plus ci-dessus.",
         },
         noCategory: 'Aucune catégorie',
         noTag: 'Aucun tag',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 3e991215a4fb..d3d3793ae769 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -5976,7 +5976,7 @@ const translations = {
         groupBy: 'Gruppo per',
         moneyRequestReport: {
             emptyStateTitle: 'Questo report non ha spese.',
-            emptyStateSubtitle: 'Puoi aggiungere spese a questo report\\n utilizzando il pulsante in basso o l\'opzione "Aggiungi spesa" nel menu Altro sopra.',
+            emptyStateSubtitle: 'Puoi aggiungere spese a questo report\n utilizzando il pulsante in basso o l\'opzione "Aggiungi spesa" nel menu Altro sopra.',
         },
         noCategory: 'Nessuna categoria',
         noTag: 'Nessun tag',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 49176ad2fe72..6c682cc3f81a 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -5936,7 +5936,7 @@ const translations = {
         groupBy: 'グループ',
         moneyRequestReport: {
             emptyStateTitle: 'このレポートには経費がありません。',
-            emptyStateSubtitle: 'このレポートに経費を追加するには、\\n 下のボタンを使用するか、上の「その他」メニューから「経費を追加」を選択してください。',
+            emptyStateSubtitle: 'このレポートに経費を追加するには、\n 下のボタンを使用するか、上の「その他」メニューから「経費を追加」を選択してください。',
         },
         noCategory: 'カテゴリなし',
         noTag: 'タグなし',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index a157ae567ec9..fe1f160b05e9 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -5968,7 +5968,7 @@ const translations = {
         groupBy: 'Groep per',
         moneyRequestReport: {
             emptyStateTitle: 'Dit rapport heeft geen uitgaven.',
-            emptyStateSubtitle: 'U kunt uitgaven aan dit rapport toevoegen\\n via de knop hieronder of de optie "Uitgave toevoegen" in het menu Meer hierboven.',
+            emptyStateSubtitle: 'U kunt uitgaven aan dit rapport toevoegen\n via de knop hieronder of de optie "Uitgave toevoegen" in het menu Meer hierboven.',
         },
         noCategory: 'Geen categorie',
         noTag: 'Geen tag',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 9e0a29ce6356..4f88aaea1b0f 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -5953,7 +5953,7 @@ const translations = {
         groupBy: 'Agrupar por',
         moneyRequestReport: {
             emptyStateTitle: 'Ten raport nie zawiera wydatków.',
-            emptyStateSubtitle: 'Możesz dodać wydatki do tego raportu\\n za pomocą przycisku poniżej lub opcji „Dodaj wydatek” w menu Więcej powyżej.',
+            emptyStateSubtitle: 'Możesz dodać wydatki do tego raportu\n za pomocą przycisku poniżej lub opcji „Dodaj wydatek” w menu Więcej powyżej.',
         },
         noCategory: 'Brak kategorii',
         noTag: 'Brak tagu',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index c02699a32a5e..dd870a41a85d 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -5966,7 +5966,7 @@ const translations = {
         groupBy: 'Agrupar por',
         moneyRequestReport: {
             emptyStateTitle: 'Este relatório não possui despesas.',
-            emptyStateSubtitle: 'Você pode adicionar despesas a este relatório\\n usando o botão abaixo ou a opção "Adicionar despesa" no menu Mais acima.',
+            emptyStateSubtitle: 'Você pode adicionar despesas a este relatório\n usando o botão abaixo ou a opção "Adicionar despesa" no menu Mais acima.',
         },
         noCategory: 'Sem categoria',
         noTag: 'Sem etiqueta',

From ce622a5d255cd464bb54197fe2e3d57d5a9b84df Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Fri, 4 Jul 2025 14:05:58 +0200
Subject: [PATCH 7/9] add scroll to empty state

---
 .../SearchMoneyRequestReportEmptyState.tsx    | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx b/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx
index 40617bf0862b..7fa60c8f16fd 100644
--- a/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx
+++ b/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import {View} from 'react-native';
+import {ScrollView} from 'react-native-gesture-handler';
 import EmptyStateComponent from '@components/EmptyStateComponent';
 import * as Expensicons from '@components/Icon/Expensicons';
 import LottieAnimations from '@components/LottieAnimations';
@@ -51,19 +52,21 @@ function SearchMoneyRequestReportEmptyState({reportId, policy}: {reportId?: stri
 
     return (
         <View style={styles.flex1}>
-            <EmptyStateComponent
-                cardStyles={[styles.appBG]}
-                cardContentStyles={[styles.pt5, styles.pb0]}
-                headerMediaType={CONST.EMPTY_STATE_MEDIA.ANIMATION}
-                headerMedia={LottieAnimations.GenericEmptyState}
-                title={translate('search.moneyRequestReport.emptyStateTitle')}
-                subtitle={translate('search.moneyRequestReport.emptyStateSubtitle')}
-                headerStyles={[styles.emptyStateMoneyRequestReport]}
-                lottieWebViewStyles={styles.emptyStateFolderWebStyles}
-                headerContentStyles={styles.emptyStateFolderWebStyles}
-                minModalHeight={minModalHeight}
-                buttons={[{buttonText: translate('iou.addExpense'), buttonAction: () => {}, success: true, isDisabled: false, dropDownOptions: addExpenseDropdownOptions}]}
-            />
+            <ScrollView>
+                <EmptyStateComponent
+                    cardStyles={[styles.appBG]}
+                    cardContentStyles={[styles.pt5, styles.pb0]}
+                    headerMediaType={CONST.EMPTY_STATE_MEDIA.ANIMATION}
+                    headerMedia={LottieAnimations.GenericEmptyState}
+                    title={translate('search.moneyRequestReport.emptyStateTitle')}
+                    subtitle={translate('search.moneyRequestReport.emptyStateSubtitle')}
+                    headerStyles={[styles.emptyStateMoneyRequestReport]}
+                    lottieWebViewStyles={styles.emptyStateFolderWebStyles}
+                    headerContentStyles={styles.emptyStateFolderWebStyles}
+                    minModalHeight={minModalHeight}
+                    buttons={[{buttonText: translate('iou.addExpense'), buttonAction: () => {}, success: true, isDisabled: false, dropDownOptions: addExpenseDropdownOptions}]}
+                />
+            </ScrollView>
         </View>
     );
 }

From dec8065695b20034c4c34b768fa4adb588182b52 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 9 Jul 2025 11:15:06 +0200
Subject: [PATCH 8/9] change place of scrolling

---
 .../MoneyRequestReportActionsList.tsx         |  6 ++--
 .../SearchMoneyRequestReportEmptyState.tsx    | 29 +++++++++----------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
index e7dfabd1f13b..22c154bdb9b7 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
@@ -4,7 +4,7 @@ import {useIsFocused, useRoute} from '@react-navigation/native';
 import isEmpty from 'lodash/isEmpty';
 import React, {useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState} from 'react';
 import type {NativeScrollEvent, NativeSyntheticEvent} from 'react-native';
-import {DeviceEventEmitter, InteractionManager, View} from 'react-native';
+import {DeviceEventEmitter, InteractionManager, ScrollView, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
 import Checkbox from '@components/Checkbox';
@@ -613,7 +613,7 @@ function MoneyRequestReportActionsList({
                     onClick={scrollToBottomAndMarkReportAsRead}
                 />
                 {isEmpty(visibleReportActions) && isEmpty(transactions) && !showReportActionsLoadingState ? (
-                    <>
+                    <ScrollView>
                         <MoneyRequestViewReportFields
                             report={report}
                             policy={policy}
@@ -622,7 +622,7 @@ function MoneyRequestReportActionsList({
                             reportId={report.reportID}
                             policy={policy}
                         />
-                    </>
+                    </ScrollView>
                 ) : (
                     <FlatList
                         initialNumToRender={INITIAL_NUM_TO_RENDER}
diff --git a/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx b/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx
index 7fa60c8f16fd..40617bf0862b 100644
--- a/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx
+++ b/src/components/MoneyRequestReportView/SearchMoneyRequestReportEmptyState.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import {View} from 'react-native';
-import {ScrollView} from 'react-native-gesture-handler';
 import EmptyStateComponent from '@components/EmptyStateComponent';
 import * as Expensicons from '@components/Icon/Expensicons';
 import LottieAnimations from '@components/LottieAnimations';
@@ -52,21 +51,19 @@ function SearchMoneyRequestReportEmptyState({reportId, policy}: {reportId?: stri
 
     return (
         <View style={styles.flex1}>
-            <ScrollView>
-                <EmptyStateComponent
-                    cardStyles={[styles.appBG]}
-                    cardContentStyles={[styles.pt5, styles.pb0]}
-                    headerMediaType={CONST.EMPTY_STATE_MEDIA.ANIMATION}
-                    headerMedia={LottieAnimations.GenericEmptyState}
-                    title={translate('search.moneyRequestReport.emptyStateTitle')}
-                    subtitle={translate('search.moneyRequestReport.emptyStateSubtitle')}
-                    headerStyles={[styles.emptyStateMoneyRequestReport]}
-                    lottieWebViewStyles={styles.emptyStateFolderWebStyles}
-                    headerContentStyles={styles.emptyStateFolderWebStyles}
-                    minModalHeight={minModalHeight}
-                    buttons={[{buttonText: translate('iou.addExpense'), buttonAction: () => {}, success: true, isDisabled: false, dropDownOptions: addExpenseDropdownOptions}]}
-                />
-            </ScrollView>
+            <EmptyStateComponent
+                cardStyles={[styles.appBG]}
+                cardContentStyles={[styles.pt5, styles.pb0]}
+                headerMediaType={CONST.EMPTY_STATE_MEDIA.ANIMATION}
+                headerMedia={LottieAnimations.GenericEmptyState}
+                title={translate('search.moneyRequestReport.emptyStateTitle')}
+                subtitle={translate('search.moneyRequestReport.emptyStateSubtitle')}
+                headerStyles={[styles.emptyStateMoneyRequestReport]}
+                lottieWebViewStyles={styles.emptyStateFolderWebStyles}
+                headerContentStyles={styles.emptyStateFolderWebStyles}
+                minModalHeight={minModalHeight}
+                buttons={[{buttonText: translate('iou.addExpense'), buttonAction: () => {}, success: true, isDisabled: false, dropDownOptions: addExpenseDropdownOptions}]}
+            />
         </View>
     );
 }

From b902c45c0cd386a45d10427c5552f761828dede5 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Wed, 9 Jul 2025 11:28:09 +0200
Subject: [PATCH 9/9] change place of scrolling

---
 .../MoneyRequestReportView/MoneyRequestReportActionsList.tsx   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
index 22c154bdb9b7..8641e42dd492 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
@@ -4,7 +4,7 @@ import {useIsFocused, useRoute} from '@react-navigation/native';
 import isEmpty from 'lodash/isEmpty';
 import React, {useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState} from 'react';
 import type {NativeScrollEvent, NativeSyntheticEvent} from 'react-native';
-import {DeviceEventEmitter, InteractionManager, ScrollView, View} from 'react-native';
+import {DeviceEventEmitter, InteractionManager, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
 import Checkbox from '@components/Checkbox';
@@ -13,6 +13,7 @@ import DecisionModal from '@components/DecisionModal';
 import FlatList from '@components/FlatList';
 import {AUTOSCROLL_TO_TOP_THRESHOLD} from '@components/InvertedFlatList/BaseInvertedFlatList';
 import {PressableWithFeedback} from '@components/Pressable';
+import ScrollView from '@components/ScrollView';
 import {useSearchContext} from '@components/Search/SearchContext';
 import Text from '@components/Text';
 import useLoadReportActions from '@hooks/useLoadReportActions';