refactor: always show amount in payment notifications

Author: jvsena42

app/src/main/java/to/bitkit/data/SettingsStore.kt

@@ -142,7 +142,6 @@ data class SettingsData(
     val enableSendAmountWarning: Boolean = false,
     val backupVerified: Boolean = false,
     val notificationsGranted: Boolean = false,
-    val showNotificationDetails: Boolean = true,
     val keepBitkitActiveInBackground: Boolean = false,
     val dismissedSuggestions: List<String> = emptyList(),
     val balanceWarningIgnoredMillis: Long = 0,

app/src/main/java/to/bitkit/domain/commands/ReceivedNotificationContent.kt

@@ -28,11 +28,7 @@ class ReceivedNotificationContent @Inject constructor(
     suspend fun build(sats: Long): NotificationDetails {
         val settings = settingsStore.data.first()
         val title = context.getString(R.string.notification__received__title)
-        val body = if (settings.showNotificationDetails) {
-            formatAmount(sats, settings)
-        } else {
-            context.getString(R.string.notification__received__body_hidden)
-        }
+        val body = formatAmount(sats, settings)
         return NotificationDetails(title, body)
     }
 

app/src/main/java/to/bitkit/ui/components/NotificationPreview.kt

@@ -1,6 +1,5 @@
 package to.bitkit.ui.components
 
-import androidx.compose.animation.AnimatedContent
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -18,7 +17,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import to.bitkit.R
@@ -34,7 +32,6 @@ fun NotificationPreview(
     enabled: Boolean,
     title: String,
     description: String,
-    showDetails: Boolean,
     modifier: Modifier = Modifier,
     time: String = "5m",
 ) {
@@ -66,13 +63,7 @@ fun NotificationPreview(
                     Caption(text = time, color = Colors.White64)
                 }
 
-                val bodyText = when (showDetails) {
-                    true -> description
-                    else -> stringResource(R.string.notification__received__body_hidden)
-                }
-                AnimatedContent(targetState = bodyText) { text ->
-                    BodyS(text = text, color = Colors.White80)
-                }
+                BodyS(text = description, color = Colors.White80)
             }
 
             Icon(
@@ -110,14 +101,12 @@ private fun Preview() {
                 enabled = true,
                 title = "Payment Received",
                 description = "₿ 21 000 ($21.00)",
-                showDetails = true,
                 modifier = Modifier.fillMaxWidth()
             )
             NotificationPreview(
                 enabled = false,
                 title = "Payment Received",
                 description = "₿ 21 000 ($21.00)",
-                showDetails = false,
                 modifier = Modifier.fillMaxWidth()
             )
         }

app/src/main/java/to/bitkit/ui/settings/backgroundPayments/BackgroundPaymentsSettings.kt

@@ -39,7 +39,6 @@ fun BackgroundPaymentsSettings(
 ) {
     val context = LocalContext.current
     val notificationsGranted by settingsViewModel.notificationsGranted.collectAsStateWithLifecycle()
-    val showNotificationDetails by settingsViewModel.showNotificationDetails.collectAsStateWithLifecycle()
     val keepActive by settingsViewModel.keepBitkitActiveInBackground.collectAsStateWithLifecycle()
 
     RequestNotificationPermissions(
@@ -49,7 +48,6 @@ fun BackgroundPaymentsSettings(
 
     Content(
         hasPermission = notificationsGranted,
-        showDetails = showNotificationDetails,
         keepActive = keepActive,
         onBack = onBack,
         onSystemSettingsClick = context::openNotificationSettings,
@@ -60,7 +58,6 @@ fun BackgroundPaymentsSettings(
 @Composable
 private fun Content(
     hasPermission: Boolean,
-    showDetails: Boolean,
     keepActive: Boolean,
     onBack: () -> Unit,
     onSystemSettingsClick: () -> Unit,
@@ -147,7 +144,6 @@ private fun Content(
                 enabled = hasPermission,
                 title = stringResource(R.string.notification__received__title),
                 description = "₿ 21 000 ($21.00)",
-                showDetails = showDetails,
                 modifier = Modifier.fillMaxWidth()
             )
         }
@@ -160,7 +156,6 @@ private fun Preview1() {
     AppThemeSurface {
         Content(
             hasPermission = true,
-            showDetails = true,
             keepActive = true,
             onBack = {},
             onSystemSettingsClick = {},
@@ -175,7 +170,6 @@ private fun Preview2() {
     AppThemeSurface {
         Content(
             hasPermission = false,
-            showDetails = false,
             keepActive = false,
             onBack = {},
             onSystemSettingsClick = {},

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

@@ -64,15 +64,6 @@ class SettingsViewModel @Inject constructor(
         }
     }
 
-    val showNotificationDetails = settingsStore.data.map { it.showNotificationDetails }
-        .asStateFlow(initialValue = false)
-
-    fun toggleNotificationDetails() {
-        viewModelScope.launch {
-            settingsStore.update { it.copy(showNotificationDetails = !it.showNotificationDetails) }
-        }
-    }
-
     val keepBitkitActiveInBackground = settingsStore.data.map { it.keepBitkitActiveInBackground }
         .asStateFlow(initialValue = false)
 

app/src/test/java/to/bitkit/domain/commands/NotifyChannelReadyHandlerTest.kt

@@ -46,7 +46,7 @@ class NotifyChannelReadyHandlerTest : BaseUnitTest() {
     fun setUp() {
         whenever(context.getString(R.string.notification__received__title)).thenReturn("Payment Received")
         whenever(context.getString(any(), any())).thenReturn("Received amount")
-        whenever(settingsStore.data).thenReturn(flowOf(SettingsData(showNotificationDetails = true)))
+        whenever(settingsStore.data).thenReturn(flowOf(SettingsData()))
         whenever(currencyRepo.convertSatsToFiat(any(), anyOrNull())).thenReturn(
             Result.success(
                 ConvertedAmount(
@@ -156,30 +156,6 @@ class NotifyChannelReadyHandlerTest : BaseUnitTest() {
         verify(activityRepo).insertActivityFromCjit(cjitEntry, channel)
     }
 
-    @Test
-    fun `notification hides details when showNotificationDetails is false`() = test {
-        val event = mock<Event.ChannelReady> {
-            on { channelId } doReturn "channel-1"
-        }
-        val channel = createChannelDetails().copy(
-            channelId = "channel-1",
-            outboundCapacityMsat = 3000_000u,
-        )
-        val cjitEntry = IcJitEntry.mock()
-        whenever(lightningRepo.getChannels()).thenReturn(listOf(channel))
-        whenever(blocktankRepo.getCjitEntry(channel)).thenReturn(cjitEntry)
-        whenever(activityRepo.insertActivityFromCjit(any(), any())).thenReturn(Result.success(true))
-        whenever(settingsStore.data).thenReturn(flowOf(SettingsData(showNotificationDetails = false)))
-        whenever(context.getString(R.string.notification__received__body_hidden)).thenReturn("Hidden")
-
-        val result = sut(NotifyChannelReady.Command(event = event, includeNotification = true))
-
-        assertTrue(result.isSuccess)
-        val showNotification = result.getOrThrow()
-        assertTrue(showNotification is NotifyChannelReady.Result.ShowNotification)
-        assertEquals("Hidden", showNotification.notification.body)
-    }
-
     @Test
     fun `returns Duplicate when activity already exists`() = test {
         val event = mock<Event.ChannelReady> {

app/src/test/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandlerTest.kt

@@ -41,7 +41,7 @@ class NotifyPaymentReceivedHandlerTest : BaseUnitTest() {
     fun setUp() {
         whenever(context.getString(R.string.notification__received__title)).thenReturn("Payment Received")
         whenever(context.getString(any(), any())).thenReturn("Received amount")
-        whenever(settingsStore.data).thenReturn(flowOf(SettingsData(showNotificationDetails = true)))
+        whenever(settingsStore.data).thenReturn(flowOf(SettingsData()))
         whenever(currencyRepo.convertSatsToFiat(any(), anyOrNull())).thenReturn(
             Result.success(
                 ConvertedAmount(

app/src/test/java/to/bitkit/domain/commands/ReceivedNotificationContentTest.kt

@@ -89,18 +89,9 @@ class ReceivedNotificationContentTest : BaseUnitTest() {
         assertEquals(expected, result.body)
     }
 
-    @Test
-    fun `hides the amount when notification details are disabled`() = test {
-        whenever(settingsStore.data).thenReturn(flowOf(SettingsData(showNotificationDetails = false)))
-
-        val result = sut.build(48_064L)
-
-        assertEquals(context.getString(R.string.notification__received__body_hidden), result.body)
-    }
-
     private fun stubSettings(primaryDisplay: PrimaryDisplay) {
         whenever(settingsStore.data).thenReturn(
-            flowOf(SettingsData(showNotificationDetails = true, primaryDisplay = primaryDisplay)),
+            flowOf(SettingsData(primaryDisplay = primaryDisplay)),
         )
     }
 }