From b107d34df8b4b2112ea2d8b0638afa6dcca8a44a Mon Sep 17 00:00:00 2001
From: gaber <a.gaber0093@gmail.com>
Date: Mon, 27 May 2024 10:27:51 +0300
Subject: [PATCH 1/2] fix first action item background overlap on the next item

---
 src/pages/home/report/ReportActionItem.tsx             | 4 ++--
 src/pages/home/report/ReportActionItemParentAction.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 95bc4f5231d2..9ba3fa7a9d9d 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -783,7 +783,7 @@ function ReportActionItem({
                     message = 'parentReportAction.deletedExpense';
                 }
                 return (
-                    <View>
+                    <View style={[styles.overflowHidden]}>
                         <AnimatedEmptyStateBackground />
                         <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]}>
                             <OfflineWithFeedback pendingAction={parentReportAction?.pendingAction ?? null}>
@@ -815,7 +815,7 @@ function ReportActionItem({
         if (ReportUtils.isTaskReport(report)) {
             if (ReportUtils.isCanceledTaskReport(report, parentReportAction)) {
                 return (
-                    <View>
+                    <View style={[styles.overflowHidden]}>
                         <AnimatedEmptyStateBackground />
                         <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]}>
                             <OfflineWithFeedback pendingAction={parentReportAction?.pendingAction}>
diff --git a/src/pages/home/report/ReportActionItemParentAction.tsx b/src/pages/home/report/ReportActionItemParentAction.tsx
index a32900fdd502..fedbb3647056 100644
--- a/src/pages/home/report/ReportActionItemParentAction.tsx
+++ b/src/pages/home/report/ReportActionItemParentAction.tsx
@@ -100,7 +100,7 @@ function ReportActionItemParentAction({
     }, []);
 
     return (
-        <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth)]}>
+        <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth), styles.overflowHidden]}>
             <AnimatedEmptyStateBackground />
             <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]} />
             {allAncestors.map((ancestor) => (

From f07731bcbcc8f995f393c0e3b9c075ca4d81240e Mon Sep 17 00:00:00 2001
From: gaber <a.gaber0093@gmail.com>
Date: Tue, 4 Jun 2024 13:19:22 +0300
Subject: [PATCH 2/2] android fix BaseInvertedFlatList zIndex

---
 src/components/InvertedFlatList/CellRendererComponent.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/InvertedFlatList/CellRendererComponent.tsx b/src/components/InvertedFlatList/CellRendererComponent.tsx
index 1199fb2a594c..f0631811fa14 100644
--- a/src/components/InvertedFlatList/CellRendererComponent.tsx
+++ b/src/components/InvertedFlatList/CellRendererComponent.tsx
@@ -21,7 +21,7 @@ function CellRendererComponent(props: CellRendererComponentProps) {
                  * list items. Consequently, lower list items can overflow the upper list items.
                  * See: https://github.com/Expensify/App/issues/20451
                  */
-                {zIndex: -props.index},
+                {zIndex: -props.index, position: 'relative'},
             ]}
         />
     );