Merge pull request #167 from synonymdev/feat/settings-general-quickpay

feat: QuickPay & QuickPay Settings

Author: ovitrif

app/src/androidTest/java/to/bitkit/ui/settings/quickPay/QuickPaySettingsScreenTest.kt

@@ -0,0 +1,67 @@
+package to.bitkit.ui.settings.quickPay
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performClick
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import to.bitkit.ui.theme.AppThemeSurface
+
+@HiltAndroidTest
+class QuickPaySettingsScreenTest {
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @get:Rule
+    val hiltRule = HiltAndroidRule(this)
+
+    @Before
+    fun setup() {
+        hiltRule.inject()
+    }
+
+    @Test
+    fun whenScreenLoaded_shouldShowAllComponents() {
+        composeTestRule.setContent {
+            AppThemeSurface {
+                QuickPaySettingsScreenContent(
+                    isQuickPayEnabled = true,
+                    quickPayAmount = 5,
+                )
+            }
+        }
+
+        composeTestRule.onNodeWithTag("quickpay_toggle_switch").assertIsDisplayed()
+        composeTestRule.onNodeWithTag("quickpay_amount_slider").assertIsDisplayed()
+    }
+
+    @Test
+    fun whenToggleSwitchClicked_shouldTriggerCallback() {
+        var toggleCalled = false
+        var toggleValue = false
+
+        composeTestRule.setContent {
+            AppThemeSurface {
+                QuickPaySettingsScreenContent(
+                    isQuickPayEnabled = false,
+                    quickPayAmount = 5,
+                    onToggleQuickPay = { enabled ->
+                        toggleCalled = true
+                        toggleValue = enabled
+                    },
+                )
+            }
+        }
+
+        composeTestRule.onNodeWithTag("quickpay_toggle_switch")
+            .performClick()
+
+        assert(toggleCalled)
+        assert(toggleValue) // Should be true since we're toggling from false
+    }
+}

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

