chore: upgrade to bitkit-core 0.1.18

Author: ovitrif

app/src/main/java/to/bitkit/ui/settings/ChannelOrdersScreen.kt

@@ -219,7 +219,7 @@ private fun OrderDetailView(
                         Text(text = "Order Details", style = MaterialTheme.typography.titleMedium)
                         Spacer(modifier = Modifier.height(8.dp))
                         DetailRow("ID", order.id)
-                        DetailRow("Onchain txs", order.payment.onchain.transactions.size.toString())
+                        DetailRow("Onchain txs", order.payment?.onchain?.transactions?.size.toString())
                         DetailRow("State", order.state.toString())
                         DetailRow("State 2", order.state2.toString())
                         DetailRow("LSP Balance", order.lspBalanceSat.formatToModernDisplay())
@@ -265,8 +265,8 @@ private fun OrderDetailView(
                     Column(modifier = Modifier.padding(16.dp)) {
                         Text(text = "LSP Information", style = MaterialTheme.typography.titleMedium)
                         Spacer(modifier = Modifier.height(8.dp))
-                        DetailRow("Alias", order.lspNode.alias)
-                        DetailRow("Node ID", order.lspNode.pubkey)
+                        DetailRow("Alias", order.lspNode?.alias.orEmpty())
+                        DetailRow("Node ID", order.lspNode?.pubkey.orEmpty())
                         order.lnurl?.let {
                             DetailRow("LNURL", it)
                         }

app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailScreen.kt

@@ -530,8 +530,8 @@ private fun getChannelStatus(
     blocktankOrder?.let { order ->
         when {
             order.state2 == BtOrderState2.EXPIRED ||
-                order.payment.state2 == BtPaymentState2.CANCELED ||
-                order.payment.state2 == BtPaymentState2.REFUNDED -> {
+                order.payment?.state2 == BtPaymentState2.CANCELED ||
+                order.payment?.state2 == BtPaymentState2.REFUNDED -> {
                 return ChannelStatusUi.CLOSED
             }
 

app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsViewModel.kt

@@ -229,7 +229,7 @@ class LightningConnectionsViewModel @Inject constructor(
 
             createChannelDetails().copy(
                 channelId = order.id,
-                counterpartyNodeId = order.lspNode.pubkey,
+                counterpartyNodeId = order.lspNode?.pubkey.orEmpty(),
                 fundingTxo = order.channel?.fundingTx?.let { OutPoint(txid = it.id, vout = it.vout.toUInt()) },
                 channelValueSats = order.clientBalanceSat + order.lspBalanceSat,
                 outboundCapacityMsat = order.clientBalanceSat * 1000u,
@@ -246,7 +246,7 @@ class LightningConnectionsViewModel @Inject constructor(
 
             createChannelDetails().copy(
                 channelId = order.id,
-                counterpartyNodeId = order.lspNode.pubkey,
+                counterpartyNodeId = order.lspNode?.pubkey.orEmpty(),
                 fundingTxo = order.channel?.fundingTx?.let { OutPoint(txid = it.id, vout = it.vout.toUInt()) },
                 channelValueSats = order.clientBalanceSat + order.lspBalanceSat,
                 outboundCapacityMsat = order.clientBalanceSat * 1000u,

app/src/main/java/to/bitkit/ui/settings/lightning/components/ChannelStatusView.kt

@@ -122,7 +122,7 @@ private fun getStatusInfo(
             )
         }
 
-        when (order.payment.state2) {
+        when (order.payment?.state2) {
             BtPaymentState2.CANCELED -> {
                 return StatusInfo(
                     iconRes = R.drawable.ic_x,
@@ -172,6 +172,8 @@ private fun getStatusInfo(
                     statusColor = Colors.Purple
                 )
             }
+
+            null -> Unit
         }
     }
 
@@ -279,7 +281,7 @@ private fun PreviewPaymentCanceled() {
                 details = createChannelDetails(),
             ),
             blocktankOrder = mockOrder().copy(
-                payment = mockOrder().payment.copy(
+                payment = mockOrder().payment?.copy(
                     state2 = BtPaymentState2.CANCELED,
                 ),
             ),
@@ -297,7 +299,7 @@ private fun PreviewRefundAvailable() {
                 details = createChannelDetails(),
             ),
             blocktankOrder = mockOrder().copy(
-                payment = mockOrder().payment.copy(
+                payment = mockOrder().payment?.copy(
                     state2 = BtPaymentState2.REFUND_AVAILABLE,
                 ),
             ),
@@ -315,7 +317,7 @@ private fun PreviewRefunded() {
                 details = createChannelDetails(),
             ),
             blocktankOrder = mockOrder().copy(
-                payment = mockOrder().payment.copy(
+                payment = mockOrder().payment?.copy(
                     state2 = BtPaymentState2.REFUNDED,
                 ),
             ),
@@ -347,7 +349,7 @@ private fun PreviewPaymentPaid() {
                 details = createChannelDetails(),
             ),
             blocktankOrder = mockOrder().copy(
-                payment = mockOrder().payment.copy(
+                payment = mockOrder().payment?.copy(
                     state2 = BtPaymentState2.PAID,
                 ),
             ),

app/src/main/java/to/bitkit/viewmodels/TransferViewModel.kt

@@ -206,7 +206,7 @@ class TransferViewModel @Inject constructor(
         viewModelScope.launch {
             lightningRepo
                 .sendOnChain(
-                    address = order.payment.onchain.address,
+                    address = order.payment?.onchain?.address.orEmpty(),
                     sats = order.feeSat,
                     speed = speed,
                     isTransfer = true,

gradle/libs.versions.toml

@@ -44,7 +44,7 @@ activity-compose = { module = "androidx.activity:activity-compose", version.ref
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 barcode-scanning = { module = "com.google.mlkit:barcode-scanning", version.ref = "barcodeScanning" }
 biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
-bitkitcore = { module = "com.synonym:bitkit-core-android", version = "0.1.10" }
+bitkitcore = { module = "com.synonym:bitkit-core-android", version = "0.1.18" }
 bouncycastle-provider-jdk = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncyCastle" }
 camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "camera" }
 camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camera" }