Skip to content

Commit 7f7d831

Browse files
committed
Merge remote-tracking branch 'origin/chore/esplora-electrum-server' into chore/esplora-electrum-server
# Conflicts: # gradle/libs.versions.toml
2 parents 7b2e02f + 038a633 commit 7f7d831

2 files changed

Lines changed: 3 additions & 0 deletions

File tree

app/src/main/java/to/bitkit/ext/ChannelDetails.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ fun createChannelDetails(): ChannelDetails {
7878
forceCloseSpendDelay = null,
7979
inboundHtlcMinimumMsat = 0u,
8080
inboundHtlcMaximumMsat = null,
81+
claimableOnCloseSats = 0u,
8182
config = ChannelConfig(
8283
forwardingFeeProportionalMillionths = 0u,
8384
forwardingFeeBaseMsat = 0u,

app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveQrScreen.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,7 @@ private fun PreviewAutoMode() {
693693
forceCloseSpendDelay = null,
694694
inboundHtlcMinimumMsat = 0uL,
695695
inboundHtlcMaximumMsat = null,
696+
claimableOnCloseSats = 0u,
696697
config = org.lightningdevkit.ldknode.ChannelConfig(
697698
forwardingFeeProportionalMillionths = 0u,
698699
forwardingFeeBaseMsat = 0u,
@@ -763,6 +764,7 @@ private fun PreviewSpendingMode() {
763764
forceCloseSpendDelay = null,
764765
inboundHtlcMinimumMsat = 0uL,
765766
inboundHtlcMaximumMsat = null,
767+
claimableOnCloseSats = 0u,
766768
config = org.lightningdevkit.ldknode.ChannelConfig(
767769
forwardingFeeProportionalMillionths = 0u,
768770
forwardingFeeBaseMsat = 0u,

0 commit comments

Comments
 (0)