fixed invalid timestamp for transactions with unedited date or time (#…

…3390)
Ivy-Apps · Aug 3, 2024 · 67dbe66 · 67dbe66
1 parent cef3371
commit 67dbe66
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/screen/accounts/src/main/java/com/ivy/accounts/AccountsTab.kt b/screen/accounts/src/main/java/com/ivy/accounts/AccountsTab.kt
@@ -224,7 +224,6 @@ private fun AccountCard(
             currency = currency,
             baseCurrency = baseCurrency,
             contrastColor = contrastColor,
-
             onBalanceClick = onBalanceClick
         )
 

diff --git a/screen/edit-transaction/src/main/java/com/ivy/transaction/EditTransactionViewModel.kt b/screen/edit-transaction/src/main/java/com/ivy/transaction/EditTransactionViewModel.kt
@@ -37,6 +37,7 @@ import com.ivy.legacy.utils.dateNowLocal
 import com.ivy.legacy.utils.getTrueDate
 import com.ivy.legacy.utils.ioThread
 import com.ivy.legacy.utils.timeNowLocal
+import com.ivy.legacy.utils.timeNowUTC
 import com.ivy.legacy.utils.timeUTC
 import com.ivy.legacy.utils.toLowerCaseLocal
 import com.ivy.legacy.utils.uiThread
@@ -541,7 +542,7 @@ class EditTransactionViewModel @Inject constructor(
         saveIfEditMode()
     }
 
-    fun onSetDate(newDate: LocalDate) {
+    private fun onSetDate(newDate: LocalDate) {
         loadedTransaction = loadedTransaction().copy(
             date = newDate
         )
@@ -555,7 +556,7 @@ class EditTransactionViewModel @Inject constructor(
         )
     }
 
-    fun onSetTime(newTime: LocalTime) {
+    private fun onSetTime(newTime: LocalTime) {
         loadedTransaction = loadedTransaction().copy(
             time = newTime.convertUTCToLocal()
         )
@@ -703,7 +704,7 @@ class EditTransactionViewModel @Inject constructor(
                     dateTime = when {
                         loadedTransaction().dateTime == null &&
                                 dueDate.value == null -> {
-                            timeNowLocal()
+                            timeNowUTC()
                         }
 
                         else -> loadedTransaction().dateTime

diff --git a/screen/home/src/main/java/com/ivy/home/HomeViewModel.kt b/screen/home/src/main/java/com/ivy/home/HomeViewModel.kt
@@ -23,7 +23,7 @@ import com.ivy.legacy.data.BufferInfo
 import com.ivy.legacy.data.LegacyDueSection
 import com.ivy.legacy.data.model.MainTab
 import com.ivy.legacy.data.model.TimePeriod
-import com.ivy.legacy.data.model.toCloseTimeRange
+import com.ivy.legacy.data.model.toUTCCloseTimeRange
 import com.ivy.legacy.datamodel.Account
 import com.ivy.legacy.datamodel.Settings
 import com.ivy.legacy.datamodel.temp.toLegacyDomain
@@ -268,7 +268,7 @@ class HomeViewModel @Inject constructor(
         // This method is used to restore the theme when user imports locally backed up data
         ivyContext.switchTheme(theme = settings.theme)
 
-        Pair(settings, period.value.toRange(ivyContext.startDayOfMonth).toCloseTimeRange())
+        Pair(settings, period.value.toRange(ivyContext.startDayOfMonth).toUTCCloseTimeRange())
     } then ::loadAppBaseData then ::loadIncomeExpenseBalance then
             ::loadBuffer then ::loadTrnHistory then
             ::loadDueTrns thenInvokeAfter ::loadCustomerJourney

diff --git a/temp/legacy-code/src/main/java/com/ivy/legacy/data/model/FromToTimeRange.kt b/temp/legacy-code/src/main/java/com/ivy/legacy/data/model/FromToTimeRange.kt
@@ -3,6 +3,7 @@ package com.ivy.legacy.data.model
 import androidx.compose.runtime.Immutable
 import com.ivy.base.legacy.Transaction
 import com.ivy.legacy.utils.beginningOfIvyTime
+import com.ivy.legacy.utils.convertLocalToUTC
 import com.ivy.legacy.utils.dateNowUTC
 import com.ivy.legacy.utils.formatDateOnly
 import com.ivy.legacy.utils.startOfDayNowUTC
@@ -107,3 +108,10 @@ fun FromToTimeRange.toCloseTimeRange(): ClosedTimeRange {
         to = to ?: toIvyFutureTime()
     )
 }
+
+fun FromToTimeRange.toUTCCloseTimeRange(): ClosedTimeRange {
+    return ClosedTimeRange(
+        from = from?.convertLocalToUTC() ?: beginningOfIvyTime(),
+        to = to?.convertLocalToUTC() ?: toIvyFutureTime()
+    )
+}
diff --git a/temp/legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/HistoryDateDivider.kt b/temp/legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/HistoryDateDivider.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.unit.dp
 import com.ivy.design.l0_system.UI
 import com.ivy.design.l0_system.style
 import com.ivy.legacy.IvyWalletComponentPreview
+import com.ivy.legacy.utils.dateNowLocal
 import com.ivy.legacy.utils.dateNowUTC
 import com.ivy.legacy.utils.format
 import com.ivy.legacy.utils.formatLocal
@@ -44,7 +45,7 @@ fun HistoryDateDivider(
     ) {
         Spacer(Modifier.width(24.dp))
 
-        val today = dateNowUTC()
+        val today = dateNowLocal()
 
         Column {
             Text(