fix: [#173530583] fix (#1967)

pagopa · Jun 26, 2020 · f982d31 · f982d31
1 parent dbe7d5d
commit f982d31
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/ts/store/reducers/content.ts b/ts/store/reducers/content.ts
@@ -153,7 +153,9 @@ export const idpContextualHelpDataFromIdSelector = (id: IdentityProviderId) =>
       return pot.getOrElse(
         pot.map(contextualHelpData, data => {
           const locale = getLocalePrimaryWithFallback();
-          return fromNullable(data[locale].idps[id]);
+          return fromNullable(
+            data[locale] !== undefined ? data[locale].idps[id] : undefined
+          );
         }),
         none
       );
@@ -176,9 +178,14 @@ export const screenContextualHelpDataSelector = createSelector<
       return none;
     }
     const locale = getLocalePrimaryWithFallback();
-    const screenData = data[locale].screens.find(
-      s => s.route_name.toLowerCase() === currentRouteName.toLocaleLowerCase()
-    );
+    const screenData =
+      data[locale] !== undefined
+        ? data[locale].screens.find(
+            s =>
+              s.route_name.toLowerCase() ===
+              currentRouteName.toLocaleLowerCase()
+          )
+        : undefined;
     return fromNullable(screenData);
   });
 });

diff --git a/ts/utils/locale.ts b/ts/utils/locale.ts
@@ -1,6 +1,6 @@
 import { Option, some } from "fp-ts/lib/Option";
 import { Locales } from "../../locales/locales";
-import I18n from "../i18n";
+import I18n, { translations } from "../i18n";
 /**
  * Helpers for handling locales
  */
@@ -21,5 +21,6 @@ export function getLocalePrimary(
 
 export const getLocalePrimaryWithFallback = (fallback: Locales = "en") =>
   getLocalePrimary(I18n.currentLocale())
+    .filter(l => Object.keys(translations).some(t => t === l))
     .map(s => s as Locales)
     .getOrElse(fallback);