diff --git a/__test__/features/Settings/SettingsPage.test.tsx b/__test__/features/Settings/SettingsPage.test.tsx index 5361462..423f66e 100644 --- a/__test__/features/Settings/SettingsPage.test.tsx +++ b/__test__/features/Settings/SettingsPage.test.tsx @@ -1,5 +1,6 @@ import SettingsPage from "@/features/Settings/SettingsPage"; import { api } from "@/utils/apiUtils"; +import * as timezoneUtils from "@/utils/timezone"; import "@testing-library/jest-dom"; import { fireEvent, screen, waitFor } from "@testing-library/react"; import { renderWithProviders } from "../../utils/Renderwithproviders"; @@ -609,6 +610,8 @@ describe("SettingsPage", () => { }, }; + jest.spyOn(timezoneUtils, "getTimezoneOffset").mockReturnValue("UTC"); + renderWithProviders(, stateWithoutTimeZone); const timezoneInput = screen.getByDisplayValue("UTC (UTC)"); diff --git a/package-lock.json b/package-lock.json index f3ad127..6924f7c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@fullcalendar/moment-timezone": "^6.1.19", "@fullcalendar/react": "^6.1.17", "@fullcalendar/timegrid": "^6.1.17", - "@linagora/twake-mui": "1.1.8", + "@linagora/twake-mui": "1.2.0", "@lottiefiles/dotlottie-react": "^0.17.13", "@mui/icons-material": "^7.1.2", "@mui/material": "^7.1.2", @@ -3143,9 +3143,9 @@ } }, "node_modules/@linagora/twake-mui": { - "version": "1.1.8", - "resolved": "https://npm.pkg.github.com/download/@linagora/twake-mui/1.1.8/e629a126e62dffd939a8d3d8de3ce024de5a2154", - "integrity": "sha512-H2MxtZIy5w1A8VNTNAoM4Pjuph/et4YP8DfzQ+5HCsjRJn6SA/T3nZRZOqC26SxY9kl3XJCKIEKklL+x5af7Vg==", + "version": "1.2.0", + "resolved": "https://npm.pkg.github.com/download/@linagora/twake-mui/1.2.0/7b3eb115d70693ba2936ceaac70a8df3bae92672", + "integrity": "sha512-wKdkuJE48sFE5q2HWbrgI+FIZmBZefz5X5GAwiYHwvAD+9Fr/M+k973ZNSdaxwogWsQ604lZEBoIl13vKdc9EQ==", "license": "MIT", "dependencies": { "react": "^18.2.0", diff --git a/package.json b/package.json index 8541a63..e24f133 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@fullcalendar/moment-timezone": "^6.1.19", "@fullcalendar/react": "^6.1.17", "@fullcalendar/timegrid": "^6.1.17", - "@linagora/twake-mui": "1.1.8", + "@linagora/twake-mui": "1.2.0", "@lottiefiles/dotlottie-react": "^0.17.13", "@mui/icons-material": "^7.1.2", "@mui/material": "^7.1.2", diff --git a/src/components/Calendar/CustomCalendar.styl b/src/components/Calendar/CustomCalendar.styl index e0b0387..5ea5c02 100644 --- a/src/components/Calendar/CustomCalendar.styl +++ b/src/components/Calendar/CustomCalendar.styl @@ -367,8 +367,6 @@ tbody > tr.fc-scrollgrid-section:first-of-type .fc-scroller li.MuiButtonBase-root.MuiMenuItem-root padding 8px 16px font-size 14px - color #243B55 - min-width 120px &:hover background #f6f6f7