chore: review #604

Author: ovitrif

AGENTS.md

@@ -209,7 +209,7 @@ suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
 - ALWAYS wrap `ULong` numbers with `USat` in arithmetic operations, to guard against overflows
 - PREFER to use one-liners with `run {}` when applicable, e.g. `override fun someCall(value: String) = run { this.value = value }`
 - ALWAYS add imports instead of inline fully-qualified names
-- ALWAYS place `@Suppress(...)` annotations at the narrowest possible scope (statement, property, or function level); NEVER use `@file:Suppress(...)` when a more targeted suppression is possible, EXCEPT for `MatchingDeclarationName` where file-level is acceptable when reordering declarations is impractical
+- ALWAYS place `@Suppress()` annotations at the narrowest possible scope; ONLY use `@file:Suppress()` for `MatchingDeclarationName` when reordering declarations is impractical
 
 ### Architecture Guidelines
 

app/src/main/java/to/bitkit/data/widgets/WeatherService.kt

@@ -11,6 +11,7 @@ import to.bitkit.data.dto.FeeEstimates
 import to.bitkit.data.dto.WeatherDTO
 import to.bitkit.env.Env
 import to.bitkit.ext.nowMs
+import to.bitkit.models.USD
 import to.bitkit.models.WidgetType
 import to.bitkit.repositories.CurrencyRepo
 import to.bitkit.utils.AppError
@@ -35,20 +36,25 @@ class WeatherService @Inject constructor(
     override val widgetType = WidgetType.WEATHER
     override val refreshInterval = 8.minutes
 
+    @Volatile
     private var cachedFeeEstimates: FeeEstimates? = null
+
+    @Volatile
     private var feeEstimatesTimestamp: Long = 0L
+
+    @Volatile
     private var cachedHistoricalData: List<BlockFeeRates>? = null
+
+    @Volatile
     private var historicalDataTimestamp: Long = 0L
 
     companion object {
         private const val TAG = "WeatherService"
 
-        @Suppress("SpellCheckingInspection")
-        private const val AVERAGE_SEGWIT_VBYTES_SIZE = 140
+        private const val AVERAGE_SEGWIT_VB_SIZE = 140
         private const val USD_GOOD_THRESHOLD = 1.0 // $1 USD threshold for good condition
         private const val PERCENTILE_LOW = 0.33
         private const val PERCENTILE_HIGH = 0.66
-        private const val USD_CURRENCY = "USD"
         private val TTL_FEE_ESTIMATES = 2.minutes
         private val TTL_HISTORICAL_DATA = 30.minutes
     }
@@ -64,16 +70,16 @@ class WeatherService @Inject constructor(
         val condition = calculateCondition(feeEstimates.normal, history)
 
         // Calculate average fee for display
-        val avgFeeSats = (feeEstimates.normal * AVERAGE_SEGWIT_VBYTES_SIZE).toInt()
+        val avgFeeSats = (feeEstimates.normal * AVERAGE_SEGWIT_VB_SIZE).toLong()
         val currentFee = formatFeeForDisplay(avgFeeSats)
 
         WeatherDTO(
             condition = condition,
             currentFee = currentFee,
-            nextBlockFee = feeEstimates.fast
+            nextBlockFee = feeEstimates.fast,
         )
     }.onFailure {
-        Logger.warn("Failed to fetch weather data", e = it, context = TAG)
+        Logger.warn("Failed to fetch weather data", it, context = TAG)
     }
 
     private suspend fun getFeeEstimates(): FeeEstimates {
@@ -118,8 +124,8 @@ class WeatherService @Inject constructor(
         val highThreshold = historicalFees[floor(historicalFees.size * PERCENTILE_HIGH).toInt()]
 
         // Check USD threshold first
-        val avgFeeSats = currentFeeRate * AVERAGE_SEGWIT_VBYTES_SIZE
-        val avgFeeUsd = currencyRepo.convertSatsToFiat(avgFeeSats.toLong(), currency = USD_CURRENCY).getOrNull()
+        val avgFeeSats = currentFeeRate * AVERAGE_SEGWIT_VB_SIZE
+        val avgFeeUsd = currencyRepo.convertSatsToFiat(avgFeeSats.toLong(), USD).getOrNull()
             ?: return FeeCondition.AVERAGE
 
         if (avgFeeUsd.value <= BigDecimal(USD_GOOD_THRESHOLD)) return FeeCondition.GOOD
@@ -132,8 +138,8 @@ class WeatherService @Inject constructor(
         }
     }
 
-    private fun formatFeeForDisplay(satoshis: Int): String {
-        val usdValue = currencyRepo.convertSatsToFiat(satoshis.toLong(), currency = USD_CURRENCY).getOrNull()
+    private fun formatFeeForDisplay(sats: Long): String {
+        val usdValue = currencyRepo.convertSatsToFiat(sats, USD).getOrNull()
         return usdValue?.formatted.orEmpty()
     }
 }

app/src/main/java/to/bitkit/models/Currency.kt

@@ -19,7 +19,8 @@ const val FIAT_GROUPING_SEPARATOR = ','
 const val DECIMAL_SEPARATOR = '.'
 const val CLASSIC_DECIMALS = 8
 const val FIAT_DECIMALS = 2
-const val EUR_CURRENCY = "EUR"
+const val EUR = "EUR"
+const val USD = "USD"
 
 @Serializable
 data class FxRateResponse(

app/src/main/java/to/bitkit/repositories/BlocktankRepo.kt

@@ -41,7 +41,7 @@ import to.bitkit.env.Env
 import to.bitkit.ext.calculateRemoteBalance
 import to.bitkit.ext.nowTimestamp
 import to.bitkit.models.BlocktankBackupV1
-import to.bitkit.models.EUR_CURRENCY
+import to.bitkit.models.EUR
 import to.bitkit.services.CoreService
 import to.bitkit.services.LightningService
 import to.bitkit.utils.Logger
@@ -378,7 +378,7 @@ class BlocktankRepo @Inject constructor(
     }
 
     private fun getSatsPerEur(): ULong? {
-        return currencyRepo.convertFiatToSats(BigDecimal(1), EUR_CURRENCY).getOrNull()
+        return currencyRepo.convertFiatToSats(BigDecimal(1), EUR).getOrNull()
     }
 
     private fun totalBtChannelsValueSats(info: IBtInfo?): ULong {

app/src/main/java/to/bitkit/ui/screens/transfer/SpendingConfirmScreen.kt

@@ -53,10 +53,10 @@ import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.SwipeToConfirm
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.components.settings.SettingsSwitchRow
+import to.bitkit.ui.openNotificationSettings
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
-import to.bitkit.ui.openNotificationSettings
 import to.bitkit.ui.theme.AppSwitchDefaults
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors

app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveConfirmScreen.kt

@@ -36,10 +36,10 @@ import to.bitkit.ui.components.Title
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.components.settings.SettingsSwitchRow
 import to.bitkit.ui.currencyViewModel
+import to.bitkit.ui.openNotificationSettings
 import to.bitkit.ui.scaffold.SheetTopBar
 import to.bitkit.ui.shared.modifiers.sheetHeight
 import to.bitkit.ui.shared.util.gradientBackground
-import to.bitkit.ui.openNotificationSettings
 import to.bitkit.ui.theme.AppSwitchDefaults
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors