From 820a826c5924630c9493bc2ccd9beffe16e8725f Mon Sep 17 00:00:00 2001
From: FitseTLT <engfitsum@gmail.com>
Date: Tue, 24 Mar 2026 16:53:56 +0300
Subject: [PATCH 1/2] fix selection screen safe area padding condition

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

diff --git a/src/components/SelectionScreen.tsx b/src/components/SelectionScreen.tsx
index 503888f8239cd..d08794833690a 100644
--- a/src/components/SelectionScreen.tsx
+++ b/src/components/SelectionScreen.tsx
@@ -183,7 +183,7 @@ function SelectionScreen<T = string>({
                         shouldSingleExecuteRowSelect={shouldSingleExecuteRowSelect}
                         shouldUpdateFocusedIndex={shouldUpdateFocusedIndex}
                         alternateNumberOfSupportedLines={2}
-                        addBottomSafeAreaPadding={!errors || isEmptyObject(errors)}
+                        addBottomSafeAreaPadding={!!errors && !isEmptyObject(errors)}
                     >
                         <ErrorMessageRow
                             errors={errors}

From b958cfdcc8fb03da737d4a8b7efc88cc20fd2334 Mon Sep 17 00:00:00 2001
From: FitseTLT <engfitsum@gmail.com>
Date: Sat, 28 Mar 2026 01:37:26 +0300
Subject: [PATCH 2/2] always add bottom safe area padding

---
 src/components/SelectionScreen.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/SelectionScreen.tsx b/src/components/SelectionScreen.tsx
index d08794833690a..8b48d3065118f 100644
--- a/src/components/SelectionScreen.tsx
+++ b/src/components/SelectionScreen.tsx
@@ -11,7 +11,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 import type {ConnectionName, PolicyFeatureName} from '@src/types/onyx/Policy';
 import type {ReceiptErrors} from '@src/types/onyx/Transaction';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import ErrorMessageRow from './ErrorMessageRow';
 import HeaderWithBackButton from './HeaderWithBackButton';
 import OfflineWithFeedback from './OfflineWithFeedback';
@@ -183,7 +182,7 @@ function SelectionScreen<T = string>({
                         shouldSingleExecuteRowSelect={shouldSingleExecuteRowSelect}
                         shouldUpdateFocusedIndex={shouldUpdateFocusedIndex}
                         alternateNumberOfSupportedLines={2}
-                        addBottomSafeAreaPadding={!!errors && !isEmptyObject(errors)}
+                        addBottomSafeAreaPadding
                     >
                         <ErrorMessageRow
                             errors={errors}