@@ -27,6 +27,12 @@ export const TimeFilterSelect = ({ compactView = false, ...props }: TimeFilterSe
2727
2828 const [ customTimeRangeLabel , setCustomTimeRangeOptionLabel ] = useState < string > ( t ( 'Custom_time_range' ) ) ;
2929
30+ const getTimeZoneOffset = ( ) : string => {
31+ const offset = new Date ( ) . getTimezoneOffset ( ) ;
32+ const absOffset = Math . abs ( offset ) ;
33+ return `${ offset < 0 ? '+' : '-' } ${ `00${ Math . floor ( absOffset / 60 ) } ` . slice ( - 2 ) } :${ `00${ absOffset % 60 } ` . slice ( - 2 ) } ` ;
34+ } ;
35+
3036 const dateRangeReducer = ( action : DateRangeAction ) : DateRange | undefined => {
3137 const now = new Date ( ) ;
3238 switch ( action ) {
@@ -83,8 +89,10 @@ export const TimeFilterSelect = ({ compactView = false, ...props }: TimeFilterSe
8389 setValue ( 'endDate' , endDate ) ;
8490 setValue ( 'endTime' , endTime || '00:00' ) ;
8591
86- const formattedStartDate = format ( new Date ( startDate ) , 'MMM dd, yyyy' ) ;
87- const formattedEndDate = format ( new Date ( endDate ) , 'MMM dd, yyyy' ) ;
92+ const startIso = new Date ( `${ startDate } T${ startTime || '00:00' } ${ getTimeZoneOffset ( ) } ` ) ;
93+ const endIso = new Date ( `${ endDate } T${ endTime || '00:00' } ${ getTimeZoneOffset ( ) } ` ) ;
94+ const formattedStartDate = format ( new Date ( startIso ) , 'MMM dd, yyyy' ) ;
95+ const formattedEndDate = format ( new Date ( endIso ) , 'MMM dd, yyyy' ) ;
8896
8997 setCustomTimeRangeOptionLabel (
9098 `${ formattedStartDate } ${ startTime && startTime !== '00:00' ? `, ${ startTime } ` : '' } - ${ formattedEndDate } ${ endTime && endTime !== '00:00' ? `, ${ endTime } ` : '' } ` ,
0 commit comments