Skip to content
This repository has been archived by the owner on Nov 5, 2024. It is now read-only.

Fix #3432 Recurring expenses spawn at UTC timing instead of local time #3570

Merged
merged 3 commits into from
Sep 30, 2024
Merged

Fix #3432 Recurring expenses spawn at UTC timing instead of local time #3570

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0553083
Fixes #3432 : recurring expenses not spawn at local time
Mushfiq1060 Sep 29, 2024
41fddcd
Fixes #3432 : refactor the code as per the requested changes
Mushfiq1060 Sep 29, 2024
4e80e24
Fixes #3432 : refactor code
Mushfiq1060 Sep 29, 2024
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
10 changes: 7 additions & 3 deletions temp/legacy-code/src/main/java/com/ivy/legacy/domain/action/viewmodel/home/DueTrnsInfoAct.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.ivy.wallet.domain.action.viewmodel.home

import com.ivy.base.time.TimeConverter
import com.ivy.data.model.Transaction
import com.ivy.frp.action.FPAction
import com.ivy.frp.lambda
import com.ivy.frp.then
import com.ivy.legacy.utils.dateNowUTC
import com.ivy.wallet.domain.action.account.AccountByIdAct
import com.ivy.wallet.domain.action.exchange.ExchangeAct
import com.ivy.wallet.domain.action.exchange.actInput
Expand All @@ -16,20 +16,24 @@ import com.ivy.wallet.domain.pure.exchange.exchangeInBaseCurrency
import com.ivy.wallet.domain.pure.transaction.expenses
import com.ivy.wallet.domain.pure.transaction.incomes
import com.ivy.wallet.domain.pure.transaction.sumTrns
import java.time.Instant
import java.time.LocalDate
import javax.inject.Inject

class DueTrnsInfoAct @Inject constructor(
private val dueTrnsAct: DueTrnsAct,
private val accountByIdAct: AccountByIdAct,
private val exchangeAct: ExchangeAct
private val exchangeAct: ExchangeAct,
private val timeConverter: TimeConverter
) : FPAction<DueTrnsInfoAct.Input, DueTrnsInfoAct.Output>() {

override suspend fun Input.compose(): suspend () -> Output =
suspend {
range
} then dueTrnsAct then { trns ->
val dateNow = dateNowUTC()
val dateNow = with(timeConverter) {
Instant.now().toLocalDate()
Mushfiq1060 marked this conversation as resolved.
Show resolved Hide resolved
}
trns.filter {
this.dueFilter(it, dateNow)
}
Expand Down
4 changes: 2 additions & 2 deletions temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/modal/RecurringRuleModal.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import com.ivy.legacy.utils.hideKeyboard
import com.ivy.legacy.utils.onScreenStart
import com.ivy.design.utils.thenIf
import com.ivy.legacy.utils.rememberInteractionSource
import com.ivy.legacy.utils.timeNowUTC
import com.ivy.legacy.utils.timeNowLocal
import com.ivy.ui.R
import com.ivy.wallet.ui.theme.Gradient
import com.ivy.wallet.ui.theme.GradientIvy
Expand Down Expand Up @@ -81,7 +81,7 @@ fun BoxWithConstraintsScope.RecurringRuleModal(
onRuleChanged: (LocalDateTime, oneTime: Boolean, Int?, IntervalType?) -> Unit,
) {
var startDate by remember(modal) {
mutableStateOf(modal?.initialStartDate ?: timeNowUTC())
mutableStateOf(modal?.initialStartDate ?: timeNowLocal())
Mushfiq1060 marked this conversation as resolved.
Show resolved Hide resolved
}
var oneTime by remember(modal) {
mutableStateOf(modal?.initialOneTime ?: false)
Expand Down