Revert changes to use_kibana_ui_setting (#50877)

elastic · Nov 18, 2019 · 34c99cb · 34c99cb
1 parent eb4c47e
commit 34c99cb
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/x-pack/legacy/plugins/siem/public/lib/settings/use_kibana_ui_setting.ts b/x-pack/legacy/plugins/siem/public/lib/settings/use_kibana_ui_setting.ts
@@ -34,22 +34,22 @@ export const useKibanaUiSetting = (key: string, defaultValue?: GenericValue) =>
   const core = useKibanaCore();
   const uiSettingsClient = core.uiSettings;
   const uiInjectedMetadata = core.injectedMetadata;
-  const uiSetting$ = useMemo(() => uiSettingsClient.get$(key, defaultValue), [uiSettingsClient]);
-  const uiSetting = useObservable(uiSetting$);
-  const setUiSetting = useCallback((value: GenericValue) => uiSettingsClient.set(key, value), [
-    uiSettingsClient,
-  ]);
-  const defaultTimezoneProvider = useMemo(() => timezoneProvider(uiSettingsClient)(), [
-    uiSettingsClient,
-  ]);
 
   if (key === DEFAULT_KBN_VERSION) {
     return [uiInjectedMetadata.getKibanaVersion()];
   }
 
+  /* eslint-disable react-hooks/rules-of-hooks */
   if (key === DEFAULT_TIMEZONE_BROWSER) {
-    return [defaultTimezoneProvider];
+    return [useMemo(() => timezoneProvider(uiSettingsClient)(), [uiSettingsClient])];
   }
 
+  const uiSetting$ = useMemo(() => uiSettingsClient.get$(key, defaultValue), [uiSettingsClient]);
+  const uiSetting = useObservable(uiSetting$);
+  const setUiSetting = useCallback((value: GenericValue) => uiSettingsClient.set(key, value), [
+    uiSettingsClient,
+  ]);
+  /* eslint-enable react-hooks/rules-of-hooks */
+
   return [uiSetting, setUiSetting];
 };