diff --git a/src/pages/settings/Profile/TimezoneSelectPage.js b/src/pages/settings/Profile/TimezoneSelectPage.js index 7bdf1afd498a..b6fbc36e3ef7 100644 --- a/src/pages/settings/Profile/TimezoneSelectPage.js +++ b/src/pages/settings/Profile/TimezoneSelectPage.js @@ -62,7 +62,19 @@ function TimezoneSelectPage(props) { */ const filterShownTimezones = (searchText) => { setTimezoneInputText(searchText); - setTimezoneOptions(_.filter(allTimezones.current, (tz) => tz.text.toLowerCase().includes(searchText.trim().toLowerCase()))); + const searchWords = searchText.toLowerCase().match(/[a-z0-9]+/g) || []; + setTimezoneOptions( + _.filter(allTimezones.current, (tz) => + _.every( + searchWords, + (word) => + tz.text + .toLowerCase() + .replace(/[^a-z0-9]/g, ' ') + .indexOf(word) > -1, + ), + ), + ); }; return (