@sheerid/jslib 1.147.0 → 1.148.1

package/sheerides6.js

@@ -3223,13 +3223,14 @@ const getLocaleSafely = (viewModel, verificationResponse) => {
         getOptions().locale ||
         getLocaleFromUrl() ||
         DEFAULT_LOCALE;
-    try {
-        assertValidLocale(locale);
+    if (isValidLocale(locale)) {
         return locale;
     }
-    catch (error) {
-        return DEFAULT_LOCALE;
+    const twoLetterLocaleCode = locale.substring(0, 2);
+    if (isValidLocale(twoLetterLocaleCode)) {
+        return twoLetterLocaleCode;
     }
+    return DEFAULT_LOCALE;
 };
 const getRequestOrganizationLocale = (programTheme = null) => {
     const urlParams = new URLSearchParams(window.location.search);
@@ -4971,9 +4972,13 @@ const setFocus = (fieldId) => {
 const updateViewModelOrganization = (organization, verificationService) => {
     const viewModel = verificationService.viewModel;
     const nextState = fn(viewModel, (draft) => {
-        draft.organization.id = organization.id;
-        draft.organization.idExtended = organization.idExtended;
-        draft.organization.name = organization.name;
+        draft.organization = organization
+            ? {
+                id: organization.id,
+                idExtended: organization.idExtended,
+                name: organization.name,
+            }
+            : blankOrganization.organization;
         if (viewModel.organization && viewModel.organization.source !== undefined) {
             draft.organization.source = viewModel.organization.source;
         }