Merge branch 'master' into IOCOM-824-825-messageList

pagopa · May 23, 2024 · 3f40dbb · 3f40dbb
2 parents e73ff16 + 45d20bc
commit 3f40dbb
Show file tree

Hide file tree

Showing 57 changed files with 213,210 additions and 1,384 deletions.
diff --git a/.env.local b/.env.local
@@ -59,8 +59,6 @@ PREMIUM_MESSAGES_OPT_IN_ENABLED=YES
 CDC_ENABLED = YES
 # Scan additional barcodes (E.g. Data Matrix) in the payment section
 SCAN_ADDITIONAL_BARCODES_ENABLED = YES
-# Opt-in for reminder push notifications
-REMINDERS_OPT_IN_ENABLED=YES
 # FCI (Firma con IO) feature
 FCI_ENABLED=YES
 # IDPay

diff --git a/.env.production b/.env.production
@@ -59,8 +59,6 @@ PREMIUM_MESSAGES_OPT_IN_ENABLED=YES
 CDC_ENABLED = YES
 # Scan additional barcodes (E.g. Data Matrix) in the payment section
 SCAN_ADDITIONAL_BARCODES_ENABLED = YES
-# Opt-in for reminder push notifications
-REMINDERS_OPT_IN_ENABLED=YES
 # FCI (Firma con IO) feature
 FCI_ENABLED=YES
 # IDPay

diff --git a/img/onboarding/notification_blue.png b/img/onboarding/notification_blue.png
diff --git a/img/onboarding/notification_blue@2x.png b/img/onboarding/notification_blue@2x.png
diff --git a/img/onboarding/notification_blue@3x.png b/img/onboarding/notification_blue@3x.png
diff --git a/img/onboarding/notification_white.png b/img/onboarding/notification_white.png
diff --git a/img/onboarding/notification_white@2x.png b/img/onboarding/notification_white@2x.png
diff --git a/img/onboarding/notification_white@3x.png b/img/onboarding/notification_white@3x.png
diff --git a/locales/en/index.yml b/locales/en/index.yml
@@ -2104,6 +2104,11 @@ services:
   emptyListMessage: There are no services available at this time, pull down to refresh
   new: New
   home:
+    featured:
+      services:
+        title: Featured
+      institutions:
+        title: Featured Institutions
     institutions:
       title: National
   institution:

diff --git a/locales/it/index.yml b/locales/it/index.yml
@@ -411,7 +411,7 @@ profile:
           additionalInformation:
             description: "Per maggiori informazioni, leggi "
             cta: "l’Informativa Privacy e i Termini e Condizioni d’uso"
-          profileSettings: "Potrai modificare questa scelta in ogni momento andando su Profilo > Preferenze"
+          profileSettings: "Puoi modificare la tua scelta in ogni momento da Profilo > Preferenze"
           cta:
             shareData: "Condividi"
             dontShareData: "Non condividere dati"
@@ -522,19 +522,19 @@ profile:
       contextualHelpContent: !include profile/profile_preferences_notifications.md
       header: Notifiche push
       title: Personalizza le notifiche
-      subtitle: Scegli come ricevere aggiornamenti sui messaggi e promemoria.
+      subtitle: Scegli se mostrare le anteprime e ricevere promemoria, come in questo esempio.
       titleExistingUser: Personalizza le notifiche
       subtitleExistingUser: Ora puoi vedere subito chi ti ha scritto o ricevere promemoria da messaggi importanti, come in questo esempio.
       reminders:
-        title: Consenti i promemoria
+        title: Consenti promemoria
         description: Su richiesta dell'ente, ricevi notifiche push in prossimità di scadenze o quando hai dei messaggi non letti
       preview:
-        title: Mostra un'anteprima
-        description: Includi nella notifica push il mittente e l’oggetto del messaggio
-        link: Più info
+        title: Mostra anteprime
+        description: Includi nella notifica push il mittente e l’oggetto del messaggio.
+        link: Scopri di più
         bottomSheet:
