synonymdev · jvsena42 · Feb 18, 2026 · Feb 18, 2026 · Feb 18, 2026 · Feb 18, 2026
diff --git a/app/src/main/java/to/bitkit/data/SettingsStore.kt b/app/src/main/java/to/bitkit/data/SettingsStore.kt
@@ -124,6 +124,7 @@ data class SettingsData(
     val backupWarningIgnoredMillis: Long = 0,
     val notificationsIgnoredMillis: Long = 0,
     val balanceWarningTimes: Int = 0,
+    val widgetsOnboardingHintDismissed: Boolean = false,
     val coinSelectAuto: Boolean = true,
     val coinSelectPreference: CoinSelectionPreference = CoinSelectionPreference.BranchAndBound,
     val electrumServer: String = Env.electrumServerUrl,

diff --git a/app/src/main/java/to/bitkit/data/WidgetsStore.kt b/app/src/main/java/to/bitkit/data/WidgetsStore.kt
@@ -134,7 +134,11 @@ class WidgetsStore @Inject constructor(
         if (store.data.first().widgets.map { it.type }.contains(type)) return
 
         store.updateData { data ->
-            data.copy(widgets = (data.widgets + WidgetWithPosition(type = type)).sortedBy { it.position })
+            val nextPosition = (data.widgets.maxOfOrNull { it.position } ?: -1) + 1
+            data.copy(
+                widgets = (data.widgets + WidgetWithPosition(type = type, position = nextPosition))
+                    .sortedBy { it.position }
+            )
         }
     }
 
@@ -160,9 +164,9 @@ class WidgetsStore @Inject constructor(
 @Serializable
 data class WidgetsData(
     val widgets: List<WidgetWithPosition> = listOf(
-        WidgetWithPosition(type = WidgetType.PRICE, position = 0),
-        WidgetWithPosition(type = WidgetType.BLOCK, position = 1),
-        WidgetWithPosition(type = WidgetType.NEWS, position = 2),
+        WidgetWithPosition(type = WidgetType.SUGGESTIONS, position = 0),
+        WidgetWithPosition(type = WidgetType.PRICE, position = 1),
+        WidgetWithPosition(type = WidgetType.BLOCK, position = 2),
     ),
     val headlinePreferences: HeadlinePreferences = HeadlinePreferences(),
     val factsPreferences: FactsPreferences = FactsPreferences(),

diff --git a/app/src/main/java/to/bitkit/data/dto/price/PriceDTO.kt b/app/src/main/java/to/bitkit/data/dto/price/PriceDTO.kt
@@ -1,9 +1,11 @@
 package to.bitkit.data.dto.price
 
+import androidx.compose.runtime.Stable
 import kotlinx.serialization.Serializable
 
+@Stable
 @Serializable
 data class PriceDTO(
-    val widgets: List<PriceWidgetData>,
+    @Stable val widgets: List<PriceWidgetData>,
     val source: String
 )
diff --git a/app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt b/app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt
@@ -68,16 +68,24 @@ class NotifyPaymentReceivedHandler @Inject constructor(
         if (command.event.details.amountSats <= 0) return false
 
         delay(DELAY_FOR_ACTIVITY_SYNC_MS)
-        val shouldShowSheet = activityRepo.shouldShowReceivedSheet(
+        val shouldShowSheet = retryShouldShowReceivedSheet(
             command.event.txid,
-            command.event.details.amountSats.toULong()
+            command.event.details.amountSats.toULong(),
         )
         if (shouldShowSheet) {
             activityRepo.markOnchainActivityAsSeen(command.event.txid)
         }
         return shouldShowSheet
     }
 
+    private suspend fun retryShouldShowReceivedSheet(txid: String, amountSats: ULong): Boolean {
+        repeat(MAX_RETRIES) {
+            if (activityRepo.shouldShowReceivedSheet(txid, amountSats)) return true
+            delay(RETRY_DELAY_MS)
+        }
+        return activityRepo.shouldShowReceivedSheet(txid, amountSats)
+    }
+
     private fun buildSheetDetails(command: NotifyPaymentReceived.Command) = NewTransactionSheetDetails(
         type = when (command) {
             is NotifyPaymentReceived.Command.Lightning -> NewTransactionSheetType.LIGHTNING
@@ -128,5 +136,7 @@ class NotifyPaymentReceivedHandler @Inject constructor(
          * the transaction before checking for RBF replacement or channel closure.
          */
         private const val DELAY_FOR_ACTIVITY_SYNC_MS = 500L
+        private const val RETRY_DELAY_MS = 300L
+        private const val MAX_RETRIES = 3
     }
 }
diff --git a/app/src/main/java/to/bitkit/ext/String.kt b/app/src/main/java/to/bitkit/ext/String.kt
@@ -22,6 +22,8 @@ fun String.truncate(length: Int): String {
 
 fun String.removeSpaces() = this.filterNot { it.isWhitespace() }
 
+fun String.spaceToNewline() = replace(" ", "\n")
+
 fun String.toLongOrDefault(defaultValue: Long = 0): Long = toLongOrNull() ?: defaultValue
 
 /**

diff --git a/app/src/main/java/to/bitkit/models/BalanceState.kt b/app/src/main/java/to/bitkit/models/BalanceState.kt
@@ -1,7 +1,9 @@
 package to.bitkit.models
 
+import androidx.compose.runtime.Immutable
 import kotlinx.serialization.Serializable
 
+@Immutable
 @Serializable
 data class BalanceState(
     val totalOnchainSats: ULong = 0uL,

diff --git a/app/src/main/java/to/bitkit/models/WidgetType.kt b/app/src/main/java/to/bitkit/models/WidgetType.kt
@@ -31,5 +31,9 @@ enum class WidgetType(
     WEATHER(
         iconRes = R.drawable.widget_cloud,
         title = R.string.widgets__weather__name
+    ),
+    SUGGESTIONS(
+        iconRes = R.drawable.widget_suggestions,
+        title = R.string.widgets__suggestions__name,
     )
 }
diff --git a/app/src/main/java/to/bitkit/models/WidgetWithPosition.kt b/app/src/main/java/to/bitkit/models/WidgetWithPosition.kt
@@ -1,7 +1,9 @@
 package to.bitkit.models
 
+import androidx.compose.runtime.Immutable
 import kotlinx.serialization.Serializable
 
+@Immutable
 @Serializable
 data class WidgetWithPosition(
     val type: WidgetType,

diff --git a/app/src/main/java/to/bitkit/models/widget/ArticleModel.kt b/app/src/main/java/to/bitkit/models/widget/ArticleModel.kt
@@ -1,5 +1,6 @@
 package to.bitkit.models.widget
 
+import androidx.compose.runtime.Immutable
 import kotlinx.serialization.Serializable
 import to.bitkit.data.dto.ArticleDTO
 import to.bitkit.ext.toRelativeTimeString
@@ -12,6 +13,7 @@ import kotlin.time.ExperimentalTime
 
 private const val TAG = "ArticleModel"
 
+@Immutable
 @Serializable
 data class ArticleModel(
     val title: String,

diff --git a/app/src/main/java/to/bitkit/models/widget/BlockModel.kt b/app/src/main/java/to/bitkit/models/widget/BlockModel.kt
@@ -1,10 +1,12 @@
 package to.bitkit.models.widget
 
+import androidx.compose.runtime.Immutable
 import kotlinx.serialization.Serializable
 import to.bitkit.data.dto.BlockDTO
 import to.bitkit.ext.toDateUTC
 import to.bitkit.ext.toTimeUTC
 
+@Immutable
 @Serializable
 data class BlockModel(
     val height: String,

diff --git a/app/src/main/java/to/bitkit/models/widget/BlocksPreferences.kt b/app/src/main/java/to/bitkit/models/widget/BlocksPreferences.kt
@@ -1,7 +1,9 @@
 package to.bitkit.models.widget
 
+import androidx.compose.runtime.Immutable
 import kotlinx.serialization.Serializable
 
+@Immutable
 @Serializable
 data class BlocksPreferences(
     val showBlock: Boolean = true,

diff --git a/app/src/main/java/to/bitkit/models/widget/FactsPreferences.kt b/app/src/main/java/to/bitkit/models/widget/FactsPreferences.kt
@@ -1,7 +1,9 @@
 package to.bitkit.models.widget
 
+import androidx.compose.runtime.Immutable
 import kotlinx.serialization.Serializable
 
+@Immutable
 @Serializable
 data class FactsPreferences(
     val showSource: Boolean = false

diff --git a/app/src/main/java/to/bitkit/models/widget/HeadlinePreferences.kt b/app/src/main/java/to/bitkit/models/widget/HeadlinePreferences.kt
@@ -1,7 +1,9 @@
 package to.bitkit.models.widget
 
+import androidx.compose.runtime.Immutable
 import kotlinx.serialization.Serializable
 
+@Immutable
 @Serializable
 data class HeadlinePreferences(
     val showTime: Boolean = true,

diff --git a/app/src/main/java/to/bitkit/models/widget/PricePreferences.kt b/app/src/main/java/to/bitkit/models/widget/PricePreferences.kt
@@ -1,12 +1,14 @@
 package to.bitkit.models.widget
 
+import androidx.compose.runtime.Stable
 import kotlinx.serialization.Serializable
 import to.bitkit.data.dto.price.GraphPeriod
 import to.bitkit.data.dto.price.TradingPair
 
+@Stable
 @Serializable
 data class PricePreferences(
-    val enabledPairs: List<TradingPair> = listOf(
+    @Stable val enabledPairs: List<TradingPair> = listOf(
         TradingPair.BTC_USD
     ),
     val period: GraphPeriod? = GraphPeriod.ONE_DAY,

diff --git a/app/src/main/java/to/bitkit/models/widget/WeatherPreferences.kt b/app/src/main/java/to/bitkit/models/widget/WeatherPreferences.kt
@@ -1,7 +1,9 @@
 package to.bitkit.models.widget
 
+import androidx.compose.runtime.Immutable
 import kotlinx.serialization.Serializable
 
+@Immutable
 @Serializable
 data class WeatherPreferences(
     val showTitle: Boolean = true,

diff --git a/app/src/main/java/to/bitkit/repositories/WidgetsRepo.kt b/app/src/main/java/to/bitkit/repositories/WidgetsRepo.kt
@@ -4,19 +4,27 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import to.bitkit.data.SettingsStore
+import to.bitkit.data.WidgetsData
 import to.bitkit.data.WidgetsStore
+import to.bitkit.data.dto.ArticleDTO
+import to.bitkit.data.dto.BlockDTO
+import to.bitkit.data.dto.WeatherDTO
+import to.bitkit.data.dto.price.PriceDTO
 import to.bitkit.data.widgets.BlocksService
 import to.bitkit.data.widgets.FactsService
 import to.bitkit.data.widgets.NewsService
@@ -52,14 +60,30 @@ class WidgetsRepo @Inject constructor(
     private val repoScope = CoroutineScope(bgDispatcher + SupervisorJob())
     private val widgetJobs = ConcurrentHashMap<WidgetType, Job>()
 
-    val widgetsDataFlow = widgetsStore.data
+    val widgetsDataFlow: StateFlow<WidgetsData> = widgetsStore.data
+        .stateIn(repoScope, SharingStarted.Eagerly, WidgetsData())
+
     val showWidgetTitles = settingsStore.data.map { it.showWidgetTitles }
 
-    val articlesFlow = widgetsStore.articlesFlow
-    val factsFlow = widgetsStore.factsFlow
-    val blocksFlow = widgetsStore.blocksFlow
-    val weatherFlow = widgetsStore.weatherFlow
-    val priceFlow = widgetsStore.priceFlow
+    val articlesFlow: StateFlow<List<ArticleDTO>> = widgetsDataFlow
+        .map { it.articles }
+        .stateIn(repoScope, SharingStarted.Eagerly, emptyList())
+
+    val factsFlow: StateFlow<List<String>> = widgetsDataFlow
+        .map { it.facts }
+        .stateIn(repoScope, SharingStarted.Eagerly, emptyList())
+
+    val blocksFlow: StateFlow<BlockDTO?> = widgetsDataFlow
+        .map { it.block }
+        .stateIn(repoScope, SharingStarted.Eagerly, null)
+
+    val weatherFlow: StateFlow<WeatherDTO?> = widgetsDataFlow
+        .map { it.weather }
+        .stateIn(repoScope, SharingStarted.Eagerly, null)
+
+    val priceFlow: StateFlow<PriceDTO?> = widgetsDataFlow
+        .map { it.price }
+        .stateIn(repoScope, SharingStarted.Eagerly, null)
 
     private val _refreshStates = MutableStateFlow(
         WidgetType.entries.associateWith { false }
@@ -84,7 +108,7 @@ class WidgetsRepo @Inject constructor(
 
     private fun updateWidgetJobs(enabledWidgetTypes: Set<WidgetType>) {
         val widgetTypesWithServices = WidgetType.entries.filter {
-            it != WidgetType.CALCULATOR
+            it != WidgetType.CALCULATOR && it != WidgetType.SUGGESTIONS
         }
 
         widgetTypesWithServices.forEach { widgetType ->
@@ -138,7 +162,9 @@ class WidgetsRepo @Inject constructor(
                 }
             }
 
-            WidgetType.CALCULATOR -> throw NotImplementedError("Calculator widget doesn't need a service")
+            WidgetType.CALCULATOR,
+            WidgetType.SUGGESTIONS,
+            -> throw NotImplementedError("Widget doesn't need a service")
         }
 
         widgetJobs[widgetType] = job
@@ -200,8 +226,10 @@ class WidgetsRepo @Inject constructor(
     }
 
     suspend fun refreshEnabledWidgets() = withContext(bgDispatcher) {
-        widgetsDataFlow.first().widgets.forEach {
-            refreshWidget(it.type)
+        coroutineScope {
+            widgetsDataFlow.first().widgets
+                .filter { it.type != WidgetType.CALCULATOR && it.type != WidgetType.SUGGESTIONS }
+                .forEach { launch { refreshWidget(it.type) } }
         }
     }
 
@@ -226,9 +254,9 @@ class WidgetsRepo @Inject constructor(
                 widgetsStore.updateBlock(block)
             }
 
-            WidgetType.CALCULATOR -> {
-                throw NotImplementedError("Calculator widget doesn't need a service")
-            }
+            WidgetType.CALCULATOR,
+            WidgetType.SUGGESTIONS,
+            -> throw NotImplementedError("Widget doesn't need a service")
 
             WidgetType.FACTS -> updateWidget(factsService) { facts ->
                 widgetsStore.updateFacts(facts)

diff --git a/app/src/main/java/to/bitkit/ui/ContentView.kt b/app/src/main/java/to/bitkit/ui/ContentView.kt
@@ -117,6 +117,8 @@ import to.bitkit.ui.screens.widgets.headlines.HeadlinesViewModel
 import to.bitkit.ui.screens.widgets.price.PriceEditScreen
 import to.bitkit.ui.screens.widgets.price.PricePreviewScreen
 import to.bitkit.ui.screens.widgets.price.PriceViewModel
+import to.bitkit.ui.screens.widgets.suggestions.SuggestionsPreviewScreen
+import to.bitkit.ui.screens.widgets.suggestions.SuggestionsViewModel
 import to.bitkit.ui.screens.widgets.weather.WeatherEditScreen
 import to.bitkit.ui.screens.widgets.weather.WeatherPreviewScreen
 import to.bitkit.ui.screens.widgets.weather.WeatherViewModel
@@ -842,10 +844,7 @@ private fun NavGraphBuilder.allActivity(
     composableWithDefaultTransitions<Routes.AllActivity> {
         AllActivityScreen(
             viewModel = activityListViewModel,
-            onBack = {
-                activityListViewModel.clearFilters()
-                navController.navigateToHome()
-            },
+            onBack = { navController.popBackStack() },
             onActivityItemClick = { id -> navController.navigateToActivityItem(id) },
         )
     }
@@ -1325,6 +1324,7 @@ private fun NavGraphBuilder.widgets(
         )
     }
     composableWithDefaultTransitions<Routes.AddWidget> {
+        val showWidgets by settingsViewModel.showWidgets.collectAsStateWithLifecycle()
         AddWidgetsScreen(
             onWidgetSelected = { widgetType ->
                 when (widgetType) {
@@ -1334,10 +1334,21 @@ private fun NavGraphBuilder.widgets(
                     WidgetType.NEWS -> navController.navigateTo(Routes.HeadlinesPreview)
                     WidgetType.PRICE -> navController.navigateTo(Routes.PricePreview)
                     WidgetType.WEATHER -> navController.navigateTo(Routes.WeatherPreview)
+                    WidgetType.SUGGESTIONS -> navController.navigateTo(Routes.SuggestionsPreview)
                 }
             },
             fiatSymbol = LocalCurrencies.current.currencySymbol,
-            onBackCLick = { navController.popBackStack() }
+            onBackClick = { navController.popBackStack() },
+            showWidgets = showWidgets,
+            onEnableInSettingsClick = { navController.navigate(Routes.WidgetsSettings) },
+        )
+    }
+    composableWithDefaultTransitions<Routes.SuggestionsPreview> {
+        val viewModel = hiltViewModel<SuggestionsViewModel>()
+        SuggestionsPreviewScreen(
+            suggestionsViewModel = viewModel,
+            onClose = { navController.navigateToHome() },
+            onBack = { navController.popBackStack() },
         )
     }
     composableWithDefaultTransitions<Routes.CalculatorPreview> {
@@ -1839,6 +1850,9 @@ sealed interface Routes {
     @Serializable
     data object AddWidget : Routes
 
+    @Serializable
+    data object SuggestionsPreview : Routes
+
     @Serializable
     data object Headlines : Routes
 

diff --git a/app/src/main/java/to/bitkit/ui/components/ActivityBanner.kt b/app/src/main/java/to/bitkit/ui/components/ActivityBanner.kt
@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Icon
@@ -161,7 +162,8 @@ fun ActivityBanner(
             Icon(
                 painter = painterResource(icon),
                 contentDescription = null,
-                tint = gradientColor
+                tint = gradientColor,
+                modifier = Modifier.size(20.dp)
             )
 
             Headline20(
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,8 @@ fun String.truncate(length: Int): String { @@
     fun String.removeSpaces() = this.filterNot { it.isWhitespace() }
+    fun String.spaceToNewline() = replace(" ", "\n")
     fun String.toLongOrDefault(defaultValue: Long = 0): Long = toLongOrNull() ?: defaultValue
     /**
@@ Expand Down @@