Fix sort menu icon on Balance page

app/src/main/java/io/horizontalsystems/bankwallet/modules/chart/AbstractChartService.kt

@@ -7,6 +7,7 @@ import io.horizontalsystems.chartview.ChartViewType
 import io.horizontalsystems.marketkit.models.HsTimePeriod
 import io.reactivex.Single
 import io.reactivex.subjects.BehaviorSubject
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -86,6 +87,8 @@ abstract class AbstractChartService {
             try {
                 val chartPointsWrapper = itemsSingle.await()
                 chartPointsWrapperObservable.onNext(Result.success(chartPointsWrapper))
+            } catch (e: CancellationException) {
+                // Do nothing
             } catch (e: Throwable) {
                 chartPointsWrapperObservable.onNext(Result.failure(e))
             }

app/src/main/java/io/horizontalsystems/bankwallet/modules/chart/ChartIndicatorManager.kt

@@ -2,17 +2,23 @@ package io.horizontalsystems.bankwallet.modules.chart
 
 import io.horizontalsystems.bankwallet.core.ILocalStorage
 import io.horizontalsystems.chartview.models.ChartIndicator
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.launch
 import kotlin.math.abs
 
 class ChartIndicatorManager(
     private val chartIndicatorSettingsDao: ChartIndicatorSettingsDao,
     private val localStorage: ILocalStorage
 ) {
-    private val _isEnabledFlow = MutableStateFlow(localStorage.chartIndicatorsEnabled)
-    val isEnabledFlow: StateFlow<Boolean>
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+    val isEnabled: Boolean
+        get() = localStorage.chartIndicatorsEnabled
+    private val _isEnabledFlow : MutableSharedFlow<Boolean> = MutableSharedFlow()
+    val isEnabledFlow: SharedFlow<Boolean>
         get() = _isEnabledFlow
 
     val allIndicatorsFlow = chartIndicatorSettingsDao.getAll()
@@ -71,12 +77,16 @@ class ChartIndicatorManager(
 
     fun enable() {
         localStorage.chartIndicatorsEnabled = true
-        _isEnabledFlow.update { true }
+        scope.launch {
+            _isEnabledFlow.emit(true)
+        }
     }
 
     fun disable() {
         localStorage.chartIndicatorsEnabled = false
-        _isEnabledFlow.update { false }
+        scope.launch {
+            _isEnabledFlow.emit(false)
+        }
     }
 
     fun enableIndicator(indicatorId: String) {

app/src/main/java/io/horizontalsystems/bankwallet/modules/coin/overview/CoinOverviewChartService.kt

@@ -1,7 +1,6 @@
 package io.horizontalsystems.bankwallet.modules.coin.overview
 
 import android.util.Log
-import io.horizontalsystems.bankwallet.core.diff
 import io.horizontalsystems.bankwallet.core.managers.CurrencyManager
 import io.horizontalsystems.bankwallet.core.managers.MarketKitWrapper
 import io.horizontalsystems.bankwallet.core.stats.StatEvent
@@ -43,7 +42,7 @@ class CoinOverviewChartService(
     private var chartStartTime: Long = 0
     private val cache = mutableMapOf<String, Pair<Long, List<MarketKitChartPoint>>>()
 
-    private var indicatorsEnabled = chartIndicatorManager.isEnabledFlow.value
+    private var indicatorsEnabled = chartIndicatorManager.isEnabled
 
     override suspend fun start() {
         try {
@@ -169,7 +168,7 @@ class CoinOverviewChartService(
 
             if (chartInterval == HsTimePeriod.Day1) {
                 startTimestampAdjusted = latestCoinPrice.timestamp - 24 * 60 * 60
-                val diff = latestCoinPrice.diff
+                val diff = latestCoinPrice.diff24h
                 if (diff != null) {
                     val startValue =
                         (latestCoinPrice.value * 100.toBigDecimal()) / (diff + 100.toBigDecimal())

app/src/main/java/io/horizontalsystems/bankwallet/modules/coin/overview/CoinOverviewService.kt

@@ -10,6 +10,7 @@ import io.reactivex.Observable
 import io.reactivex.subjects.BehaviorSubject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.rx2.await
@@ -24,6 +25,7 @@ class CoinOverviewService(
 ) {
     val currency get() = currencyManager.baseCurrency
 
+    private var job: Job? = null
     private val coinOverviewSubject = BehaviorSubject.create<DataState<CoinOverviewItem>>()
     val coinOverviewObservable: Observable<DataState<CoinOverviewItem>>
         get() = coinOverviewSubject
@@ -54,10 +56,22 @@ class CoinOverviewService(
     }
 
     private fun fetchCoinOverview() {
-        coroutineScope.launch {
+        job = coroutineScope.launch {
             try {
-                val marketInfoOverview = marketKit.marketInfoOverviewSingle(fullCoin.coin.uid, currencyManager.baseCurrency.code, languageManager.currentLanguage).await()
-                coinOverviewSubject.onNext(DataState.Success(CoinOverviewItem(fullCoin.coin.code, marketInfoOverview, guideUrl)))
+                val marketInfoOverview = marketKit.marketInfoOverviewSingle(
+                    fullCoin.coin.uid,
+                    currencyManager.baseCurrency.code,
+                    languageManager.currentLanguage
+                ).await()
+                coinOverviewSubject.onNext(
+                    DataState.Success(
+                        CoinOverviewItem(
+                            fullCoin.coin.code,
+                            marketInfoOverview,
+                            guideUrl
+                        )
+                    )
+                )
             } catch (e: Throwable) {
                 coinOverviewSubject.onNext(DataState.Error(e))
             }
@@ -69,7 +83,7 @@ class CoinOverviewService(
     }
 
     fun refresh() {
-        stop()
+        job?.cancel()
         start()
     }
 }

app/src/main/java/io/horizontalsystems/bankwallet/modules/coin/overview/CoinOverviewViewModel.kt

@@ -51,7 +51,7 @@ class CoinOverviewViewModel(
     var chartIndicatorsState by mutableStateOf(
         ChartIndicatorsState(
             hasActiveSubscription = true,
-            enabled = chartIndicatorManager.isEnabledFlow.value
+            enabled = chartIndicatorManager.isEnabled
         )
     )
 

app/src/main/java/io/horizontalsystems/bankwallet/ui/compose/components/ButtonSecondary.kt

@@ -143,12 +143,13 @@ fun ButtonSecondaryTransparent(
         ),
         content = {
             if (iconRight != null) {
-                Row {
-                    Text(
-                        title,
+                Row (
+                    verticalAlignment = Alignment.CenterVertically
+                ){
+                    captionSB_leah(
+                        text = title,
                         maxLines = 1,
-                        style = ComposeAppTheme.typography.captionSB,
-                        overflow = TextOverflow.Ellipsis,
+                        overflow = TextOverflow.Ellipsis
                     )
                     Icon(
                         modifier = Modifier.padding(start = 4.dp),
@@ -158,7 +159,11 @@ fun ButtonSecondaryTransparent(
                     )
                 }
             } else {
-                Text(title, maxLines = 1, overflow = TextOverflow.Ellipsis)
+                captionSB_leah(
+                    text = title,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
             }
         },
         enabled = enabled