Skip to content

Fix - Android - Accounting - Error message overlapped by OS navigation buttons #86249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cead22 merged 3 commits into from
Apr 1, 2026
Merged

Fix - Android - Accounting - Error message overlapped by OS navigation buttons #86249

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
820a826
fix selection screen safe area padding condition
FitseTLT Mar 24, 2026
99cbca7
Merge branch 'main' into fix-error-message-overlap-with-android-nav-b…
FitseTLT Mar 27, 2026
b958cfd
always add bottom safe area padding
FitseTLT Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/components/SelectionScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -183,7 +182,7 @@ function SelectionScreen<T = string>({
shouldSingleExecuteRowSelect={shouldSingleExecuteRowSelect}
shouldUpdateFocusedIndex={shouldUpdateFocusedIndex}
alternateNumberOfSupportedLines={2}
addBottomSafeAreaPadding={!errors || isEmptyObject(errors)}
addBottomSafeAreaPadding
Copy link
Copy Markdown
Contributor

@cead22 cead22 Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Krishna2323 this change isn't the same as what you said here, right? This change looks like what Melvin and misamikasa proposed

@FitseTLT's #84841 (comment) looks good to me!

The original ScreenWrapper had includeSafeAreaPaddingBottom={!!errors && !isEmptyObject(errors)}, which was accidentally inverted to addBottomSafeAreaPadding={!errors || isEmptyObject(errors)} during the edge-to-edge refactor here. Not going with the "always true" approach from other proposals (including Melvin's) since SelectionScreen is used across 65+ pages — we should restore the original intent rather than change behavior for all consumers.

Copy link
Copy Markdown
Contributor

@Krishna2323 Krishna2323 Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cead22 Yes, that’s correct — it was my mistake. Initially, it seemed like the selected proposal’s RCA was more accurate, since it does point to this PR, which introduced the change.

Later, @FitseTLT investigated the Codex comment and found that it isn’t a valid solution for all cases.

Sorry for the mistake on my end — I just wanted to keep the fix scoped to the original issue.

>
<ErrorMessageRow
errors={errors}
Expand Down
Loading