Merge branch 'master' into IOCOM-2087_reminderBanner

pagopa · Mar 3, 2025 · c9af59c · c9af59c
2 parents d17619e + 8e26261
commit c9af59c
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 943 deletions.
diff --git a/ts/features/common/store/reducers/__tests__/__snapshots__/index.test.ts.snap b/ts/features/common/store/reducers/__tests__/__snapshots__/index.test.ts.snap
@@ -148,7 +148,6 @@ exports[`featuresPersistor should match snapshot 1`] = `
     "LV_EXPIRATION_REMINDER": true,
     "PUSH_NOTIFICATIONS_REMINDER": true,
     "SEND_ACTIVATION_REMINDER": false,
-    "SETTINGS_DISCOVERY": true,
   },
   "loginFeatures": {
     "cieLogin": {
@@ -297,9 +296,7 @@ exports[`featuresPersistor should match snapshot 1`] = `
       "kind": "PotNone",
     },
   },
-  "profileSettings": {
-    "hasUserAcknowledgedSettingsBanner": false,
-  },
+  "profileSettings": {},
   "services": {
     "details": {
       "byId": {},

diff --git a/...eatures/itwallet/presentation/details/components/ItwPresentationCredentialStatusAlert.tsx b/...eatures/itwallet/presentation/details/components/ItwPresentationCredentialStatusAlert.tsx
@@ -1,5 +1,5 @@
 import { memo } from "react";
-import { Alert, Body } from "@pagopa/io-app-design-system";
+import { Alert } from "@pagopa/io-app-design-system";
 import I18n from "../../../../../i18n.ts";
 import { StoredCredential } from "../../../common/utils/itwTypesUtils.ts";
 import {
@@ -121,7 +121,7 @@ const IssuerDynamicErrorAlert = ({ message }: IssuerDynamicErrorAlertProps) => {
   const bottomSheet = useIOBottomSheetAutoresizableModal(
     {
       title: localizedMessage.title,
-      component: <Body>{localizedMessage.description}</Body>
+      component: <IOMarkdown content={localizedMessage.description} />
     },
     128
   );

diff --git a/ts/features/landingScreenMultiBanner/store/__tests__/__snapshots__/reducer.test.ts.snap b/ts/features/landingScreenMultiBanner/store/__tests__/__snapshots__/reducer.test.ts.snap
@@ -6,6 +6,5 @@ exports[`landingScreenBannersReducer should match snapshot: undefined_no_action
   "LV_EXPIRATION_REMINDER": true,
   "PUSH_NOTIFICATIONS_REMINDER": true,
   "SEND_ACTIVATION_REMINDER": false,
-  "SETTINGS_DISCOVERY": true,
 }
 `;
diff --git a/ts/features/landingScreenMultiBanner/store/__tests__/selectors.test.tsx b/ts/features/landingScreenMultiBanner/store/__tests__/selectors.test.tsx
@@ -9,8 +9,7 @@ process.env.NODE_ENV = "test";
 const mockState = {
   features: {
     landingBanners: {
-      ITW_DISCOVERY: true,
-      SETTINGS_DISCOVERY: false
+      ITW_DISCOVERY: true
     }
   }
 } as GlobalState;

diff --git a/ts/features/landingScreenMultiBanner/utils/landingScreenBannerMap.tsx b/ts/features/landingScreenMultiBanner/utils/landingScreenBannerMap.tsx
@@ -1,12 +1,10 @@
 import { ReactElement } from "react";
-import { SettingsDiscoveryBanner } from "../../../screens/profile/components/SettingsDiscoveryBanner";
 import { GlobalState } from "../../../store/reducers/types";
 import { ItwDiscoveryBanner } from "../../itwallet/common/components/discoveryBanner/ItwDiscoveryBanner";
 import { isItwPersistedDiscoveryBannerRenderableSelector } from "../../itwallet/common/store/selectors";
 import { LoginExpirationBanner } from "../../login/preferences/components/LoginExpirationBanner";
 import { isSessionExpirationBannerRenderableSelector } from "../../login/preferences/store/selectors";
 import { PNActivationReminderBanner } from "../../pn/components/PNActivationReminderBanner";
-import { hasUserAcknowledgedSettingsBannerSelector } from "../../profileSettings/store/selectors";
 import { PushNotificationsBanner } from "../../pushNotifications/components/PushNotificationsBanner";
 import { isPushNotificationsBannerRenderableSelector } from "../../pushNotifications/store/selectors";
 
@@ -25,7 +23,6 @@ export type LandingScreenBannerId =
 export const LANDING_SCREEN_BANNERS_ENABLED_MAP = {
   PUSH_NOTIFICATIONS_REMINDER: true,
   ITW_DISCOVERY: true,
-  SETTINGS_DISCOVERY: true,
   LV_EXPIRATION_REMINDER: true,
   SEND_ACTIVATION_REMINDER: false
 } as const;
@@ -43,13 +40,6 @@ export const landingScreenBannerMap: BannerMapById = {
     ),
     isRenderableSelector: isItwPersistedDiscoveryBannerRenderableSelector
   },
-  SETTINGS_DISCOVERY: {
-    component: closeHandler => (
-      <SettingsDiscoveryBanner handleOnClose={closeHandler} />
-    ),
-    isRenderableSelector: (state: GlobalState) =>
-      !hasUserAcknowledgedSettingsBannerSelector(state)
-  },
   LV_EXPIRATION_REMINDER: {
     component: closeHandler => (
       <LoginExpirationBanner handleOnClose={closeHandler} />

diff --git a/ts/features/profileSettings/store/actions/index.ts b/ts/features/profileSettings/store/actions/index.ts
diff --git a/ts/features/profileSettings/store/reducers/index.ts b/ts/features/profileSettings/store/reducers/index.ts
@@ -8,18 +8,14 @@ import {
 } from "redux-persist";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import _ from "lodash";
-import { setHasUserAcknowledgedSettingsBanner } from "../actions";
 import { Action } from "../../../../store/actions/types";
 import { differentProfileLoggedIn } from "../../../../store/actions/crossSessions";
 import { isDevEnv } from "../../../../utils/environment";
 
-export type ProfileSettingsState = {
-  hasUserAcknowledgedSettingsBanner: boolean;
-};
+// eslint-disable-next-line @typescript-eslint/ban-types
+export type ProfileSettingsState = {};
 
-export const profileSettingsReducerInitialState = {
-  hasUserAcknowledgedSettingsBanner: false
-};
+export const profileSettingsReducerInitialState = {};
 
 const profileSettingsReducer = (
   state: ProfileSettingsState = profileSettingsReducerInitialState,
@@ -29,38 +25,36 @@ const profileSettingsReducer = (
     case getType(differentProfileLoggedIn): {
       return profileSettingsReducerInitialState;
     }
-    case getType(setHasUserAcknowledgedSettingsBanner): {
-      return {
-        ...state,
-        hasUserAcknowledgedSettingsBanner: action.payload
-      };
-    }
     default:
       return state;
   }
 };
-const CURRENT_REDUX_PROFILE_SETTINGS_STORE_VERSION = 1;
+const CURRENT_REDUX_PROFILE_SETTINGS_STORE_VERSION = 2;
 
 const migrations: MigrationManifest = {
   // we changed the way we compute the installation ID
-  "0": (state): ProfileSettingsState & PersistPartial => {
+  "0": state => {
     const prevState = state as ProfileSettingsState & PersistPartial;
     return {
       ...prevState,
       hasUserAcknowledgedSettingsBanner: false
     };
   },
-  "1": (state): ProfileSettingsState & PersistPartial => {
+  "1": state => {
     const prevState = state as ProfileSettingsState & PersistPartial;
     return _.omit(prevState, "showProfileBanner");
+  },
+  "2": state => {
+    const prevState = state as ProfileSettingsState & PersistPartial;
+    return _.omit(prevState, "hasUserAcknowledgedSettingsBanner");
   }
 };
 const persistConfig: PersistConfig = {
   key: "profileSettings",
   storage: AsyncStorage,
   migrate: createMigrate(migrations, { debug: isDevEnv }),
   version: CURRENT_REDUX_PROFILE_SETTINGS_STORE_VERSION,
-  whitelist: ["hasUserAcknowledgedSettingsBanner"]
+  whitelist: []
 };
 
 export const profileSettingsReducerPersistor = persistReducer(

diff --git a/ts/features/profileSettings/store/selectors/index.ts b/ts/features/profileSettings/store/selectors/index.ts
diff --git a/ts/screens/onboarding/OnboardingShareDataScreen.tsx b/ts/screens/onboarding/OnboardingShareDataScreen.tsx
@@ -68,17 +68,13 @@ const OnboardingShareDataScreen = (): ReactElement => {
           // We wait some time to allow mixpanel to be enabled
           // before tracking the event
           setTimeout(() => {
-            void trackMixpanelSetEnabled(
-              true,
-              getFlowType(false, isFirstOnBoarding),
-              store.getState()
-            );
+            void trackMixpanelSetEnabled(true, flow, store.getState());
           }, 1000);
         },
         testID: "share-data-confirm-button"
       }
     }),
-    [isFirstOnBoarding, present, store, dispatch]
+    [flow, present, store, dispatch]
   );
 
   return (

diff --git a/ts/screens/profile/components/SettingsDiscoveryBanner.tsx b/ts/screens/profile/components/SettingsDiscoveryBanner.tsx
diff --git a/ts/screens/profile/components/__test__/SettingsDiscoveryBanner.test.tsx b/ts/screens/profile/components/__test__/SettingsDiscoveryBanner.test.tsx