diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx index 0f586b391..b86deaf8c 100644 --- a/client/src/Pages/Settings/index.jsx +++ b/client/src/Pages/Settings/index.jsx @@ -85,6 +85,8 @@ const Settings = () => { if (name === "timezone") { dispatch(setTimezone({ timezone: value })); + // Make sure to update settingsData with the new timezone value + setSettingsData(newSettingsData); } if (name === "mode") { diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js index 068340ba8..211e62995 100644 --- a/client/src/Validation/validation.js +++ b/client/src/Validation/validation.js @@ -277,6 +277,7 @@ const settingsValidation = joi.object({ }), pagespeedApiKey: joi.string().allow("").optional(), language: joi.string().required(), + timezone: joi.string().allow("").optional(), systemEmailHost: joi.string().allow(""), systemEmailPort: joi.number().allow(null, ""), systemEmailAddress: joi.string().allow(""), diff --git a/server/validation/joi.js b/server/validation/joi.js index 1f4b1c35c..e0e563e84 100755 --- a/server/validation/joi.js +++ b/server/validation/joi.js @@ -427,6 +427,7 @@ const updateAppSettingsBodyValidation = joi.object({ checkTTL: joi.number().allow(""), pagespeedApiKey: joi.string().allow(""), language: joi.string().allow(""), + timezone: joi.string().allow(""), // showURL: joi.bool().required(), systemEmailHost: joi.string().allow(""), systemEmailPort: joi.number().allow(""),