(android) guard against invalid balance ratio in channels view

ACINQ · Jan 23, 2024 · 53a038a · 53a038a
1 parent e4e436c
commit 53a038a
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/channels/ChannelsView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/channels/ChannelsView.kt
@@ -40,7 +40,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.style.TextOverflow
@@ -97,7 +96,7 @@ fun ChannelsView(
                 }
             }
         )
-        if (!channelsState.isNullOrEmpty()) {
+        if (!channelsState?.values?.filter { it.isUsable }.isNullOrEmpty()) {
             LightningBalanceView(balance = balance, inboundLiquidity = inboundLiquidity)
         }
         ChannelsList(channels = channelsState, onChannelClick = onChannelClick)
@@ -115,7 +114,8 @@ private fun LightningBalanceView(
         if (balance != null && inboundLiquidity != null) {
             val balanceVsInbound = remember(balance, inboundLiquidity) {
                 (balance.msat.toFloat() / (balance.msat + inboundLiquidity.msat))
-                    .coerceIn(0.1f, 0.9f) // unreadable otherwise
+                    .coerceIn(0.1f, 0.9f)// unreadable otherwise
+                    .takeUnless { it.isNaN() }
             }
             Row(verticalAlignment = Alignment.CenterVertically) {
                 Surface(
@@ -145,13 +145,15 @@ private fun LightningBalanceView(
                 ) {}
             }
             Spacer(modifier = Modifier.height(2.dp))
-            LinearProgressIndicator(
-                progress = balanceVsInbound,
-                modifier = Modifier
-                    .height(8.dp)
-                    .fillMaxWidth(),
-                strokeCap = StrokeCap.Round,
-            )
+            if (balanceVsInbound != null) {
+                LinearProgressIndicator(
+                    progress = balanceVsInbound,
+                    modifier = Modifier
+                        .height(8.dp)
+                        .fillMaxWidth(),
+                    strokeCap = StrokeCap.Round,
+                )
+            }
             Spacer(modifier = Modifier.height(2.dp))
             Row {
                 Column {