From 43bc04012dcd2361421e108275abbb2262a7c40c Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sun, 4 Jan 2026 00:36:00 +0800
Subject: [PATCH] support setting timezone type in reconciliation statement
 dialog / page

---
 .../base/AccountBalanceTrendsChartBase.ts     |  47 +++--
 .../mobile/AccountBalanceTrendsBarChart.vue   |   2 +-
 src/core/datetime.ts                          |  18 +-
 src/lib/datetime.ts                           | 199 +++++++++---------
 src/stores/statistics.ts                      |   2 +-
 .../ReconciliationStatementPageBase.ts        |  11 +-
 .../dialogs/ReconciliationStatementDialog.vue |  23 +-
 src/views/desktop/transactions/ListPage.vue   |   4 +-
 .../accounts/ReconciliationStatementPage.vue  |  27 ++-
 src/views/mobile/transactions/ListPage.vue    |   4 +-
 10 files changed, 213 insertions(+), 124 deletions(-)

diff --git a/src/components/base/AccountBalanceTrendsChartBase.ts b/src/components/base/AccountBalanceTrendsChartBase.ts
index d0279c8d..9884e5fa 100644
--- a/src/components/base/AccountBalanceTrendsChartBase.ts
+++ b/src/components/base/AccountBalanceTrendsChartBase.ts
@@ -3,11 +3,12 @@ import { computed } from 'vue';
 import { useI18n } from '@/locales/helpers.ts';
 
 import {
+    type DateTime,
     type UnixTimeRange,
     type YearUnixTime,
     type YearQuarterUnixTime,
     type YearMonthUnixTime,
-    YearMonthDayUnixTime,
+    YearMonthDayUnixTime
 } from '@/core/datetime.ts';
 import type { FiscalYearUnixTime } from '@/core/fiscalyear.ts';
 import { ChartDateAggregationType } from '@/core/statistics.ts';
@@ -19,13 +20,14 @@ import { sumAmounts } from '@/lib/numeral.ts';
 import {
     parseDateTimeFromUnixTime,
     getGregorianCalendarYearAndMonthFromUnixTime,
-    getYearFirstUnixTimeBySpecifiedUnixTime,
-    getQuarterFirstUnixTimeBySpecifiedUnixTime,
-    getMonthFirstUnixTimeBySpecifiedUnixTime,
-    getDayFirstUnixTimeBySpecifiedUnixTime,
+    getYearFirstDateTimeBySpecifiedDateTime,
+    getQuarterFirstTimeTimeBySpecifiedUnixTime,
+    getMonthFirstDateTimeBySpecifiedUnixTime,
+    getDayFirstDateTimeBySpecifiedUnixTime,
     getAllDaysStartAndEndUnixTimes,
-    getFiscalYearStartUnixTime
+    getFiscalYearStartDateTime
 } from '@/lib/datetime.ts';
