Merge pull request #4140 from RedisInsight/fe/bugfix/release-2.62-fixes

Fe/bugfix/release 2.62 fixes

Author: vlad-dargel

redisinsight/ui/src/contexts/themeContext.tsx

@@ -41,13 +41,14 @@ export class ThemeProvider extends React.Component<Props> {
 
   changeTheme = async (themeValue: any) => {
     let actualTheme = themeValue
-    if (themeValue === Theme.System) {
-      actualTheme = this.getSystemTheme()
-    }
 
     // since change theme is async need to wait to have a proper prefers-color-scheme
     await ipcThemeChange(themeValue)
 
+    if (themeValue === Theme.System) {
+      actualTheme = this.getSystemTheme()
+    }
+
     this.setState({ theme: actualTheme, usingSystemTheme: themeValue === Theme.System }, () => {
       themeService.applyTheme(themeValue)
     })

redisinsight/ui/src/pages/database-analysis/components/top-keys/Table.tsx

@@ -65,7 +65,7 @@ const Table = (props: Props) => {
 
   const handleRedirect = (name: string) => {
     dispatch(changeSearchMode(SearchMode.Pattern))
-    dispatch(setBrowserTreeDelimiter(delimiter))
+    dispatch(setBrowserTreeDelimiter([{ label: delimiter }]))
     dispatch(setFilter(null))
     dispatch(setSearchMatch(name, SearchMode.Pattern))
     dispatch(resetKeysData(SearchMode.Pattern))

redisinsight/ui/src/pages/database-analysis/components/top-namespace/Table.tsx

@@ -63,7 +63,7 @@ const NameSpacesTable = (props: Props) => {
 
   const handleRedirect = (nsp: string, filter: string) => {
     dispatch(changeSearchMode(SearchMode.Pattern))
-    dispatch(setBrowserTreeDelimiter(delimiter))
+    dispatch(setBrowserTreeDelimiter([{ label: delimiter }]))
     dispatch(setFilter(filter))
     dispatch(setSearchMatch(`${nsp}${delimiter}*`, SearchMode.Pattern))
     dispatch(resetKeysData(SearchMode.Pattern))