From 1098a1a0177916495299592fcc4e10bdfae33d1f Mon Sep 17 00:00:00 2001 From: jwinterm Date: Mon, 18 May 2026 13:58:25 -0400 Subject: [PATCH] Skip Lightning username onboarding + restore navbar inactive icon contrast Two fixes: 1) lib/src/screens/seed/seed_verification/seed_verification_success_view.dart After verifying a BTC wallet's seed, the original flow pushed the user to the lightning_username_page which suggests an @cake.cash Lightning address. We disabled Lightning entirely (no Greenlight infra) and the page is meaningless without it. Collapse the conditional so the button always pops back to the wallet list. Restore the conditional if/when Hash Wallet ever runs its own Lightning backend. 2) lib/src/screens/dashboard/widgets/new_main_navbar_widget.dart inactiveColor was set to theme.colorScheme.primary, which is our brand dark forest green (#1A5C38) post-retheme. That renders nearly invisible against the navbar's semi-transparent dark surface backdrop, so the three non-active tab icons (Wallets / Contacts / Apps) disappear and the user just sees three blob shapes. Material's onSurfaceVariant is the standard token for de-emphasized icons and is visible across our light/dark/black themes. --- .../dashboard/widgets/new_main_navbar_widget.dart | 6 +++++- .../seed_verification_success_view.dart | 14 ++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/src/screens/dashboard/widgets/new_main_navbar_widget.dart b/lib/src/screens/dashboard/widgets/new_main_navbar_widget.dart index 23f155b6f..378f679c5 100644 --- a/lib/src/screens/dashboard/widgets/new_main_navbar_widget.dart +++ b/lib/src/screens/dashboard/widgets/new_main_navbar_widget.dart @@ -122,7 +122,11 @@ class _NEWNewMainNavBarState extends State { final backgroundColor = theme.colorScheme.surfaceContainer.withAlpha(127); final pillColor = theme.colorScheme.onSurface.withAlpha(25); final activeColor = theme.colorScheme.onSurface; - final inactiveColor = theme.colorScheme.primary; + // Hash Wallet: was theme.colorScheme.primary — that's our brand forest + // green (#1A5C38), which renders dark-on-dark against the navbar's + // semi-transparent surface backdrop. Material's onSurfaceVariant is the + // standard token for de-emphasized icons and is visible across themes. + final inactiveColor = theme.colorScheme.onSurfaceVariant; return Observer( builder: (_) { diff --git a/lib/src/screens/seed/seed_verification/seed_verification_success_view.dart b/lib/src/screens/seed/seed_verification/seed_verification_success_view.dart index b2409309d..1e19e623d 100644 --- a/lib/src/screens/seed/seed_verification/seed_verification_success_view.dart +++ b/lib/src/screens/seed/seed_verification/seed_verification_success_view.dart @@ -66,13 +66,15 @@ class SeedVerificationSuccessView extends StatelessWidget { PrimaryButton( key: ValueKey('wallet_seed_page_open_wallet_button_key'), onPressed: () { - if (walletType == WalletType.bitcoin) { - Navigator.of(context).pushNamed(Routes.lightningUsernamePage, arguments: true); - } else { - Navigator.of(context).popUntil((route) => route.isFirst); - } + // Hash Wallet: Lightning Username onboarding skipped. The original + // Cake flow pushed BTC wallets to the lightning_username_page, + // which suggests an @cake.cash address. We disabled Lightning + // entirely (no Greenlight infra) and the screen is meaningless + // without it. Re-enable here if we ever stand up our own LN + // backend + domain. + Navigator.of(context).popUntil((route) => route.isFirst); }, - text: (walletType == WalletType.bitcoin) ? S.current.continue_text : S.current.open_wallet, + text: S.current.open_wallet, color: Theme.of(context).colorScheme.primary, textColor: Theme.of(context).colorScheme.onPrimary, ),