+import { TimezoneTypeForStatistics } from '@/core/timezone.ts';
 import { getAllDateRangesByYearMonthRange } from '@/lib/statistics.ts';
 
 export interface AccountBalanceUnixTimeAndBalanceRange extends UnixTimeRange {
@@ -47,6 +49,7 @@ export interface AccountBalanceTrendsChartItem {
 export interface CommonAccountBalanceTrendsChartProps {
     items: TransactionReconciliationStatementResponseItem[] | undefined;
     dateAggregationType: number;
+    timezoneUsedForDateRange: number;
     fiscalYearStart: number;
     account: AccountInfoResponse;
 }
@@ -117,29 +120,40 @@ export function useAccountBalanceTrendsChartBase(props: CommonAccountBalanceTren
             return ret;
         }
 
-        const dayDataItemsMap: Record<number, TransactionReconciliationStatementResponseItem[]> = {};
+        const dayDataItemsMap: Record<string, TransactionReconciliationStatementResponseItem[]> = {};
 
         for (const dateItem of props.items) {
-            let dateRangeMinUnixTime = 0;
+            let minDateTime: DateTime;
+            let displayDate = '';
+            let transactionTimeUtfOffset: number | undefined = undefined;
+
+            if (props.timezoneUsedForDateRange === TimezoneTypeForStatistics.TransactionTimezone.type) {
+                transactionTimeUtfOffset = dateItem.utcOffset;
+            }
 
             if (props.dateAggregationType === ChartDateAggregationType.Year.type) {
-                dateRangeMinUnixTime = getYearFirstUnixTimeBySpecifiedUnixTime(dateItem.time);
+                minDateTime = getYearFirstDateTimeBySpecifiedDateTime(dateItem.time, transactionTimeUtfOffset);
+                displayDate = formatDateTimeToGregorianLikeShortYear(minDateTime);
             } else if (props.dateAggregationType === ChartDateAggregationType.FiscalYear.type) {
-                dateRangeMinUnixTime = getFiscalYearStartUnixTime(dateItem.time, props.fiscalYearStart);
+                minDateTime = getFiscalYearStartDateTime(dateItem.time, props.fiscalYearStart, transactionTimeUtfOffset);
+                displayDate = formatDateTimeToGregorianLikeFiscalYear(minDateTime);
             } else if (props.dateAggregationType === ChartDateAggregationType.Quarter.type) {
-                dateRangeMinUnixTime = getQuarterFirstUnixTimeBySpecifiedUnixTime(dateItem.time);
+                minDateTime = getQuarterFirstTimeTimeBySpecifiedUnixTime(dateItem.time, transactionTimeUtfOffset);
+                displayDate = formatDateTimeToGregorianLikeYearQuarter(minDateTime);
             } else if (props.dateAggregationType === ChartDateAggregationType.Month.type) {
-                dateRangeMinUnixTime = getMonthFirstUnixTimeBySpecifiedUnixTime(dateItem.time);
+                minDateTime = getMonthFirstDateTimeBySpecifiedUnixTime(dateItem.time, transactionTimeUtfOffset);
+                displayDate = formatDateTimeToGregorianLikeShortYearMonth(minDateTime);
             } else if (props.dateAggregationType === ChartDateAggregationType.Day.type) {
-                dateRangeMinUnixTime = getDayFirstUnixTimeBySpecifiedUnixTime(dateItem.time);
+                minDateTime = getDayFirstDateTimeBySpecifiedUnixTime(dateItem.time, transactionTimeUtfOffset);
+                displayDate = formatDateTimeToShortDate(minDateTime);
             } else {
                 return ret;
             }
 
-            const dataItems: TransactionReconciliationStatementResponseItem[] = dayDataItemsMap[dateRangeMinUnixTime] || [];
+            const dataItems: TransactionReconciliationStatementResponseItem[] = dayDataItemsMap[displayDate] || [];
             dataItems.push(dateItem);
 
-            dayDataItemsMap[dateRangeMinUnixTime] = dataItems;
+            dayDataItemsMap[displayDate] = dataItems;
         }
 
         let lastOpeningBalance = dataDateRange.value.minUnixTimeOpeningBalance;
@@ -150,7 +164,6 @@ export function useAccountBalanceTrendsChartBase(props: CommonAccountBalanceTren
         let lastAverageBalance = lastClosingBalance;
 
         for (const dateRange of allDateRanges.value) {
-            const dataItems = dayDataItemsMap[dateRange.minUnixTime];
             const minDateTime = parseDateTimeFromUnixTime(dateRange.minUnixTime);
 
             let displayDate = '';
@@ -169,6 +182,8 @@ export function useAccountBalanceTrendsChartBase(props: CommonAccountBalanceTren
                 return ret;
             }
 
+            const dataItems = dayDataItemsMap[displayDate];
+
             if (isArray(dataItems)) {
                 if (dataItems.length < 1) {
                     continue;
diff --git a/src/components/mobile/AccountBalanceTrendsBarChart.vue b/src/components/mobile/AccountBalanceTrendsBarChart.vue
index 962e8372..28646619 100644
--- a/src/components/mobile/AccountBalanceTrendsBarChart.vue
+++ b/src/components/mobile/AccountBalanceTrendsBarChart.vue
@@ -20,7 +20,7 @@
     </f7-list>
 
     <f7-list class="margin-top-half" media-list virtual-list :virtual-list-params="{ items: allVirtualListItems, renderExternal, height: 'auto' }"
-             :key="`account-balance-trends-${dateAggregationType}`"
+             :key="`account-balance-trends-${dateAggregationType}-${timezoneUsedForDateRange}`"
              v-else-if="!loading && allVirtualListItems && allVirtualListItems.length > 0">
         <ul>
             <f7-list-item class="account-balance-trends-list-item"
diff --git a/src/core/datetime.ts b/src/core/datetime.ts
index 8c90b9af..c250ab87 100644
--- a/src/core/datetime.ts
+++ b/src/core/datetime.ts
@@ -2,6 +2,18 @@ import type { TypeAndName, TypeAndDisplayName } from '@/core/base.ts';
 import type { CalendarType, ChineseCalendarLocaleData, PersianCalendarLocaleData } from '@/core/calendar.ts';
 import type { NumeralSystem } from '@/core/numeral.ts';
 
+export type DateTimeUnit = 'years' | 'months' | 'days' | 'hours' | 'minutes' | 'seconds';
+
+export interface DateTimeSetObject {
+    year?: number;
+    month?: number;
+    dayOfMonth?: number;
+    hour?: number;
+    minute?: number;
+    second?: number;
+    millisecond?: number;
+}
+
 export interface DateTime {
     getUnixTime(): number;
     getLocalizedCalendarYear(options: DateTimeFormatOptions): string;
@@ -28,7 +40,11 @@ export interface DateTime {
     getSecond(): number;
     getDisplayAMPM(options: DateTimeFormatOptions): string;
     getTimezoneUtcOffsetMinutes(): number;
-    getDateTimeAfterDays(day: number): DateTime;
+    setTimezoneByUtcOffsetMinutes(offsetMinutes: number): DateTime;
+    setTimezoneByIANATimeZoneName(zoneName: string): DateTime;
+    add(amount: number, unit: DateTimeUnit): DateTime;
+    subtract(amount: number, unit: DateTimeUnit): DateTime;
+    set(value: DateTimeSetObject): DateTime;
     toGregorianCalendarYearMonthDay(): YearMonthDay;
     toGregorianCalendarYear0BasedMonth(): Year0BasedMonth;
     format(format: string, options: DateTimeFormatOptions): string;
diff --git a/src/lib/datetime.ts b/src/lib/datetime.ts
index 38ad7a0a..e0ef8df6 100644
--- a/src/lib/datetime.ts
+++ b/src/lib/datetime.ts
@@ -12,6 +12,8 @@ import {
     CalendarType
 } from '@/core/calendar.ts';
 import {
+    type DateTimeUnit,
+    type DateTimeSetObject,
     type DateTime,
     type DateTimeFormatOptions,
     type TextualYearMonth,
@@ -307,8 +309,32 @@ class MomentDateTime implements DateTime {
         return this.instance.utcOffset();
     }
 
-    public getDateTimeAfterDays(days: number): DateTime {
-        return MomentDateTime.of(this.instance.clone().add(days, 'days'));
+    public setTimezoneByUtcOffsetMinutes(ufcOffset: number): DateTime {
+        return MomentDateTime.of(this.instance.clone().tz(getFixedTimezoneName(ufcOffset)));
+    }
+
+    public setTimezoneByIANATimeZoneName(timezoneName: string): DateTime {
+        return MomentDateTime.of(this.instance.clone().tz(timezoneName));
+    }
+
+    public add(amount: number, unit: DateTimeUnit): DateTime {
+        return MomentDateTime.of(this.instance.clone().add(amount, unit));
+    }
+
+    public subtract(amount: number, unit: DateTimeUnit): DateTime {
+        return MomentDateTime.of(this.instance.clone().subtract(amount, unit));
+    }
+
+    public set(value: DateTimeSetObject): DateTime {
+        return MomentDateTime.of(this.instance.clone().set({
+            year: value.year,
+            month: isDefined(value.month) ? value.month - 1 : undefined,
+            date: value.dayOfMonth,
+            hour: value.hour,
+            minute: value.minute,
+            second: value.second,
+            millisecond: value.millisecond
+        }));
     }
 
     public toGregorianCalendarYearMonthDay(): YearMonthDay {
@@ -378,6 +404,14 @@ class MomentDateTime implements DateTime {
         return new MomentDateTime(instance);
     }
 
+    public static ofUnixTime(unixTime: number): DateTime {
+        return new MomentDateTime(moment.unix(unixTime));
+    }
+
+    public static ofFullDateTime(year: number, month: number, day: number, hour: number, minute: number, second: number, millisecond: number): DateTime {
+        return new MomentDateTime(moment().set({ year: year, month: month - 1, date: day, hour: hour, minute: minute, second: second, millisecond: millisecond }));
+    }
+
     public static now(): DateTime {
         return new MomentDateTime(moment());
     }
@@ -560,45 +594,39 @@ export function getUnixTimeFromLocalDatetime(datetime: Date): number {
 }
 
 export function getSameDateTimeWithCurrentTimezone(dateTime: DateTime): DateTime {
-    const newDateTime = moment().set({
+    return MomentDateTime.now().set({
         year: dateTime.getGregorianCalendarYear(),
-        month: dateTime.getGregorianCalendarMonth() - 1,
-        date: dateTime.getGregorianCalendarDay(),
+        month: dateTime.getGregorianCalendarMonth(),
+        dayOfMonth: dateTime.getGregorianCalendarDay(),
         hour: dateTime.getHour(),
         minute: dateTime.getMinute(),
         second: dateTime.getSecond(),
         millisecond: 0
     });
-
-    return MomentDateTime.of(newDateTime);
 }
 
 export function getSameDateTimeWithBrowserTimezone(dateTime: DateTime): DateTime {
-    const newDateTime = moment().tz(getBrowserTimezoneName()).set({
+    return MomentDateTime.now().setTimezoneByIANATimeZoneName(getBrowserTimezoneName()).set({
         year: dateTime.getGregorianCalendarYear(),
-        month: dateTime.getGregorianCalendarMonth() - 1,
-        date: dateTime.getGregorianCalendarDay(),
-        hour: dateTime.getHour(),
-        minute: dateTime.getMinute(),
-        second: dateTime.getSecond(),
-        millisecond: 0,
-    });
-
-    return MomentDateTime.of(newDateTime);
-}
-
-export function getSameDateTimeWithTimezoneOffset(dateTime: DateTime, utcOffset: number): DateTime {
-    const newDateTime = moment().tz(getFixedTimezoneName(utcOffset)).set({
-        year: dateTime.getGregorianCalendarYear(),
-        month: dateTime.getGregorianCalendarMonth() - 1,
-        date: dateTime.getGregorianCalendarDay(),
+        month: dateTime.getGregorianCalendarMonth(),
+        dayOfMonth: dateTime.getGregorianCalendarDay(),
         hour: dateTime.getHour(),
         minute: dateTime.getMinute(),
         second: dateTime.getSecond(),
         millisecond: 0
     });
+}
 
-    return MomentDateTime.of(newDateTime);
+export function getSameDateTimeWithTimezoneOffset(dateTime: DateTime, utcOffset: number): DateTime {
+    return MomentDateTime.now().setTimezoneByUtcOffsetMinutes(utcOffset).set({
+        year: dateTime.getGregorianCalendarYear(),
+        month: dateTime.getGregorianCalendarMonth(),
+        dayOfMonth: dateTime.getGregorianCalendarDay(),
+        hour: dateTime.getHour(),
+        minute: dateTime.getMinute(),
+        second: dateTime.getSecond(),
+        millisecond: 0
+    });
 }
 
 export function getCurrentDateTime(): DateTime {
@@ -610,20 +638,19 @@ export function getCurrentUnixTime(): number {
 }
 
 export function getYearMonthDayDateTime(year: number, month: number, day: number): DateTime {
-    const date = moment().set({ year: year, month: month - 1, date: day, hour: 0, minute: 0, second: 0, millisecond: 0 });
-    return MomentDateTime.of(date);
+    return MomentDateTime.ofFullDateTime(year, month, day, 0, 0, 0, 0);
 }
 
 export function parseDateTimeFromUnixTime(unixTime: number): DateTime {
-    return MomentDateTime.of(moment.unix(unixTime));
+    return MomentDateTime.ofUnixTime(unixTime);
 }
 
 export function parseDateTimeFromUnixTimeWithBrowserTimezone(unixTime: number): DateTime {
-    return MomentDateTime.of(moment.unix(unixTime).tz(getBrowserTimezoneName()));
+    return MomentDateTime.ofUnixTime(unixTime).setTimezoneByIANATimeZoneName(getBrowserTimezoneName());
 }
 
 export function parseDateTimeFromUnixTimeWithTimezoneOffset(unixTime: number, utcOffset: number): DateTime {
-    return MomentDateTime.of(moment.unix(unixTime).tz(getFixedTimezoneName(utcOffset)));
+    return MomentDateTime.ofUnixTime(unixTime).setTimezoneByUtcOffsetMinutes(utcOffset);
 }
 
 export function parseDateTimeFromKnownDateTimeFormat(dateTime: string, format: KnownDateTimeFormat): DateTime | undefined {
@@ -804,27 +831,21 @@ export function getThisYearLastUnixTime(): number {
     return moment.unix(getThisYearFirstUnixTime()).add(1, 'years').subtract(1, 'seconds').unix();
 }
 
-export function getYearFirstUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
+export function getYearFirstDateTimeBySpecifiedDateTime(unixTime: number, utcOffset?: number): DateTime {
     let date = moment.unix(unixTime);
 
     if (isNumber(utcOffset)) {
         date = date.tz(getFixedTimezoneName(utcOffset));
     }
 
-    return date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(date.dayOfYear() - 1, 'days').unix();
+    return MomentDateTime.of(date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(date.dayOfYear() - 1, 'days'));
 }
 
-export function getYearLastUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
-    let date = moment.unix(getYearFirstUnixTimeBySpecifiedUnixTime(unixTime, utcOffset));
-
-    if (isNumber(utcOffset)) {
-        date = date.tz(getFixedTimezoneName(utcOffset));
-    }
-
-    return date.add(1, 'years').subtract(1, 'seconds').unix();
+export function getYearLastDateTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): DateTime {
+    return getYearFirstDateTimeBySpecifiedDateTime(unixTime, utcOffset).add(1, 'years').subtract(1, 'seconds');
 }
 
-export function getQuarterFirstUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
+export function getQuarterFirstTimeTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): DateTime {
     let date = moment.unix(unixTime);
 
     if (isNumber(utcOffset)) {
@@ -834,57 +855,39 @@ export function getQuarterFirstUnixTimeBySpecifiedUnixTime(unixTime: number, utc
     date = date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 });
     const month = date.month();
     const quarterStartMonth = Math.floor(month / 3) * 3;
-    return date.set({ month: quarterStartMonth, date: 1 }).unix();
+    return MomentDateTime.of(date.set({ month: quarterStartMonth, date: 1 }));
 }
 
-export function getQuarterLastUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
-    let date = moment.unix(getQuarterFirstUnixTimeBySpecifiedUnixTime(unixTime, utcOffset));
-
-    if (isNumber(utcOffset)) {
-        date = date.tz(getFixedTimezoneName(utcOffset));
-    }
-
-    return date.add(3, 'months').subtract(1, 'seconds').unix();
+export function getQuarterLastTimeTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): DateTime {
+    return getQuarterFirstTimeTimeBySpecifiedUnixTime(unixTime, utcOffset).add(3, 'months').subtract(1, 'seconds');
 }
 
-export function getMonthFirstUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
+export function getMonthFirstDateTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): DateTime {
     let date = moment.unix(unixTime);
 
     if (isNumber(utcOffset)) {
         date = date.tz(getFixedTimezoneName(utcOffset));
     }
 
-    return date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(date.date() - 1, 'days').unix();
+    return MomentDateTime.of(date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(date.date() - 1, 'days'));
 }
 
-export function getMonthLastUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
-    let date = moment.unix(getMonthFirstUnixTimeBySpecifiedUnixTime(unixTime, utcOffset));
-
-    if (isNumber(utcOffset)) {
-        date = date.tz(getFixedTimezoneName(utcOffset));
-    }
-
-    return date.add(1, 'months').subtract(1, 'seconds').unix();
+export function getMonthLastDateTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): DateTime {
+    return getMonthFirstDateTimeBySpecifiedUnixTime(unixTime, utcOffset).add(1, 'months').subtract(1, 'seconds');
 }
 
-export function getDayFirstUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
+export function getDayFirstDateTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): DateTime {
     let date = moment.unix(unixTime);
 
     if (isNumber(utcOffset)) {
         date = date.tz(getFixedTimezoneName(utcOffset));
     }
 
-    return date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).unix();
+    return MomentDateTime.of(date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }));
 }
 
-export function getDayLastUnixTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): number {
-    let date = moment.unix(unixTime);
-
-    if (isNumber(utcOffset)) {
-        date = date.tz(getFixedTimezoneName(utcOffset));
-    }
-
-    return date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).add(1, 'days').subtract(1, 'seconds').unix();
+export function getDayLastDateTimeBySpecifiedUnixTime(unixTime: number, utcOffset?: number): DateTime {
+    return getDayFirstDateTimeBySpecifiedUnixTime(unixTime, utcOffset).add(1, 'days').subtract(1, 'seconds');
 }
 
 export function getYearFirstUnixTime(year: number): number {
@@ -1114,11 +1117,11 @@ export function getAllDaysStartAndEndUnixTimes(startUnixTime: number, endUnixTim
 
     while (unixTime <= endUnixTime) {
         const currentDateTime = parseDateTimeFromUnixTime(unixTime);
-        const currentDayMinUnixTime = getDayFirstUnixTimeBySpecifiedUnixTime(unixTime);
-        const currentDayMaxUnixTime = getDayLastUnixTimeBySpecifiedUnixTime(unixTime);
+        const currentDayMinDateTime = getDayFirstDateTimeBySpecifiedUnixTime(unixTime);
+        const currentDayMaxDateTime = getDayLastDateTimeBySpecifiedUnixTime(unixTime);
 
-        allYearMonthDayTimes.push(YearMonthDayUnixTime.of(currentDateTime.toGregorianCalendarYearMonthDay(), currentDayMinUnixTime, currentDayMaxUnixTime));
-        unixTime = currentDayMaxUnixTime + 1;
+        allYearMonthDayTimes.push(YearMonthDayUnixTime.of(currentDateTime.toGregorianCalendarYearMonthDay(), currentDayMinDateTime.getUnixTime(), currentDayMaxDateTime.getUnixTime()));
+        unixTime = currentDayMaxDateTime.getUnixTime() + 1;
     }
 
     return allYearMonthDayTimes;
@@ -1450,14 +1453,14 @@ export function getFullMonthDateRange(minTime: number, maxTime: number, firstDay
         return getDateRangeByDateType(DateRange.ThisMonth.type, firstDayOfWeek, fiscalYearStart);
     }
 
-    const monthFirstUnixTime = getMonthFirstUnixTimeBySpecifiedUnixTime(minTime);
-    const monthLastUnixTime = getMonthLastUnixTimeBySpecifiedUnixTime(minTime);
-    const dateType = getDateTypeByDateRange(monthFirstUnixTime, monthLastUnixTime, firstDayOfWeek, fiscalYearStart, DateRangeScene.Normal);
+    const monthFirstDateTime = getMonthFirstDateTimeBySpecifiedUnixTime(minTime);
+    const monthLastDateTime = getMonthLastDateTimeBySpecifiedUnixTime(minTime);
+    const dateType = getDateTypeByDateRange(monthFirstDateTime.getUnixTime(), monthLastDateTime.getUnixTime(), firstDayOfWeek, fiscalYearStart, DateRangeScene.Normal);
 
     const dateRange: TimeRangeAndDateType = {
         dateType: dateType,
-        maxTime: monthLastUnixTime,
-        minTime: monthFirstUnixTime
+        maxTime: monthLastDateTime.getUnixTime(),
+        minTime: monthFirstDateTime.getUnixTime()
     };
 
     return dateRange;
@@ -1487,8 +1490,8 @@ export function getCombinedDateAndTimeValues(date: Date, numeralSystem: NumeralS
 }
 
 export function getValidMonthDayOrCurrentDayShortDate(unixTime: number, currentShortDate: string): TextualYearMonthDay {
-    const currentTime = moment();
-    const monthLastTime = moment.unix(getMonthLastUnixTimeBySpecifiedUnixTime(unixTime));
+    const currentTime = getCurrentDateTime();
+    const monthLastTime = getMonthLastDateTimeBySpecifiedUnixTime(unixTime);
 
     if (currentShortDate) {
         const yearMonthDay = currentShortDate.split('-');
@@ -1496,17 +1499,17 @@ export function getValidMonthDayOrCurrentDayShortDate(unixTime: number, currentS
         if (yearMonthDay.length === 3) {
             const currentDay = parseInt(yearMonthDay[2] as string);
 
-            if (currentDay < monthLastTime.date()) {
-                return MomentDateTime.of(monthLastTime.set({ date: currentDay })).getGregorianCalendarYearDashMonthDashDay();
+            if (currentDay < monthLastTime.getGregorianCalendarDay()) {
+                return monthLastTime.set({ dayOfMonth: currentDay }).getGregorianCalendarYearDashMonthDashDay();
             }
         }
     }
 
-    if (monthLastTime.year() === currentTime.year() && monthLastTime.month() === currentTime.month()) {
-        return MomentDateTime.of(currentTime).getGregorianCalendarYearDashMonthDashDay();
+    if (monthLastTime.getGregorianCalendarYear() === currentTime.getGregorianCalendarYear() && monthLastTime.getGregorianCalendarMonth() === currentTime.getGregorianCalendarMonth()) {
+        return currentTime.getGregorianCalendarYearDashMonthDashDay();
     }
 
-    return MomentDateTime.of(monthLastTime).getGregorianCalendarYearDashMonthDashDay();
+    return monthLastTime.getGregorianCalendarYearDashMonthDashDay();
 }
 
 export function isDateRangeMatchFullYears(minTime: number, maxTime: number): boolean {
@@ -1567,7 +1570,7 @@ export function getFiscalYearFromUnixTime(unixTime: number, fiscalYearStartValue
     return year + 1;
 }
 
-export function getFiscalYearStartUnixTime(unixTime: number, fiscalYearStartValue: number, utcOffset?: number): number {
+export function getFiscalYearStartDateTime(unixTime: number, fiscalYearStartValue: number, utcOffset?: number): DateTime {
     let date = moment.unix(unixTime);
 
     if (isNumber(utcOffset)) {
@@ -1582,7 +1585,7 @@ export function getFiscalYearStartUnixTime(unixTime: number, fiscalYearStartValu
             finalDate = finalDate.tz(getFixedTimezoneName(utcOffset));
         }
 
-        return finalDate.year(date.year()).month(0).date(1).hour(0).minute(0).second(0).millisecond(0).unix();
+        return MomentDateTime.of(finalDate.year(date.year()).month(0).date(1).hour(0).minute(0).second(0).millisecond(0));
     }
 
     let fiscalYearStart = FiscalYearStart.valueOf(fiscalYearStartValue);
@@ -1611,7 +1614,7 @@ export function getFiscalYearStartUnixTime(unixTime: number, fiscalYearStartValu
         finalDate = finalDate.tz(getFixedTimezoneName(utcOffset));
     }
 
-    return finalDate.set({
+    return MomentDateTime.of(finalDate.set({
         year: startYear,
         month: fiscalYearStart.month - 1, // 0-index
         date: fiscalYearStart.day,
@@ -1619,17 +1622,19 @@ export function getFiscalYearStartUnixTime(unixTime: number, fiscalYearStartValu
         minute: 0,
         second: 0,
         millisecond: 0,
-    }).unix();
+    }));
+}
+
+export function getFiscalYearEndDateTime(unixTime: number, fiscalYearStart: number, utcOffset?: number): DateTime {
+    return getFiscalYearStartDateTime(unixTime, fiscalYearStart, utcOffset).add(1, 'years').subtract(1, 'seconds');
+}
+
+export function getFiscalYearStartUnixTime(unixTime: number, fiscalYearStart: number, utcOffset?: number): number {
+    return getFiscalYearStartDateTime(unixTime, fiscalYearStart, utcOffset).getUnixTime();
 }
 
 export function getFiscalYearEndUnixTime(unixTime: number, fiscalYearStart: number, utcOffset?: number): number {
-    let date = moment.unix(getFiscalYearStartUnixTime(unixTime, fiscalYearStart));
-
-    if (isNumber(utcOffset)) {
-        date = date.tz(getFixedTimezoneName(utcOffset));
-    }
-
-    return date.add(1, 'years').subtract(1, 'seconds').unix();
+    return getFiscalYearEndDateTime(unixTime, fiscalYearStart, utcOffset).getUnixTime();
 }
 
 export function getCurrentFiscalYear(fiscalYearStart: number, utcOffset?: number): number {
diff --git a/src/stores/statistics.ts b/src/stores/statistics.ts
index b9706a33..95c3fa2e 100644
--- a/src/stores/statistics.ts
+++ b/src/stores/statistics.ts
@@ -772,7 +772,7 @@ export const useStatisticsStore = defineStore('statistics', () => {
             // fill in missing days with last known balance
             for (let i = 1; i <= missingDays; i++) {
                 const missingStatisticResponseItems: TransactionStatisticResponseItem[] = [];
-                const dateTime: DateTime = lastAssetTrendItemDate.getDateTimeAfterDays(i);
+                const dateTime: DateTime = lastAssetTrendItemDate.add(i, 'days');
 
                 for (const item of values(lastAssetTrendItemMap)) {
                     const statisticResponseItem: TransactionStatisticResponseItem = {
diff --git a/src/views/base/accounts/ReconciliationStatementPageBase.ts b/src/views/base/accounts/ReconciliationStatementPageBase.ts
index cce929c3..074d8779 100644
--- a/src/views/base/accounts/ReconciliationStatementPageBase.ts
+++ b/src/views/base/accounts/ReconciliationStatementPageBase.ts
@@ -8,9 +8,11 @@ import { useTransactionCategoriesStore } from '@/stores/transactionCategory.ts';
 
 import type { TypeAndDisplayName } from '@/core/base.ts';
 import type { WeekDayValue } from '@/core/datetime.ts';
+import { TimezoneTypeForStatistics } from '@/core/timezone.ts';
 import { TransactionType } from '@/core/transaction.ts';
-import { StatisticsAnalysisType } from '@/core/statistics.ts';
+import { StatisticsAnalysisType, ChartDateAggregationType } from '@/core/statistics.ts';
 import { KnownFileType } from '@/core/file.ts';
+
 import type { Account } from '@/models/account.ts';
 import type { TransactionCategory } from '@/models/transaction_category.ts';
 import type {
@@ -33,6 +35,7 @@ export function useReconciliationStatementPageBase() {
         tt,
         getAllAccountBalanceTrendChartTypes,
         getAllStatisticsDateAggregationTypesWithShortName,
+        getAllTimezoneTypesUsedForStatistics,
         formatDateTimeToLongDateTime,
         formatDateTimeToLongDate,
         formatDateTimeToShortTime,
@@ -49,6 +52,8 @@ export function useReconciliationStatementPageBase() {
     const startTime = ref<number>(0);
     const endTime = ref<number>(0);
     const reconciliationStatements = ref<TransactionReconciliationStatementResponseWithInfo | undefined>(undefined);
+    const chartDataDateAggregationType = ref<number>(ChartDateAggregationType.Day.type);
+    const timezoneUsedForDateRange = ref<number>(TimezoneTypeForStatistics.ApplicationTimezone.type);
 
     const firstDayOfWeek = computed<WeekDayValue>(() => userStore.currentUserFirstDayOfWeek);
     const fiscalYearStart = computed<number>(() => userStore.currentUserFiscalYearStart);
@@ -56,6 +61,7 @@ export function useReconciliationStatementPageBase() {
 
     const allChartTypes = computed<TypeAndDisplayName[]>(() => getAllAccountBalanceTrendChartTypes());
     const allDateAggregationTypes = computed<TypeAndDisplayName[]>(() => getAllStatisticsDateAggregationTypesWithShortName(StatisticsAnalysisType.AssetTrends));
+    const allTimezoneTypesUsedForDateRange = computed<TypeAndDisplayName[]>(() => getAllTimezoneTypesUsedForStatistics());
 
     const currentAccount = computed(() => allAccountsMap.value[accountId.value]);
     const currentAccountCurrency = computed<string>(() => currentAccount.value?.currency ?? defaultCurrency.value);
@@ -286,12 +292,15 @@ export function useReconciliationStatementPageBase() {
         startTime,
         endTime,
         reconciliationStatements,
+        chartDataDateAggregationType,
+        timezoneUsedForDateRange,
         // computed states
         firstDayOfWeek,
         fiscalYearStart,
         defaultCurrency,
         allChartTypes,
         allDateAggregationTypes,
+        allTimezoneTypesUsedForDateRange,
         currentAccount,
         currentAccountCurrency,
         isCurrentLiabilityAccount,
diff --git a/src/views/desktop/accounts/list/dialogs/ReconciliationStatementDialog.vue b/src/views/desktop/accounts/list/dialogs/ReconciliationStatementDialog.vue
index 8464cd9e..562546a8 100644
--- a/src/views/desktop/accounts/list/dialogs/ReconciliationStatementDialog.vue
+++ b/src/views/desktop/accounts/list/dialogs/ReconciliationStatementDialog.vue
@@ -44,6 +44,14 @@
                                              :title="dateAggregationType.displayName"
                                              @click="chartDataDateAggregationType = dateAggregationType.type"
                                              v-for="dateAggregationType in allDateAggregationTypes"></v-list-item>
+                                <v-divider class="my-2"/>
+                                <v-list-subheader :title="tt('Timezone Used for Date Range')"/>
+                                <v-list-item :key="timezoneType.type" :value="timezoneType.type"
+                                             :prepend-icon="timezoneTypeIconMap[timezoneType.type]"
+                                             :append-icon="timezoneUsedForDateRange === timezoneType.type ? mdiCheck : undefined"
+                                             :title="timezoneType.displayName"
+                                             v-for="timezoneType in allTimezoneTypesUsedForDateRange"
+                                             @click="timezoneUsedForDateRange = timezoneType.type"></v-list-item>
                             </v-list>
                         </v-menu>
                     </v-btn>
@@ -227,6 +235,7 @@
                     <account-balance-trends-chart
                         :type="chartType"
                         :date-aggregation-type="chartDataDateAggregationType"
+                        :timezone-used-for-date-range="timezoneUsedForDateRange"
                         :fiscal-year-start="fiscalYearStart"
                         :items="[]"
                         :legend-name="isCurrentLiabilityAccount ? tt('Account Outstanding Balance') : tt('Account Balance')"
@@ -238,6 +247,7 @@
                     <account-balance-trends-chart
                         :type="chartType"
                         :date-aggregation-type="chartDataDateAggregationType"
+                        :timezone-used-for-date-range="timezoneUsedForDateRange"
                         :fiscal-year-start="fiscalYearStart"
                         :items="reconciliationStatements?.transactions"
                         :legend-name="isCurrentLiabilityAccount ? tt('Account Outstanding Balance') : tt('Account Balance')"
@@ -280,6 +290,7 @@ import { useTransactionsStore } from '@/stores/transaction.ts';
 
 import type { NameNumeralValue } from '@/core/base.ts';
 import type { NumeralSystem } from '@/core/numeral.ts';
+import { TimezoneTypeForStatistics } from '@/core/timezone.ts';
 import { TransactionType } from '@/core/transaction.ts';
 import { AccountBalanceTrendChartType, ChartDateAggregationType } from '@/core/statistics.ts';
 import { KnownFileType } from '@/core/file.ts';
@@ -300,6 +311,8 @@ import {
     mdiChartWaterfall,
     mdiCalendarTodayOutline,
     mdiCalendarMonthOutline,
+    mdiHomeClockOutline,
+    mdiInvoiceTextClockOutline,
     mdiLayersTripleOutline,
     mdiInvoiceTextPlusOutline,
     mdiInvoiceTextEditOutline,
@@ -323,9 +336,12 @@ const {
     startTime,
     endTime,
     reconciliationStatements,
+    chartDataDateAggregationType,
+    timezoneUsedForDateRange,
     fiscalYearStart,
     allChartTypes,
     allDateAggregationTypes,
+    allTimezoneTypesUsedForDateRange,
     currentAccount,
     currentAccountCurrency,
     isCurrentLiabilityAccount,
@@ -366,6 +382,11 @@ const chartDataDateAggregationTypeIconMap = {
     [ChartDateAggregationType.FiscalYear.type]: mdiLayersTripleOutline,
 };
 
+const timezoneTypeIconMap = {
+    [TimezoneTypeForStatistics.ApplicationTimezone.type]: mdiHomeClockOutline,
+    [TimezoneTypeForStatistics.TransactionTimezone.type]: mdiInvoiceTextClockOutline
+};
+
 const amountInputDialog = useTemplateRef<AmountInputDialogType>('amountInputDialog');
 const snackbar = useTemplateRef<SnackBarType>('snackbar');
 const editDialog = useTemplateRef<EditDialogType>('editDialog');
@@ -376,7 +397,6 @@ const currentPage = ref<number>(1);
 const countPerPage = ref<number>(10);
 const showAccountBalanceTrendsCharts = ref<boolean>(false);
 const chartType = ref<number>(AccountBalanceTrendChartType.Default.type);
-const chartDataDateAggregationType = ref<number>(ChartDateAggregationType.Day.type);
 
 let rejectFunc: ((reason?: unknown) => void) | null = null;
 
@@ -462,6 +482,7 @@ function open(options: { accountId: string, startTime: number, endTime: number }
     showAccountBalanceTrendsCharts.value = false;
     chartType.value = AccountBalanceTrendChartType.Default.type;
     chartDataDateAggregationType.value = ChartDateAggregationType.Day.type;
+    timezoneUsedForDateRange.value = TimezoneTypeForStatistics.ApplicationTimezone.type;
     showState.value = true;
     loading.value = true;
 
diff --git a/src/views/desktop/transactions/ListPage.vue b/src/views/desktop/transactions/ListPage.vue
index aa520ab0..f3adb4e5 100644
--- a/src/views/desktop/transactions/ListPage.vue
+++ b/src/views/desktop/transactions/ListPage.vue
@@ -691,7 +691,7 @@ import {
 import {
     getCurrentUnixTime,
     parseDateTimeFromUnixTime,
-    getDayFirstUnixTimeBySpecifiedUnixTime,
+    getDayFirstDateTimeBySpecifiedUnixTime,
     getYearMonthFirstUnixTime,
     getYearMonthLastUnixTime,
     getShiftedDateRangeAndDateType,
@@ -1233,7 +1233,7 @@ function changeDateFilter(dateRange: TimeRangeAndDateType | number | null): void
     if (dateRange === DateRange.Custom.type || (isObject(dateRange) && dateRange.dateType === DateRange.Custom.type && !dateRange.minTime && !dateRange.maxTime)) { // Custom
         if (!query.value.minTime || !query.value.maxTime) {
             customMaxDatetime.value = getCurrentUnixTime();
-            customMinDatetime.value = getDayFirstUnixTimeBySpecifiedUnixTime(customMaxDatetime.value);
+            customMinDatetime.value = getDayFirstDateTimeBySpecifiedUnixTime(customMaxDatetime.value).getUnixTime();
         } else {
             customMaxDatetime.value = query.value.maxTime;
             customMinDatetime.value = query.value.minTime;
diff --git a/src/views/mobile/accounts/ReconciliationStatementPage.vue b/src/views/mobile/accounts/ReconciliationStatementPage.vue
index 913eef0b..e3f188a1 100644
--- a/src/views/mobile/accounts/ReconciliationStatementPage.vue
+++ b/src/views/mobile/accounts/ReconciliationStatementPage.vue
@@ -273,6 +273,7 @@
                 <account-balance-trends-bar-chart
                     :loading="loading"
                     :date-aggregation-type="chartDataDateAggregationType"
+                    :timezone-used-for-date-range="timezoneUsedForDateRange"
                     :fiscal-year-start="fiscalYearStart"
                     :items="reconciliationStatements?.transactions"
                     :account="currentAccount"
@@ -282,6 +283,9 @@
 
         <f7-popover class="chart-data-date-aggregation-type-popover-menu">
             <f7-list dividers>
+                <f7-list-item group-title>
+                    <small>{{ tt('Time Granularity') }}</small>
+                </f7-list-item>
                 <f7-list-item link="#" no-chevron popover-close
                               :title="dateAggregationType.displayName"
                               :class="{ 'list-item-selected': chartDataDateAggregationType === dateAggregationType.type }"
@@ -292,6 +296,20 @@
                         <f7-icon class="list-item-checked-icon" f7="checkmark_alt" v-if="chartDataDateAggregationType === dateAggregationType.type"></f7-icon>
                     </template>
                 </f7-list-item>
+                <f7-list-item group-title>
+                    <small>{{ tt('Timezone Used for Date Range') }}</small>
+                </f7-list-item>
+                <f7-list-item link="#" no-chevron popover-close
+                              :title="timezoneType.displayName"
+                              :class="{ 'list-item-selected': timezoneUsedForDateRange === timezoneType.type }"
+                              :key="timezoneType.type"
+                              v-for="timezoneType in allTimezoneTypesUsedForDateRange"
+                              @click="setTimezoneUsedForDateRange(timezoneType.type)">
+                    <template #after>
+                        <f7-icon class="list-item-checked-icon" f7="checkmark_alt" v-if="timezoneUsedForDateRange === timezoneType.type"></f7-icon>
+                    </template>
+                </f7-list-item>
+
             </f7-list>
         </f7-popover>
 
@@ -352,7 +370,6 @@ import { TextDirection } from '@/core/text.ts';
 import { type TimeRangeAndDateType, DateRange, DateRangeScene } from '@/core/datetime.ts';
 import { AccountType } from '@/core/account.ts';
 import { TransactionType } from '@/core/transaction.ts';
-import { ChartDateAggregationType } from '@/core/statistics.ts';
 import { TRANSACTION_MIN_AMOUNT, TRANSACTION_MAX_AMOUNT } from '@/consts/transaction.ts';
 import { type TransactionReconciliationStatementResponseItemWithInfo } from '@/models/transaction.ts';
 
@@ -398,9 +415,12 @@ const {
     startTime,
     endTime,
     reconciliationStatements,
+    chartDataDateAggregationType,
+    timezoneUsedForDateRange,
     firstDayOfWeek,
     fiscalYearStart,
     allDateAggregationTypes,
+    allTimezoneTypesUsedForDateRange,
     isCurrentLiabilityAccount,
     currentAccount,
     currentAccountCurrency,
@@ -430,7 +450,6 @@ const loading = ref<boolean>(false);
 const loadingError = ref<unknown | null>(null);
 const queryDateRangeType = ref<number>(DateRange.ThisMonth.type);
 const showAccountBalanceTrendsCharts = ref<boolean>(false);
-const chartDataDateAggregationType = ref<number>(ChartDateAggregationType.Day.type);
 const transactionToDelete = ref<TransactionReconciliationStatementResponseItemWithInfo | null>(null);
 const newClosingBalance = ref<number>(0);
 const showCustomDateRangeSheet = ref<boolean>(false);
@@ -671,6 +690,10 @@ function setChartDataDateAggregationType(type: number): void {
     chartDataDateAggregationType.value = type;
 }
 
+function setTimezoneUsedForDateRange(type: number): void {
+    timezoneUsedForDateRange.value = type;
+}
+
 function renderExternal(vl: unknown, vlData: ReconciliationStatementVirtualListData): void {
     virtualDataItems.value = vlData;
 }
diff --git a/src/views/mobile/transactions/ListPage.vue b/src/views/mobile/transactions/ListPage.vue
index fdc91ea5..a00a6912 100644
--- a/src/views/mobile/transactions/ListPage.vue
+++ b/src/views/mobile/transactions/ListPage.vue
@@ -637,7 +637,7 @@ import {
 import {
     getCurrentUnixTime,
     parseDateTimeFromUnixTime,
-    getDayFirstUnixTimeBySpecifiedUnixTime,
+    getDayFirstDateTimeBySpecifiedUnixTime,
     getYearMonthFirstUnixTime,
     getYearMonthLastUnixTime,
     getShiftedDateRangeAndDateType,
@@ -1057,7 +1057,7 @@ function changeDateFilter(dateType: number): void {
     if (dateType === DateRange.Custom.type) { // Custom
         if (!query.value.minTime || !query.value.maxTime) {
             customMaxDatetime.value = getCurrentUnixTime();
-            customMinDatetime.value = getDayFirstUnixTimeBySpecifiedUnixTime(customMaxDatetime.value);
+            customMinDatetime.value = getDayFirstDateTimeBySpecifiedUnixTime(customMaxDatetime.value).getUnixTime();
         } else {
             customMaxDatetime.value = query.value.maxTime;
             customMinDatetime.value = query.value.minTime;