fix: Fixed default language selection (#617)

GaloyMoney · Sep 8, 2022 · 5b6dc0e · 5b6dc0e
1 parent a85e28c
commit 5b6dc0e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/app/app.tsx b/app/app.tsx
@@ -55,6 +55,7 @@ import { AuthenticationContext } from "./store/authentication-context"
 import { LocalizationContextProvider } from "./store/localization-context"
 import { loadAllLocales } from "./i18n/i18n-util.sync"
 import TypesafeI18n from "./i18n/i18n-react"
+import { customLocaleDetector } from "./utils/locale-detector"
 export const BUILD_VERSION = "build_version"
 
 export const { link: linkNetworkStatusNotifier, useApolloNetworkStatus } =
@@ -308,7 +309,7 @@ export const App = (): JSX.Element => {
     <AuthenticationContext.Provider value={{ isAppLocked, setAppUnlocked, setAppLocked }}>
       <ApolloProvider client={apolloClient}>
         <PriceContextProvider>
-          <TypesafeI18n locale={"en"}>
+          <TypesafeI18n locale={customLocaleDetector()}>
             <LocalizationContextProvider>
               <ErrorBoundary FallbackComponent={ErrorScreen}>
                 <NavigationContainer

diff --git a/app/utils/locale-detector.ts b/app/utils/locale-detector.ts
@@ -1,12 +1,19 @@
 import * as RNLocalize from "react-native-localize"
 
 export const customLocaleDetector = () => {
-  if (RNLocalize.getLocales()) {
-    return RNLocalize.getLocales()?.map((locale) => {
-      return getLanguageFromLocale(locale.languageCode)
-    })
+  if (
+    RNLocalize.getLocales() &&
+    RNLocalize.getLocales().some(
+      (locale) =>
+        locale.languageCode?.startsWith("en") ||
+        locale.languageCode?.startsWith("es") ||
+        locale.languageCode?.startsWith("fr") ||
+        locale.languageCode?.startsWith("pt"),
+    )
+  ) {
+    return getLanguageFromLocale(RNLocalize.getLocales()[0].languageCode)
   }
-  return ["es"]
+  return "en"
 }
 
 export const getLanguageFromLocale = (locale: string) => {