-          title: Mostra un'anteprima
-          content: Se l’opzione è attiva le notifiche push mostrano il mittente e l’oggetto dei messaggi, anche quando lo schermo è bloccato. Queste informazioni vengono trattate dal gestore del tuo sistema operativo e da app di terze parti eventualmente in esecuzione.
+          title: Mostra anteprime
+          content: "Una notifica push è un messaggio che ricevi sul tuo dispositivo anche quando non usi l'app. Se attivi questa opzione, riceverai notifiche push che ti mostreranno il mittente e l'oggetto del messaggio.\nQueste informazioni sono gestite dal sistema operativo del tuo dispositivo e dalle eventuali app di terze parti che stai utilizzando."
           cta: Ho capito!
       error: Si è verificato un errore con la tua richiesta
 userMetadata:
@@ -2104,6 +2104,11 @@ services:
   emptyListMessage: Non ci sono servizi disponibili al momento, trascina in basso per aggiornare
   new: Nuovo
   home:
+    featured:
+      services:
+        title: In primo piano
+      institutions:
+        title: Enti in evidenza
     institutions:
       title: Nazionali
   institution:

diff --git a/ts/components/ui/RNavScreenWithLargeHeader.tsx b/ts/components/ui/RNavScreenWithLargeHeader.tsx
@@ -136,7 +136,7 @@ export const RNavScreenWithLargeHeader = ({
 
         {description && (
           <ContentWrapper>
-            <VSpacer size={4} />
+            <VSpacer size={16} />
             <Body color="grey-700">{description}</Body>
           </ContentWrapper>
         )}

diff --git a/ts/config.ts b/ts/config.ts
@@ -109,9 +109,6 @@ export const cieLoginFlowWithDevServerEnabled =
 // Native Login Feature Flag
 export const nativeLoginEnabled = Config.NATIVE_LOGIN_ENABLED === "YES";
 
-// Opt-in for reminder push notifications
-export const remindersOptInEnabled = Config.REMINDERS_OPT_IN_ENABLED === "YES";
-
 export const isNewServicesEnabled = Config.NEW_SERVICES_ENABLED === "YES";
 
 export const fetchTimeout = pipe(

diff --git a/ts/features/pushNotifications/components/NotificationPreviewSample.tsx b/ts/features/pushNotifications/components/NotificationPreviewSample.tsx
@@ -5,18 +5,16 @@ import {
   Icon,
   HSpacer,
   IOSpacingScale,
-  IOVisualCostants
+  Label,
+  IOStyles,
+  H6
 } from "@pagopa/io-app-design-system";
-import { H4 } from "../../../components/core/typography/H4";
-import { H5 } from "../../../components/core/typography/H5";
-import customVariables from "../../../theme/variables";
 import I18n from "../../../i18n";
 import { TranslationKeys } from "../../../../locales/locales";
-import { IOStyles } from "../../../components/core/variables/IOStyles";
 
 const notificationMarginVertical: IOSpacingScale = 4;
 const notificationPaddingVertical: IOSpacingScale = 8;
-const notificationPaddingHorizontal: IOSpacingScale = 16;
+const notificationPaddingHorizontal: IOSpacingScale = 24;
 
 const styles = StyleSheet.create({
   notification: {
@@ -25,10 +23,9 @@ const styles = StyleSheet.create({
     backgroundColor: IOColors.white,
     borderWidth: 1,
     borderColor: IOColors.bluegreyLight,
-    borderRadius: customVariables.borderRadiusBase,
-    minHeight: 72,
+    borderRadius: 8,
+    minHeight: 90,
     marginVertical: notificationMarginVertical,
-    marginHorizontal: IOVisualCostants.appMarginDefault,
     paddingVertical: notificationPaddingVertical,
     paddingHorizontal: notificationPaddingHorizontal
   }
@@ -77,15 +74,13 @@ export const NotificationPreviewSample = ({
 
   return (
     <View style={styles.notification}>
-      <Icon name="productIOAppBlueBg" />
+      <Icon color="blueIO-450" name="productIOApp" />
       <HSpacer />
       <View style={IOStyles.flex}>
-        <H4 weight="SemiBold" color="bluegreyDark">
-          {I18n.t(titleKey)}
-        </H4>
-        <H5 weight="Regular" color="bluegrey">
+        <H6 weight="SemiBold">{I18n.t(titleKey)}</H6>
+        <Label fontSize="small" weight="Regular">
           {I18n.t(messageKey)}
-        </H5>
+        </Label>
       </View>
     </View>
   );

diff --git a/ts/features/pushNotifications/components/NotificationsPreferencesPreview.tsx b/ts/features/pushNotifications/components/NotificationsPreferencesPreview.tsx
@@ -1,6 +1,5 @@
 import React from "react";
 import { StyleSheet, ImageBackground } from "react-native";
-import NotificationBlueBg from "../../../../img/onboarding/notification_blue.png";
 import NotificationWhiteBg from "../../../../img/onboarding/notification_white.png";
 import { NotificationPreviewSample } from "./NotificationPreviewSample";
 
@@ -14,16 +13,14 @@ const styles = StyleSheet.create({
 type Props = {
   previewEnabled: boolean;
   remindersEnabled: boolean;
-  isFirstOnboarding: boolean;
 };
 
 export const NotificationsPreferencesPreview = ({
   previewEnabled,
-  remindersEnabled,
-  isFirstOnboarding
+  remindersEnabled
 }: Props) => (
   <ImageBackground
-    source={isFirstOnboarding ? NotificationWhiteBg : NotificationBlueBg}
+    source={NotificationWhiteBg}
     resizeMode="contain"
     style={styles.container}
   >

diff --git a/ts/features/pushNotifications/components/ProfileNotificationsSettings.tsx b/ts/features/pushNotifications/components/ProfileNotificationsSettings.tsx
@@ -0,0 +1,86 @@
+import {
+  Banner,
+  Divider,
+  ListItemSwitch,
+  VSpacer
+} from "@pagopa/io-app-design-system";
+import React from "react";
+import I18n from "../../../i18n";
+import { usePreviewMoreInfo } from "../hooks/usePreviewMoreInfo";
+import { NotificationsPreferencesPreview } from "./NotificationsPreferencesPreview";
+
+type ProfileNotificationSettingsProps = {
+  disablePreviewSetting: boolean;
+  disableRemindersSetting: boolean;
+  isUpdatingPreviewSetting: boolean;
+  isUpdatingRemindersSetting: boolean;
+  onPreviewValueChanged?: (value: boolean) => void;
+  onReminderValueChanged?: (value: boolean) => void;
+  previewSwitchValue: boolean;
+  remindersSwitchValue: boolean;
+  showSettingsPath: boolean;
+};
+
+export const ProfileNotificationSettings = ({
+  disablePreviewSetting,
+  disableRemindersSetting,
+  isUpdatingPreviewSetting,
+  isUpdatingRemindersSetting,
+  onPreviewValueChanged,
+  onReminderValueChanged,
+  previewSwitchValue,
+  remindersSwitchValue,
+  showSettingsPath
+}: ProfileNotificationSettingsProps) => {
+  const { present, bottomSheet } = usePreviewMoreInfo();
+  return (
+    <>
+      <VSpacer size={24} />
+      <NotificationsPreferencesPreview
+        previewEnabled={previewSwitchValue}
+        remindersEnabled={remindersSwitchValue}
+      />
+      <VSpacer size={24} />
+      <ListItemSwitch
+        label={I18n.t("profile.preferences.notifications.preview.title")}
+        description={I18n.t(
+          "profile.preferences.notifications.preview.description"
+        )}
+        action={{
+          label: I18n.t("profile.preferences.notifications.preview.link"),
+          onPress: present
+        }}
+        value={previewSwitchValue}
+        disabled={disablePreviewSetting}
+        isLoading={isUpdatingPreviewSetting}
+        onSwitchValueChange={onPreviewValueChanged}
+        switchTestID={"previewsPreferenceSwitch"}
+      />
+      <Divider />
+      <ListItemSwitch
+        label={I18n.t("profile.preferences.notifications.reminders.title")}
+        description={I18n.t(
+          "profile.preferences.notifications.reminders.description"
+        )}
+        value={remindersSwitchValue}
+        disabled={disableRemindersSetting}
+        isLoading={isUpdatingRemindersSetting}
+        onSwitchValueChange={onReminderValueChanged}
+        switchTestID={"remindersPreferenceSwitch"}
+      />
+      {showSettingsPath && <VSpacer size={40} />}
+      {showSettingsPath && (
+        <Banner
+          pictogramName="reactivate"
+          content={I18n.t(
+            "profile.main.privacy.shareData.screen.profileSettings"
+          )}
+          size="small"
+          color="neutral"
+        />
+      )}
+      <VSpacer size={32} />
+      {bottomSheet}
+    </>
+  );
+};