diff --git a/composeApp/src/commonMain/composeResources/values/strings.xml b/composeApp/src/commonMain/composeResources/values/strings.xml index 0558c661..f8097013 100644 --- a/composeApp/src/commonMain/composeResources/values/strings.xml +++ b/composeApp/src/commonMain/composeResources/values/strings.xml @@ -774,4 +774,5 @@ Close its channels Sweep %1$s sats Nobody runs its node, and its channels close only through it. + Hasn't answered the proposal yet. Their device may need an update that knows Lightning wallets. diff --git a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/IcebergCeremonyScreen.kt b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/IcebergCeremonyScreen.kt index 2cd3cdd0..8aedb389 100644 --- a/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/IcebergCeremonyScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/ui/composable/IcebergCeremonyScreen.kt @@ -38,6 +38,7 @@ import bennu.composeapp.generated.resources.confirm_what_you_saw import bennu.composeapp.generated.resources.confirming_publishes_your_public_share import bennu.composeapp.generated.resources.couldn_t_approve_this_step import bennu.composeapp.generated.resources.couldn_t_start_the_key_ceremony +import bennu.composeapp.generated.resources.hasn_t_answered_the_proposal_yet import bennu.composeapp.generated.resources.join_the_ceremony import bennu.composeapp.generated.resources.joining_publishes_commitments import bennu.composeapp.generated.resources.lightning_wallet_key @@ -234,7 +235,16 @@ private fun Ceremony(modifier: Modifier, state: IcebergCeremonyUIState.Loaded, i items(session.participants()) { participant -> ListItem( headlineContent = { Text(members[participant]?.profile?.humanReadableNameOrPubkey() ?: participant.take(16)) }, - supportingContent = { Text(stringResource(Res.string.s_of_3_steps, (state.progress[participant] ?: 0).toString())) }, + supportingContent = { + // Phase 15: a member whose build does not know these kinds never answers, and the + // group would be smaller for it, so the screen says who has not. + val steps = state.progress[participant] ?: 0 + val failed = session.stage == IcebergRitualStage.FAILED + Text( + text = if (steps == 0 && !failed) stringResource(Res.string.hasn_t_answered_the_proposal_yet) else stringResource(Res.string.s_of_3_steps, steps.toString()), + color = if (steps == 0 && !failed) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.onSurfaceVariant, + ) + }, ) } } diff --git a/docs/group-lightning-wallet.md b/docs/group-lightning-wallet.md index 9e16452a..4f3e9da3 100644 --- a/docs/group-lightning-wallet.md +++ b/docs/group-lightning-wallet.md @@ -43,6 +43,7 @@ build chose differently, this table says so. | 12 | done: `GroupLightningAuthorisationEvent` (kind 30346, `pay`), budgets read from the signed authorisations, the node paying each once, its summary and transcript line, and the send screen (`GroupLightningSendScreen`). The co-signers now hold offered HTLCs under the statement's in-flight cap. Seven new tests | | 13 | done, except splicing out. `close` and `force-close` authorisations, the node acting on each once, the co-signers signing our own commitment only under a force-close authorisation and only after rebuilding it, and the channel menu on the wallet screen. Sweeps: the snapshot lists what closed channels left the group, any member proposes a sweep (`GroupSweep`, a new FROST subject), every member checks it against its own basepoints and the onchain wallet, and the watcher sends it. Five new tests: a force close and a two-input sweep both pass the script interpreter | | 14 | done: a room can have several Lightning wallets on a network, the highest-numbered current. A member who leaves is named on the wallet screen until a new wallet replaces it; the new key is made over the onchain key's holders who are still in the room; the old wallet keeps its operator and node until its channels are closed, in one decision for all of them; and removing a share holder says what it leaves. A five-device test re-keys after a removal | +| 15 | the gates are in code and closed. `GroupLightningRollout.ENABLED` stays `false`: its own condition is a regtest end-to-end run, which has not been done (see Phase 0). Mainnet is refused by `GroupLightningRollout.allows`, whatever a screen offers. The ceremony screen names every participant who has not answered, with a word that their build may not know the new kinds | | what the plan said | what it turned out to be | |---|---|