Skip to content

fix: keep sheet buttons above the navigation bar - #1572

Merged
jvsena42 merged 4 commits into
masterfrom
fix/sheet-nav-inset
Oct 19, 2026
Merged

jvsena42 merged 4 commits into
masterfrom
fix/sheet-nav-inset

Conversation

@jvsena42

@jvsena42 jvsena42 commented Oct 19, 2026 •

Copy link
Copy Markdown
Member

This PR adds the navigation-bar inset to two sheet screens whose bottom button sat under the gesture handle. They were found by checking every sheet screen for the same bug as #1523, which #1564 fixes for the USDT payment review.

Description

  • Fixes the Forgot PIN sheet, because its Reset button had no bottom inset and sat under the gesture handle.
  • Fixes the Subscription sheet's unavailable state, because its Close button had no bottom inset; the other subscription screens already apply it.

Out of Scope

Design

N/A — no design change; the screens keep their existing layout and only gain the bottom safe-area padding. No Figma frame is linked because I did not confirm the matching handoff frames.

Preview

Forgot PIN sheet on a Pixel 9 emulator with gesture navigation: Reset ends at y=2319, above the navigation bar at y=2361.

Forgot PIN sheet with Reset above the navigation bar

QA Notes

Journeys

  • new forgot-pin-nav-bar-inset.xml — the Forgot PIN sheet's Reset button sits above the navigation bar

Manual Tests

  • Subscriptions → open a subscription's Details → have the peer delete it while the sheet is open → the unavailable state's Close button sits above the navigation bar — removing a subscription from a second identity mid-view not in Capabilities

Automated Checks

N/A

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@greptile-apps

greptile-apps Bot commented Oct 19, 2026 •

Copy link
Copy Markdown
Contributor

RetriggerView in GreptileConfidence Score: 5/5

[Low impact] The PR appears safe to merge; no new actionable issues were found.

Summary

Adds bottom navigation-bar padding to the Forgot PIN sheet and the unavailable subscription sheet.

  • The Forgot PIN sheet keeps its Reset button above the navigation bar.
  • The unavailable subscription sheet keeps its Close button above the navigation bar.

Reviews (2) · Last reviewed commit: "test: return home before locking in forg..." · Reviewed by Greptile

Comment thread journeys/security/forgot-pin-nav-bar-inset.xml
@github-actions

github-actions Bot commented Oct 19, 2026 •

Copy link
Copy Markdown
Contributor

Regtest APK

Built from c61445b (run).

Download bitkit-dev-debug universal APK (expires in 30 days).

@ovitrif ovitrif added this to the 3.0.5 milestone Oct 19, 2026

@talosmachina talosmachina left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

No findings. Adds navigationBarsPadding() to the Forgot PIN sheet and to the Subscription sheet's unavailable state, so their bottom buttons clear the gesture handle. Reviewed 109b671, light tier, reasoned from the code and CI: I do not build Bitkit Android branches.

What I checked, and 3 candidates I ruled out

Read in full: ForgotPinSheet.kt, SubscriptionSheet in SubscriptionsScreen.kt, forgot-pin-nav-bar-inset.xml, the changelog fragment
Call sites traced: ForgotPinSheet (one caller, MainActivity), BottomSheet -> BottomSheetOverlayHost -> SheetHost, Modifier.sheetHeight
CI: build, build-local, lint and detekt green; the e2e jobs were still running

Ruled out

  • Double inset: SheetHost and BottomSheetOverlayHost apply no window insets, and the sibling sheets (DisablePinSheet, ChangePinSheet, the other subscription routes) each pad themselves, so this is the house pattern, not a second inset.
  • Gradient stops short of the screen edge: in ForgotPinSheet the padding comes after gradientBackground(), and in SubscriptionSheet it is on the inner Column while the Box carries the gradient, so the background still fills the inset.
  • Fixed height clips the content: sheetHeight(isModal = true) fixes the outer height and the padding comes out of the FillHeight() slots, which leaves room on any phone height.

Merge confidence: 5/5, CI build and lint green, and the change is one house-pattern modifier per screen that a unit test would not apply to; the new journey checks it on a device.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@ovitrif

ovitrif commented Oct 19, 2026

Copy link
Copy Markdown
Collaborator

Triage: milestone 3.0.5. This is an Android-only spacing fix for the Forgot PIN and Subscription sheets, and it doesn't block 3.0.0 or 3.0.1. This PR closes no issue, so it carries the milestone itself. Related: #1571 (USDT payment review inset, fixed in #1564), also 3.0.5.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@jvsena42
jvsena42 marked this pull request as draft October 19, 2026 12:19
@jvsena42 jvsena42 self-assigned this Oct 19, 2026
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@jvsena42
jvsena42 marked this pull request as ready for review October 19, 2026 12:25
@jvsena42
jvsena42 requested review from a team, coreyphillips and pwltr and removed request for a team October 19, 2026 12:35
@jvsena42
jvsena42 enabled auto-merge October 19, 2026 12:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants