Skip to content

fix: show receive details button when node starting #1090

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

Open
jvsena42 wants to merge 5 commits into
base: master
Choose a base branch
from
+97 −58
Open

fix: show receive details button when node starting #1090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4bd2bfb
fix: remove details button guard for running node
jvsena42 Jul 16, 2026
f856c59
chore: rename changelog fragment
jvsena42 Jul 16, 2026
c0a420a
fix: show loading spinner on spending details
jvsena42 Jul 16, 2026
1396d16
fix: remove node running gate for display spinner
jvsena42 Jul 16, 2026
dc47b98
fix: don't display cached invoice when node is down
jvsena42 Jul 16, 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
154 changes: 96 additions & 58 deletions app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveQrScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package to.bitkit.ui.screens.wallets.receive

import android.graphics.Bitmap
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.Crossfade
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.snapping.SnapPosition
Expand Down Expand Up @@ -65,6 +64,7 @@ import to.bitkit.ui.components.BottomSheetPreview
import to.bitkit.ui.components.ButtonSize
import to.bitkit.ui.components.Caption13Up
import to.bitkit.ui.components.Display
import to.bitkit.ui.components.GradientCircularProgressIndicator
import to.bitkit.ui.components.PrimaryButton
import to.bitkit.ui.components.QrCodeImage
import to.bitkit.ui.components.TertiaryButton
Expand Down Expand Up @@ -252,6 +252,7 @@ fun ReceiveQrScreen(
tab = tab,
walletState = walletState,
cjitInvoice = cjitInvoice,
isNodeRunning = lightningState.nodeLifecycleState.isRunning(),
onClickEditInvoice = onClickEditInvoice,
modifier = Modifier.weight(1f)
)
Expand Down Expand Up @@ -288,63 +289,61 @@ fun ReceiveQrScreen(

VerticalSpacer(24.dp)

AnimatedVisibility(visible = lightningState.nodeLifecycleState.isRunning()) {
val showCjitButton = showingCjitOnboarding && selectedTab == ReceiveTab.SPENDING
val buttonVariant = when {
showCjitButton -> BottomButtonVariant.CJIT
showDetails -> BottomButtonVariant.SHOW_QR
else -> BottomButtonVariant.SHOW_DETAILS
}
Crossfade(
targetState = buttonVariant,
label = "ReceiveBottomButtonCrossfade",
) { variant ->
when (variant) {
BottomButtonVariant.CJIT -> PrimaryButton(
text = stringResource(R.string.wallet__receive__cjit),
icon = {
Icon(
painter = painterResource(R.drawable.ic_lightning_alt),
tint = Colors.Purple,
contentDescription = null,
)
},
onClick = {
onClickReceiveCjit()
showDetails = false
},
fullWidth = true,
modifier = Modifier
.padding(horizontal = 16.dp)
.testTag("ShowDetails")
)
val showCjitButton = showingCjitOnboarding && selectedTab == ReceiveTab.SPENDING
val buttonVariant = when {
showCjitButton -> BottomButtonVariant.CJIT
showDetails -> BottomButtonVariant.SHOW_QR
else -> BottomButtonVariant.SHOW_DETAILS
}
Comment thread
jvsena42 marked this conversation as resolved.
Crossfade(
targetState = buttonVariant,
label = "ReceiveBottomButtonCrossfade",
) { variant ->
when (variant) {
BottomButtonVariant.CJIT -> PrimaryButton(
text = stringResource(R.string.wallet__receive__cjit),
icon = {
Icon(
painter = painterResource(R.drawable.ic_lightning_alt),
tint = Colors.Purple,
contentDescription = null,
)
},
onClick = {
onClickReceiveCjit()
showDetails = false
},
fullWidth = true,
modifier = Modifier
.padding(horizontal = 16.dp)
.testTag("ShowDetails")
)

BottomButtonVariant.SHOW_QR -> PrimaryButton(
text = stringResource(R.string.wallet__receive_show_qr),
icon = {
Icon(
painter = painterResource(R.drawable.ic_qr_purple),
tint = Colors.White,
contentDescription = null,
modifier = Modifier.size(16.dp)
)
},
onClick = { showDetails = false },
fullWidth = true,
modifier = Modifier
.padding(horizontal = 16.dp)
.testTag("QRCode")
)
BottomButtonVariant.SHOW_QR -> PrimaryButton(
text = stringResource(R.string.wallet__receive_show_qr),
icon = {
Icon(
painter = painterResource(R.drawable.ic_qr_purple),
tint = Colors.White,
contentDescription = null,
modifier = Modifier.size(16.dp)
)
},
onClick = { showDetails = false },
fullWidth = true,
modifier = Modifier
.padding(horizontal = 16.dp)
.testTag("QRCode")
)

BottomButtonVariant.SHOW_DETAILS -> TertiaryButton(
text = stringResource(R.string.wallet__receive_show_details),
onClick = { showDetails = true },
fullWidth = true,
modifier = Modifier
.padding(horizontal = 16.dp)
.testTag("ShowDetails")
)
}
BottomButtonVariant.SHOW_DETAILS -> TertiaryButton(
text = stringResource(R.string.wallet__receive_show_details),
onClick = { showDetails = true },
fullWidth = true,
modifier = Modifier
.padding(horizontal = 16.dp)
.testTag("ShowDetails")
)
}
}

Expand Down Expand Up @@ -502,6 +501,7 @@ private fun ReceiveDetailsView(
tab: ReceiveTab,
walletState: WalletState,
cjitInvoice: String?,
isNodeRunning: Boolean,
onClickEditInvoice: () -> Unit,
modifier: Modifier = Modifier,
) {
Expand Down Expand Up @@ -555,14 +555,24 @@ private fun ReceiveDetailsView(
}

ReceiveTab.SPENDING -> {
if (cjitInvoice != null || walletState.bolt11.isNotEmpty()) {
val lightningInvoice = cjitInvoice ?: walletState.bolt11.takeIf { isNodeRunning }
if (!lightningInvoice.isNullOrEmpty()) {
CopyAddressCard(
title = stringResource(R.string.wallet__receive_lightning_invoice),
address = cjitInvoice ?: walletState.bolt11,
address = lightningInvoice,
type = CopyAddressType.LIGHTNING,
onClickEditInvoice = onClickEditInvoice,
testTag = "ReceiveLightningAddress",
)
} else {
Box(
contentAlignment = Alignment.Center,
modifier = Modifier
.fillMaxSize()
.testTag("ReceiveLightningLoading")
) {
GradientCircularProgressIndicator(modifier = Modifier.size(24.dp))
}
Comment thread
jvsena42 marked this conversation as resolved.
}
}
}
Expand Down Expand Up @@ -886,6 +896,34 @@ private fun PreviewDetailsMode() {
"djjqen0wgsyqvpsxqcrqvpsxqcrqvpsxqcrqvpsxqcrqvpsxqcrqvpsxqcrqvpsxqcrqvpsxq"
),
cjitInvoice = null,
isNodeRunning = true,
onClickEditInvoice = {},
modifier = Modifier.weight(1f)
)
}
}
}

@Suppress("SpellCheckingInspection")
@Preview(showSystemUi = true, name = "Spending Details Loading")
@Composable
private fun PreviewDetailsModeSpendingLoading() {
AppThemeSurface {
Column(
modifier = Modifier
.gradientBackground()
.fillMaxSize()
.padding(16.dp)
) {
// Cached bolt11 with a node that is not running: the stale invoice is withheld in favor of loading
ReceiveDetailsView(
tab = ReceiveTab.SPENDING,
walletState = WalletState(
bolt11 = "lnbcrt500u1pn7umn7pp5x0s9lt9fwrff6rp70pz3guwnjgw97sjuv79vhx9n2ps8q6tcdehhxapqd9h8vmmfv" +
"djjqen0wgsyqvpsxqcrqvpsxqcrqvpsxqcrqvpsxqcrqvpsxqcrqvpsxqcrqvpsxqcrqvpsxq"
),
cjitInvoice = null,
isNodeRunning = false,
onClickEditInvoice = {},
modifier = Modifier.weight(1f)
)
Expand Down
1 change: 1 addition & 0 deletions changelog.d/next/1090.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The Show Details button on the Receive screen is now available while the Lightning node is still starting up, so you can view and copy your on-chain address right away.
Loading