Merge branch 'main' into regulations-admin/ministry-and-bugfixes

island-is · Sep 18, 2024 · 9c74e01 · 9c74e01
2 parents 830ce13 + 825530d
commit 9c74e01
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 31 deletions.
diff --git a/apps/native/app/android/app/build.gradle b/apps/native/app/android/app/build.gradle
@@ -103,7 +103,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode getMyVersionCode(143)
-        versionName "1.4.1"
+        versionName "1.4.2"
         manifestPlaceholders = [
             appAuthRedirectScheme: "is.island.app" // project.config.get("BUNDLE_ID_ANDROID")
         ]

diff --git a/apps/native/app/ios/IslandApp/Info.plist b/apps/native/app/ios/IslandApp/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.1</string>
+	<string>1.4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/apps/native/app/src/screens/document-detail/document-detail.tsx b/apps/native/app/src/screens/document-detail/document-detail.tsx
@@ -45,7 +45,7 @@ const PdfWrapper = styled.View`
   flex: 1;
   background-color: ${dynamicColor('background')};
 `
-const regexForBr = /<br \/>*\\?>/g
+const regexForBr = /<br\s*\/>/gi
 
 // Styles for html documents
 const useHtmlStyles = () => {
@@ -377,7 +377,7 @@ export const DocumentDetailScreen: NavigationFunctionComponent<{
                   html: Document.content?.value
                     ? // Removing all <br /> tags to fix a bug in react-native that renders <br /> with too much vertical space
                       // https://github.com/facebook/react-native/issues/32062
-                      `${htmlStyles}${Document.content?.value.replaceAll(
+                      `${htmlStyles}${Document.content?.value.replace(
                         regexForBr,
                         '',
                       )}`

diff --git a/apps/native/app/src/screens/vehicles/components/vehicle-item.tsx b/apps/native/app/src/screens/vehicles/components/vehicle-item.tsx
@@ -15,7 +15,7 @@ type VehicleListItem = NonNullable<
 >[0]
 
 const Cell = styled(TouchableHighlight)`
-  margin-bottom: ${({ theme }) => theme.spacing[2]};
+  margin-bottom: ${({ theme }) => theme.spacing[2]}px;
   border-radius: ${({ theme }) => theme.border.radius.extraLarge};
 `
 

diff --git a/apps/native/app/src/stores/auth-store.ts b/apps/native/app/src/stores/auth-store.ts
@@ -68,21 +68,32 @@ const getAppAuthConfig = () => {
   }
 }
 
-const clearPasskey = async () => {
+const clearPasskey = async (userNationalId?: string) => {
   // Clear passkey if exists
-  preferencesStore.setState({
-    hasCreatedPasskey: false,
-    hasOnboardedPasskeys: false,
-    lastUsedPasskey: 0,
-  })
-
-  const client = await getApolloClientAsync()
-  try {
-    await client.mutate<DeletePasskeyMutation, DeletePasskeyMutationVariables>({
-      mutation: DeletePasskeyDocument,
+  const isPasskeyEnabled = await featureFlagClient?.getValueAsync(
+    'isPasskeyEnabled',
+    false,
+    userNationalId ? { identifier: userNationalId } : undefined,
+  )
+
+  if (isPasskeyEnabled) {
+    preferencesStore.setState({
+      hasCreatedPasskey: false,
+      hasOnboardedPasskeys: false,
+      lastUsedPasskey: 0,
     })
-  } catch (e) {
-    console.error('Failed to delete passkey', e)
+
+    const client = await getApolloClientAsync()
+    try {
+      await client.mutate<
+        DeletePasskeyMutation,
+        DeletePasskeyMutationVariables
+      >({
+        mutation: DeletePasskeyDocument,
+      })
+    } catch (e) {
+      console.error('Failed to delete passkey', e)
+    }
   }
 }
 
@@ -188,7 +199,8 @@ export const authStore = create<AuthStore>((set, get) => ({
     notificationsStore.getState().reset()
 
     // Clear passkey if exists
-    await clearPasskey()
+    const userNationalId = get().userInfo?.nationalId
+    await clearPasskey(userNationalId)
 
     const appAuthConfig = getAppAuthConfig()
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

diff --git a/apps/web/components/Organization/Wrapper/OrganizationWrapper.tsx b/apps/web/components/Organization/Wrapper/OrganizationWrapper.tsx
@@ -183,6 +183,10 @@ export const getThemeConfig = (
       ? 'organization'
       : 'default'
 
+  if (lightThemes.includes(theme ?? '') || usingDefaultHeader) {
+    return { themeConfig: { footerVersion } }
+  }
+
   if (blueberryThemes.includes(theme ?? ''))
     return {
       themeConfig: {
@@ -191,7 +195,6 @@ export const getThemeConfig = (
         footerVersion,
       },
     }
-
   if (darkThemes.includes(theme ?? '')) {
     return {
       themeConfig: {
@@ -202,10 +205,6 @@ export const getThemeConfig = (
     }
   }
 
-  if (lightThemes.includes(theme ?? '') || usingDefaultHeader) {
-    return { themeConfig: { footerVersion } }
-  }
-
   return {
     themeConfig: {
       headerColorScheme: 'white',
@@ -479,13 +478,20 @@ export const OrganizationHeader: React.FC<
         />
       )
     case 'hms':
-      return (
+      return n('usingDefaultHeader', false) ? (
+        <DefaultHeader
+          {...defaultProps}
+          image={n(
+            'hmsHeaderImage',
+            'https://images.ctfassets.net/8k0h54kbe6bj/5pAFV6h9PVzSTQgJY67rbT/3117436e3043bebf720b2f9a7e7619b8/hms-header-image.svg',
+          )}
+        />
+      ) : (
         <HmsHeader
           organizationPage={organizationPage}
           logoAltText={logoAltText}
         />
       )
-
     case 'rikissaksoknari':
       return (
         <RikissaksoknariHeader

diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts b/apps/web/screens/Organization/SocialInsuranceAdministration/translationStrings.ts
@@ -843,12 +843,12 @@ export const translationStrings = defineMessages({
     defaultMessage: 'Meðlag',
     description: 'Niðurstöðuskjár, Meðlag',
   },
-  'REIKNH.PERSAFSLMINNA	': {
+  'REIKNH.PERSAFSLMINNA': {
     id: 'web.pensionCalculator:REIKNH.PERSAFSLMINNA',
     defaultMessage: 'Persónuafsláttur',
     description: 'Niðurstöðuskjár, Persónuafsláttur minna',
   },
-  'REIKNH.SAMANBBOTAFLOKKUR	': {
+  'REIKNH.SAMANBBOTAFLOKKUR': {
     id: 'web.pensionCalculator:REIKNH.SAMANBBOTAFLOKKUR',
     defaultMessage: 'Samanburðarbótaflokkur við eldra kerfi',
     description: 'Niðurstöðuskjár, Samanburðarbótaflokkur við eldra kerfi ',

diff --git a/libs/services/license/src/lib/licenseCache.provider.ts b/libs/services/license/src/lib/licenseCache.provider.ts
@@ -9,12 +9,16 @@ export const LICENSE_SERVICE_CACHE_MANAGER_PROVIDER =
 export const LicenseCacheProvider: FactoryProvider = {
   provide: LICENSE_SERVICE_CACHE_MANAGER_PROVIDER,
   scope: LazyDuringDevScope,
-  useFactory: (licenseServiceConfig: ConfigType<typeof LicenseConfig>) =>
-    createRedisCacheManager({
+  useFactory: (licenseServiceConfig: ConfigType<typeof LicenseConfig>) => {
+    if (process.env.NODE_ENV !== 'production') {
+      return undefined
+    }
+    return createRedisCacheManager({
       name: 'license_service_cache_manager',
       nodes: licenseServiceConfig.redis.nodes,
       ssl: licenseServiceConfig.redis.ssl,
       ttl: licenseServiceConfig.redis.cacheTtl,
-    }),
+    })
+  },
   inject: [LicenseConfig.KEY],
 }