diff --git a/app/src/main/java/com/danilkinkin/buckwheat/analytics/Analytics.kt b/app/src/main/java/com/danilkinkin/buckwheat/analytics/Analytics.kt index a87bef2..0e92b4e 100644 --- a/app/src/main/java/com/danilkinkin/buckwheat/analytics/Analytics.kt +++ b/app/src/main/java/com/danilkinkin/buckwheat/analytics/Analytics.kt @@ -158,6 +158,7 @@ fun Analytics( transactions = transactions, startDate = spendsViewModel.startPeriodDate.value!!, finishDate = spendsViewModel.finishPeriodDate.value!!, + actualFinishDate = finishPeriodActualDate, currency = spendsViewModel.currency.value!!, ) } diff --git a/app/src/main/java/com/danilkinkin/buckwheat/analytics/SpendsCalendar.kt b/app/src/main/java/com/danilkinkin/buckwheat/analytics/SpendsCalendar.kt index d29dcd8..b60d49e 100644 --- a/app/src/main/java/com/danilkinkin/buckwheat/analytics/SpendsCalendar.kt +++ b/app/src/main/java/com/danilkinkin/buckwheat/analytics/SpendsCalendar.kt @@ -86,6 +86,7 @@ fun SpendsCalendar( transactions: List, startDate: Date, finishDate: Date, + actualFinishDate: Date? = null, currency: ExtendCurrency, ) { val context = LocalContext.current @@ -144,7 +145,7 @@ fun SpendsCalendar( CalendarState( context = context, disableBeforeDate = startDate, - disableAfterDate = finishDate.coerceAtMost(Date()), + disableAfterDate = (actualFinishDate ?: finishDate).coerceAtMost(Date()), ) ) }