stream-chat-react-native-core 5.14.0-beta.4 → 5.14.0-beta.6

package/src/contexts/overlayContext/OverlayProvider.tsx

@@ -10,7 +10,6 @@ import Animated, {
 } from 'react-native-reanimated';
 
 import type BottomSheet from '@gorhom/bottom-sheet';
-import Dayjs from 'dayjs';
 
 import { OverlayContext, OverlayProviderProps } from './OverlayContext';
 
@@ -36,7 +35,6 @@ import { ThemeProvider } from '../themeContext/ThemeContext';
 import {
   DEFAULT_USER_LANGUAGE,
   TranslationProvider,
-  TranslatorFunctions,
 } from '../translationContext/TranslationContext';
 
 /**
@@ -142,17 +140,13 @@ export const OverlayProvider = <
 
   const bottomSheetRef = useRef<BottomSheet>(null);
 
-  const [translators, setTranslators] = useState<TranslatorFunctions>({
-    t: (key: string) => key,
-    tDateTimeParser: (input?: string | number | Date) => Dayjs(input),
-  });
   const [overlay, setOverlay] = useState(value?.overlay || 'none');
 
   const overlayOpacity = useSharedValue(0);
   const { height, width } = Dimensions.get('screen');
 
   // Setup translators
-  const loadingTranslators = useStreami18n(setTranslators, i18nInstance);
+  const translators = useStreami18n(i18nInstance);
 
   useEffect(() => {
     const backAction = () => {
@@ -216,8 +210,6 @@ export const OverlayProvider = <
     translucentStatusBar,
   };
 
-  if (loadingTranslators) return null;
-
   return (
     <TranslationProvider value={{ ...translators, userLanguage: DEFAULT_USER_LANGUAGE }}>
       <OverlayContext.Provider value={overlayContext}>

package/src/hooks/useStreami18n.ts

@@ -1,16 +1,19 @@
 import { useEffect, useState } from 'react';
 
+import Dayjs from 'dayjs';
+
 import { useIsMountedRef } from './useIsMountedRef';
 
 import type { TranslatorFunctions } from '../contexts/translationContext/TranslationContext';
 import { Streami18n } from '../utils/Streami18n';
 
-export const useStreami18n = (
-  setTranslators: React.Dispatch<React.SetStateAction<TranslatorFunctions>>,
-  i18nInstance?: Streami18n,
-) => {
-  const [loadingTranslators, setLoadingTranslators] = useState(true);
+export const useStreami18n = (i18nInstance?: Streami18n) => {
+  const [translators, setTranslators] = useState<TranslatorFunctions>({
+    t: (key: string) => key,
+    tDateTimeParser: (input?: string | number | Date) => Dayjs(input),
+  });
   const isMounted = useIsMountedRef();
+
   useEffect(() => {
     let streami18n: Streami18n;
 
@@ -28,20 +31,21 @@ export const useStreami18n = (
       streami18n.addOnLanguageChangeListener((t) => {
         updateTFunction(t);
       });
+
     const { unsubscribe: unsubscribeOnTFuncOverrideListener } =
       streami18n.addOnTFunctionOverrideListener((t) => {
         updateTFunction(t);
       });
+
     streami18n.getTranslators().then((translator) => {
       if (translator && isMounted.current) setTranslators(translator);
     });
 
-    setLoadingTranslators(false);
     return () => {
       unsubscribeOnTFuncOverrideListener();
       unsubscribeOnLanguageChangeListener();
     };
   }, [i18nInstance]);
 
-  return loadingTranslators;
+  return translators;
 };

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "5.14.0-beta.4"
+  "version": "5.14.0-beta.6"
 }