From d5750a495db7e3406812db880520ff9678bd7b79 Mon Sep 17 00:00:00 2001
From: Maxim <maxim.mordasov@grafana.com>
Date: Wed, 24 Aug 2022 13:37:33 +0300
Subject: [PATCH] wh minor fix

---
 .../src/components/WorkingHours/WorkingHours.helpers.ts   | 3 ++-
 .../src/components/WorkingHours/WorkingHours.tsx          | 8 +-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/grafana-plugin/src/components/WorkingHours/WorkingHours.helpers.ts b/grafana-plugin/src/components/WorkingHours/WorkingHours.helpers.ts
index bd703b79..52c7579f 100644
--- a/grafana-plugin/src/components/WorkingHours/WorkingHours.helpers.ts
+++ b/grafana-plugin/src/components/WorkingHours/WorkingHours.helpers.ts
@@ -3,7 +3,8 @@ import dayjs from 'dayjs';
 export const getWorkingMoments = (startMoment, endMoment, workingHours, timezone) => {
   const weekdays = dayjs.weekdays();
 
-  const momentToStartIteration = startMoment.tz(timezone);
+  const momentToStartIteration = dayjs().tz(timezone).utcOffset() === 0 ? startMoment : startMoment.tz(timezone);
+
   const dayOfWeekToStartIteration = momentToStartIteration.format('dddd');
 
   const weekDaysToIterateChunk = [
diff --git a/grafana-plugin/src/components/WorkingHours/WorkingHours.tsx b/grafana-plugin/src/components/WorkingHours/WorkingHours.tsx
index 3bc04739..200c895a 100644
--- a/grafana-plugin/src/components/WorkingHours/WorkingHours.tsx
+++ b/grafana-plugin/src/components/WorkingHours/WorkingHours.tsx
@@ -24,13 +24,7 @@ interface WorkingHoursProps {
 const cx = cn.bind(styles);
 
 const WorkingHours: FC<WorkingHoursProps> = (props) => {
-  const {
-    timezone,
-    workingHours,
-    startMoment = dayjs().utc().startOf('week'),
-    duration = 14 * 24 * 60 * 60,
-    className,
-  } = props;
+  const { timezone, workingHours, startMoment, duration, className } = props;
 
   const endMoment = startMoment.add(duration, 'seconds');