@@ -63,6 +63,8 @@ data class SettingsData(
     val hasSeenShopIntro: Boolean = false,
     val hasSeenProfileIntro: Boolean = false,
     val quickPayIntroSeen: Boolean = false,
+    val isQuickPayEnabled: Boolean = false,
+    val quickPayAmount: Int = 5,
     val lightningSetupStep: Int = 0,
     val isPinEnabled: Boolean = false,
     val isPinOnLaunchEnabled: Boolean = false,

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

@@ -8,6 +8,7 @@ import java.text.DecimalFormatSymbols
 import java.util.Locale
 
 const val BITCOIN_SYMBOL = "₿"
+const val SATS_IN_BTC = 100_000_000
 
 @Serializable
 data class FxRateResponse(
@@ -51,7 +52,7 @@ data class ConvertedAmount(
     val flag: String,
     val sats: Long,
 ) {
-    val btcValue: BigDecimal = BigDecimal(sats).divide(BigDecimal(100_000_000))
+    val btcValue: BigDecimal = BigDecimal(sats).divide(BigDecimal(SATS_IN_BTC))
 
     data class BitcoinDisplayComponents(
         val symbol: String,

app/src/main/java/to/bitkit/services/CurrencyService.kt

@@ -5,13 +5,15 @@ import to.bitkit.async.ServiceQueue
 import to.bitkit.data.BlocktankHttpClient
 import to.bitkit.models.ConvertedAmount
 import to.bitkit.models.FxRate
+import to.bitkit.models.SATS_IN_BTC
 import to.bitkit.ui.utils.formatCurrency
 import to.bitkit.utils.AppError
 import java.math.BigDecimal
 import java.math.RoundingMode
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.pow
+import kotlin.math.roundToLong
 
 @Singleton
 class CurrencyService @Inject constructor(
@@ -52,7 +54,7 @@ class CurrencyService @Inject constructor(
     }
 
     fun convert(sats: Long, rate: FxRate): ConvertedAmount? {
-        val btcAmount = BigDecimal(sats).divide(BigDecimal(100_000_000))
+        val btcAmount = BigDecimal(sats).divide(BigDecimal(SATS_IN_BTC))
         val value: BigDecimal = btcAmount.multiply(BigDecimal.valueOf(rate.rate))
 
         val formatted = value.formatCurrency() ?: return null
@@ -69,15 +71,26 @@ class CurrencyService @Inject constructor(
 
     fun convertFiatToSats(fiatValue: BigDecimal, rate: FxRate): ULong {
         val btcAmount = fiatValue.divide(BigDecimal.valueOf(rate.rate), 8, RoundingMode.HALF_UP)
-        val satsDecimal = btcAmount.multiply(BigDecimal(100_000_000))
+        val satsDecimal = btcAmount.multiply(BigDecimal(SATS_IN_BTC))
 
         val roundedNumber = satsDecimal.setScale(0, RoundingMode.HALF_UP)
 
         return roundedNumber.toLong().toULong()
     }
 
-    fun getAvailableCurrencies(rates: List<FxRate>): List<String> {
-        return rates.map { it.quote }
+    fun convertFiatToSats(fiatAmount: Double, currency: String, rates: List<FxRate>): Long {
+        val rate = getCurrentRate(currency, rates) ?: return 0
+
+        // Convert the fiat amount to BTC, then to sats
+        val btc = fiatAmount / rate.rate
+        val sats = (btc * SATS_IN_BTC).roundToLong()
+
+        return sats
+    }
+
+    suspend fun convertFiatToSats(fiatAmount: Double, currency: String): Long {
+        val rates = cachedRates ?: fetchLatestRates()
+        return convertFiatToSats(fiatAmount, currency, rates)
     }
 
     fun getCurrentRate(currency: String, rates: List<FxRate>): FxRate? {

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

@@ -168,7 +168,7 @@ fun AmountInput(
                     fiatAmount = TextFieldValue(newFiatAmount, TextRange(newFiatAmount.length))
 
                     newFiatAmount.toDoubleOrNull()?.let { fiatDouble ->
-                        currency.convertFiatToSats(fiatAmount = fiatDouble)?.let { convertedSats ->
+                        currency.convertFiatToSats(fiatAmount = fiatDouble).let { convertedSats ->
                             val satsString = convertedSats.toString()
                             satsAmount = TextFieldValue(satsString, TextRange(satsString.length))
                             onSatsChange(convertedSats)

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

@@ -24,6 +24,7 @@ import to.bitkit.ext.removeSpaces
 import to.bitkit.models.BITCOIN_SYMBOL
 import to.bitkit.models.BitcoinDisplayUnit
 import to.bitkit.models.PrimaryDisplay
+import to.bitkit.models.SATS_IN_BTC
 import to.bitkit.models.formatToModernDisplay
 import to.bitkit.ui.currencyViewModel
 import to.bitkit.ui.theme.AppThemeSurface
@@ -56,8 +57,7 @@ fun NumberPadTextField(
     val currency = currencyViewModel ?: return
 
     val satoshis = if (primaryDisplay == PrimaryDisplay.FIAT) {
-        currency.convertFiatToSats(fiatAmount = input.replace(",", "").toDoubleOrNull() ?: 0.0)
-            .toString()
+        currency.convertFiatToSats(fiatAmount = input.replace(",", "").toDoubleOrNull() ?: 0.0).toString()
     } else {
         input.removeSpaces()
     }
@@ -152,7 +152,7 @@ fun AmountInputHandler(
         lastDisplay = primaryDisplay
         val newInput = when (primaryDisplay) {
             PrimaryDisplay.BITCOIN -> { //Convert fiat to sats
-                val amountLong = currencyVM.convertFiatToSats(input.replace(",", "").toDoubleOrNull() ?: 0.0) ?: 0
+                val amountLong = currencyVM.convertFiatToSats(input.replace(",", "").toDoubleOrNull() ?: 0.0)
                 if (amountLong > 0.0) amountLong.toString() else ""
             }
 
@@ -169,11 +169,11 @@ fun AmountInputHandler(
     LaunchedEffect(input) {
         val sats = when (primaryDisplay) {
             PrimaryDisplay.BITCOIN -> {
-                if (displayUnit == BitcoinDisplayUnit.MODERN) input else (input.toLongOrDefault(0L) * 100_000_000).toString()
+                if (displayUnit == BitcoinDisplayUnit.MODERN) input else (input.toLongOrDefault(0L) * SATS_IN_BTC).toString()
             }
 
             PrimaryDisplay.FIAT -> {
-                val convertedAmount = currencyVM.convertFiatToSats(input.replace(",", "").toDoubleOrNull() ?: 0.0) ?: 0L
+                val convertedAmount = currencyVM.convertFiatToSats(input.replace(",", "").toDoubleOrNull() ?: 0.0)
                 convertedAmount.toString()
             }
         }