Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ class QuickPaySettingsScreenTest {
QuickPaySettingsScreenContent(
isQuickPayEnabled = true,
quickPayAmount = 5,
quickPayDailyLimitMultiplier = 5,
)
}
}

composeTestRule.onNodeWithTag("QuickpayToggle").assertIsDisplayed()
composeTestRule.onNodeWithTag("quickpay_amount_slider").assertIsDisplayed()
composeTestRule.onNodeWithTag("QuickpayAmountSlider").assertIsDisplayed()
composeTestRule.onNodeWithTag("QuickpayDailyLimitSlider").assertIsDisplayed()
}

@Test
Expand All @@ -52,6 +54,7 @@ class QuickPaySettingsScreenTest {
QuickPaySettingsScreenContent(
isQuickPayEnabled = false,
quickPayAmount = 5,
quickPayDailyLimitMultiplier = 5,
onToggleQuickPay = { enabled ->
toggleCalled = true
toggleValue = enabled
Expand Down
39 changes: 39 additions & 0 deletions app/src/main/java/to/bitkit/data/CacheStore.kt
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,43 @@ class CacheStore @Inject constructor(
store.updateData { it.copy(backgroundReceive = null) }
}

suspend fun quickPaySpentUsdForDay(dayKey: String): Double {
val data = store.data.first()
return if (data.quickPaySpendDayKey == dayKey) data.quickPaySpentUsdToday else 0.0
}

suspend fun tryReserveQuickPaySpendUsd(amountUsd: Double, dayKey: String, dailyCapUsd: Double): Boolean {
var reserved = false
store.updateData {
val spent = if (it.quickPaySpendDayKey == dayKey) it.quickPaySpentUsdToday else 0.0
if (spent + amountUsd > dailyCapUsd) return@updateData it
reserved = true
if (it.quickPaySpendDayKey != dayKey) {
it.copy(quickPaySpendDayKey = dayKey, quickPaySpentUsdToday = amountUsd)
} else {
it.copy(quickPaySpentUsdToday = spent + amountUsd)
}
}
return reserved
}

suspend fun releaseQuickPaySpendUsd(amountUsd: Double, dayKey: String) {
store.updateData {
if (it.quickPaySpendDayKey != dayKey) return@updateData it
it.copy(quickPaySpentUsdToday = (it.quickPaySpentUsdToday - amountUsd).coerceAtLeast(0.0))
}
}

suspend fun recordQuickPaySpendUsd(amountUsd: Double, dayKey: String) {
store.updateData {
if (it.quickPaySpendDayKey != dayKey) {
it.copy(quickPaySpendDayKey = dayKey, quickPaySpentUsdToday = amountUsd)
} else {
it.copy(quickPaySpentUsdToday = it.quickPaySpentUsdToday + amountUsd)
}
}
}

suspend fun reset() {
store.updateData { AppCacheData() }
Logger.info("Deleted all app cached data.")
Expand All @@ -164,6 +201,8 @@ data class AppCacheData(
val backgroundReceive: NewTransactionSheetDetails? = null,
val addressSearchLastUsedReceiveIndexes: Map<String, Int> = mapOf(),
val addressSearchLastUsedChangeIndexes: Map<String, Int> = mapOf(),
val quickPaySpendDayKey: String = "",
Comment thread
ovitrif marked this conversation as resolved.
val quickPaySpentUsdToday: Double = 0.0,
) {
fun isActivityDeleted(activityId: String, walletId: String): Boolean =
scopedActivityId(walletId, activityId) in deletedActivities ||
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/to/bitkit/data/SettingsStore.kt
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ data class SettingsData(
val bgPaymentsIntroSeen: Boolean = false,
val isQuickPayEnabled: Boolean = false,
val quickPayAmount: Int = 5,
val quickPayDailyLimitMultiplier: Int = 5,
val lightningSetupStep: Int = 0,
val isPinEnabled: Boolean = false,
val isBiometricEnabled: Boolean = false,
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/to/bitkit/ext/DateTime.kt
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ fun nowMillis(clock: Clock = Clock.System): Long = clock.now().toEpochMillisecon
@OptIn(ExperimentalTime::class)
fun Clock.nowMs(): Long = now().toEpochMilliseconds()

@OptIn(ExperimentalTime::class)
fun quickPaySpendDayKey(
clock: Clock = Clock.System,
timeZone: TimeZone = TimeZone.currentSystemDefault(),
): String = clock.now().toLocalDateTime(timeZone).date.toString()

fun nowTimestamp(): Instant = Instant.now().truncatedTo(ChronoUnit.SECONDS)

fun dateTimeFormatterOf(
Expand Down
Loading
Loading