diff --git a/packages/client/src/pages/Home/InfoPanel/Body/helpers/HistoryHelper.js b/packages/client/src/pages/Home/InfoPanel/Body/helpers/HistoryHelper.js index df34f94ef6..3c41844608 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/helpers/HistoryHelper.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/helpers/HistoryHelper.js @@ -6,7 +6,7 @@ import { getCookie } from "@docspace/shared/utils"; export const getRelativeDateDay = (t, date) => { moment.locale(getCookie(LANGUAGE)); - const given = moment(date).tz(window.timezone || ""); + const given = moment(date).tz(window.timezone); const now = moment(); const weekAgo = moment().subtract(1, "week"); diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.js index aeb27ea1e8..8bcdb536f3 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.js @@ -57,7 +57,7 @@ const LinkRow = (props) => { const isLocked = !!password; const expiryDate = !!expirationDate; const date = moment(expirationDate) - .tz(window.timezone || "") + .tz(window.timezone) .format("LLL"); const tooltipContent = isExpired diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookEventDetails/sub-components/DetailsBar.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookEventDetails/sub-components/DetailsBar.js index a142075dd0..111179cd89 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookEventDetails/sub-components/DetailsBar.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookEventDetails/sub-components/DetailsBar.js @@ -69,7 +69,7 @@ const DetailsBar = ({ eventDetails }) => { return ( moment(date) .locale(i18n.language) - .tz(window.timezone || "") + .tz(window.timezone) .format("MMM D, YYYY, h:mm:ss A") + " " + t("Common:UTC") diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/index.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/index.js index ad17c2f6b0..447b5d787e 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/index.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/index.js @@ -25,12 +25,12 @@ const parseUrl = (url) => { params.deliveryDate = params.deliveryDate === "null" ? null - : moment(params.deliveryDate, "YYYY-MM-DD").tz(window.timezone || ""); + : moment(params.deliveryDate, "YYYY-MM-DD").tz(window.timezone); params.deliveryFrom = moment(params.deliveryFrom, "HH:mm").tz( - window.timezone || "" + window.timezone ); params.deliveryTo = moment(params.deliveryTo, "HH:mm").tz( - window.timezone || "" + window.timezone ); params.status = JSON.parse(params.status); diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/DeliveryDatePicker.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/DeliveryDatePicker.js index b93d37b1bf..3d201d1368 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/DeliveryDatePicker.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/DeliveryDatePicker.js @@ -72,10 +72,10 @@ const DeliveryDatePicker = ({ ...prevFilters, deliveryDate: null, deliveryFrom: moment() - .tz(window.timezone || "") + .tz(window.timezone) .startOf("day"), deliveryTo: moment() - .tz(window.timezone || "") + .tz(window.timezone) .endOf("day"), })); setIsTimeOpen(false); @@ -96,10 +96,10 @@ const DeliveryDatePicker = ({ ...prevFilters, deliveryDate: date, deliveryFrom: moment() - .tz(window.timezone || "") + .tz(window.timezone) .startOf("day"), deliveryTo: moment() - .tz(window.timezone || "") + .tz(window.timezone) .endOf("day"), })); }; @@ -130,7 +130,7 @@ const DeliveryDatePicker = ({ const formattedTime = isTimeEqual ? "" : ` ${filters.deliveryFrom.format("HH:mm")} - ${moment(filters.deliveryTo) - .tz(window.timezone || "") + .tz(window.timezone) .format("HH:mm")}`; return ( diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/index.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/index.js index 249f751dab..5d45cf6af6 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/index.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/FilterDialog/index.js @@ -88,10 +88,10 @@ const FilterDialog = (props) => { const [filters, setFilters] = useState({ deliveryDate: null, deliveryFrom: moment() - .tz(window.timezone || "") + .tz(window.timezone) .startOf("day"), deliveryTo: moment() - .tz(window.timezone || "") + .tz(window.timezone) .endOf("day"), status: [], }); @@ -118,10 +118,10 @@ const FilterDialog = (props) => { setFilters({ deliveryDate: null, deliveryFrom: moment() - .tz(window.timezone || "") + .tz(window.timezone) .startOf("day"), deliveryTo: moment() - .tz(window.timezone || "") + .tz(window.timezone) .endOf("day"), status: [], }); diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/StatusBar.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/StatusBar.js index e955b88ca3..79ac304995 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/StatusBar.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/StatusBar.js @@ -44,15 +44,15 @@ const StatusBar = (props) => { label={ moment(historyFilters.deliveryDate) .format("DD MMM YYYY") - .tz(window.timezone || "") + + .tz(window.timezone) + " " + moment(historyFilters.deliveryFrom) .format("HH:mm") - .tz(window.timezone || "") + + .tz(window.timezone) + " - " + moment(historyFilters.deliveryTo) .format("HH:mm") - .tz(window.timezone || "") + .tz(window.timezone) } onClose={clearDate} onClick={clearDate} diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/WebhookHistoryTable/HistoryRowView/HistoryRowContent.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/WebhookHistoryTable/HistoryRowView/HistoryRowContent.js index e8c74e5f36..5842444139 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/WebhookHistoryTable/HistoryRowView/HistoryRowContent.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/WebhookHistoryTable/HistoryRowView/HistoryRowContent.js @@ -33,7 +33,7 @@ export const HistoryRowContent = ({ sectionWidth, historyItem }) => { const formattedDelivery = moment(historyItem.delivery) - .tz(window.timezone || "") + .tz(window.timezone) .locale(i18n.language) .format("MMM D, YYYY, h:mm:ss A") + " " + diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/WebhookHistoryTable/HistoryTableView/HistoryTableRow.js b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/WebhookHistoryTable/HistoryTableView/HistoryTableRow.js index 31c62c2822..aa758df2bb 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/WebhookHistoryTable/HistoryTableView/HistoryTableRow.js +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/WebhookHistoryTable/HistoryTableView/HistoryTableRow.js @@ -99,7 +99,7 @@ const HistoryTableRow = (props) => { const formattedDelivery = moment(item.delivery) - .tz(window.timezone || "") + .tz(window.timezone) .locale(i18n.language) .format("MMM D, YYYY, h:mm:ss A") + " " + diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/active-session/index.js b/packages/client/src/pages/Profile/Section/Body/sub-components/active-session/index.js index 2dcd34f930..123f4273da 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/active-session/index.js +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/active-session/index.js @@ -114,6 +114,12 @@ const ActiveSessions = ({ } }; + const convertTime = (date) => { + return moment(date) + .tz(window.timezone) + .locale(locale) + .format("L, LTS"); + }; const tableCell = (platform, browser) => interfaceDirection === "rtl" && !isMobile ? ( <> diff --git a/packages/common/store/CurrentTariffStatusStore.js b/packages/common/store/CurrentTariffStatusStore.js index 80b54a87f9..abb7682a10 100644 --- a/packages/common/store/CurrentTariffStatusStore.js +++ b/packages/common/store/CurrentTariffStatusStore.js @@ -78,14 +78,14 @@ class CurrentTariffStatusStore { moment.locale(this.authStore.language); if (this.dueDate === null) return ""; return moment(this.dueDate) - .tz(window.timezone || "") + .tz(window.timezone) .format("LL"); } isValidDate = (date) => { return ( moment(date) - .tz(window.timezone || "") + .tz(window.timezone) .year() !== 9999 ); }; @@ -97,13 +97,13 @@ class CurrentTariffStatusStore { get isLicenseDateExpired() { if (!this.isPaymentDateValid) return; - return moment() > moment(this.dueDate).tz(window.timezone || ""); + return moment() > moment(this.dueDate).tz(window.timezone); } get gracePeriodEndDate() { moment.locale(this.authStore.language); if (this.delayDueDate === null) return ""; return moment(this.delayDueDate) - .tz(window.timezone || "") + .tz(window.timezone) .format("LL"); } diff --git a/packages/management/src/App.tsx b/packages/management/src/App.tsx index 5efc0042f9..2f9fc44614 100644 --- a/packages/management/src/App.tsx +++ b/packages/management/src/App.tsx @@ -23,14 +23,24 @@ import MainLayout from "SRC_DIR/Layout"; import Error403 from "client/Error403"; import i18n from "./i18n"; + +declare global { + interface Window { + timezone: string; + } +} + + const App = observer(() => { const { i18n } = useTranslation(); const { authStore } = useStore(); const { init, settingsStore, userStore } = authStore; - const { theme, setTheme, currentColorScheme, limitedAccessSpace } = + const { theme, setTheme, currentColorScheme, limitedAccessSpace, timezone } = settingsStore; + window.timezone = timezone; + const userTheme = userStore?.user?.theme ? userStore?.user?.theme : "Dark"; useEffect(() => { diff --git a/packages/shared/utils/convertTime.ts b/packages/shared/utils/convertTime.ts index 79f98bbae7..8053fd98f0 100644 --- a/packages/shared/utils/convertTime.ts +++ b/packages/shared/utils/convertTime.ts @@ -2,7 +2,7 @@ import moment from "moment-timezone"; export const convertTime = (date: moment.Moment, locale: string) => { return moment(date) - .tz(window.timezone || "") + .tz(window.timezone) .locale(locale || "") .format("L, LTS"); };