Merge branch 'master' into IOAPPX-445-replace-legacy-footer-with-buttons

pagopa · Dec 6, 2024 · 6458b0b · 6458b0b
2 parents e293e2e + 720e65b
commit 6458b0b
Show file tree

Hide file tree

Showing 18 changed files with 62 additions and 36 deletions.
diff --git a/.env.local b/.env.local
@@ -99,9 +99,5 @@ ITW_BYPASS_IDENTITY_MATCH=YES
 ITW_IDP_HINT_TEST=YES
 # IPZS Privacy Policy URL
 ITW_IPZS_PRIVACY_URL='https://io.italia.it/informativa-ipzs'
-# ITW Privacy Policy URL
-ITW_PRIVACY_URL='https://io.italia.it/informativa-sperimentazione'
-# ITW TOS URL
-ITW_TOS_URL='https://io.italia.it/tos-sperimentazione'
 # ITW Documents on IO URL
 ITW_DOCUMENTS_ON_IO_URL='https://io.italia.it/documenti-su-io'
diff --git a/.env.production b/.env.production
@@ -99,9 +99,5 @@ ITW_BYPASS_IDENTITY_MATCH=NO
 ITW_IDP_HINT_TEST=NO
 # IPZS Privacy Policy URL
 ITW_IPZS_PRIVACY_URL='https://io.italia.it/informativa-ipzs'
-# ITW Privacy Policy URL
-ITW_PRIVACY_URL='https://io.italia.it/informativa-sperimentazione'
-# ITW TOS URL
-ITW_TOS_URL='https://io.italia.it/tos-sperimentazione'
 # ITW Documents on IO URL
 ITW_DOCUMENTS_ON_IO_URL='https://io.italia.it/documenti-su-io'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.79.0-rc.3](https://github.com/pagopa/io-app/compare/2.79.0-rc.2...2.79.0-rc.3) (2024-12-05)
+
+
+### Features
+
+* [[IOBP-1047](https://pagopa.atlassian.net/browse/IOBP-1047)] Add store review when a payment is completed ([#6496](https://github.com/pagopa/io-app/issues/6496)) ([a8e32df](https://github.com/pagopa/io-app/commit/a8e32df7c81690d3af396c5923d55b330704c373))
+
+
+### Bug Fixes
+
+* Status banner contains extra space on header ([#6510](https://github.com/pagopa/io-app/issues/6510)) ([bd558bd](https://github.com/pagopa/io-app/commit/bd558bdbab8ac525146e4c424f5f75376abffb6e))
+
+
+### Chores
+
+* **Cross:** [[IOAPPX-347](https://pagopa.atlassian.net/browse/IOAPPX-347)] Remove react-native-text-input-mask build phase script on iOS ([#6310](https://github.com/pagopa/io-app/issues/6310)) ([f5cf7ce](https://github.com/pagopa/io-app/commit/f5cf7ce35c936649da893514fc8420f64ecf2d70))
+* **Cross:** [[IOAPPX-435](https://pagopa.atlassian.net/browse/IOAPPX-435)] Improve overall UI typography + Update `io-app-design-system` to `4.0.1` ([#6422](https://github.com/pagopa/io-app/issues/6422)) ([b9d3233](https://github.com/pagopa/io-app/commit/b9d3233500766efa207716a2e5d3bb279612b84f))
+* **IT Wallet:** [[SIW-1807](https://pagopa.atlassian.net/browse/SIW-1807)] Change privacy  in ITWallet Discovery  ([#6506](https://github.com/pagopa/io-app/issues/6506)) ([14d6543](https://github.com/pagopa/io-app/commit/14d654319b96ff5fb901e30da0325acfd770c400))
+* **IT Wallet:** [[SIW-1878](https://pagopa.atlassian.net/browse/SIW-1878)] Loader before SPID Login Webview ([#6493](https://github.com/pagopa/io-app/issues/6493)) ([4e19eaa](https://github.com/pagopa/io-app/commit/4e19eaaa9a17d64d124b46c5d360ca978af5d1bb))
+* [[IOBP-1020](https://pagopa.atlassian.net/browse/IOBP-1020)] Using optimistic UI for remove payment method action ([#6446](https://github.com/pagopa/io-app/issues/6446)) ([274fa6f](https://github.com/pagopa/io-app/commit/274fa6f54608acb7207a51d37fd7f62aade12ddf))
+* [[IOBP-1048](https://pagopa.atlassian.net/browse/IOBP-1048)] Delete transaction when interrupting a payment ([#6494](https://github.com/pagopa/io-app/issues/6494)) ([a94ca59](https://github.com/pagopa/io-app/commit/a94ca5950eb0450baec881da2de15261f59f2055))
+* [[IOCOM-1949](https://pagopa.atlassian.net/browse/IOCOM-1949)] FIMS `iossoapi` protocol ([#6505](https://github.com/pagopa/io-app/issues/6505)) ([c963455](https://github.com/pagopa/io-app/commit/c9634553f96fdd6648b8678553931058fb9fedb6))
+* [[IOPID-2405](https://pagopa.atlassian.net/browse/IOPID-2405)] Delete isNewPaymentSectionEnabledSelector and isSettingsVisibleAndHideProfileSelector ([#6498](https://github.com/pagopa/io-app/issues/6498)) ([b420196](https://github.com/pagopa/io-app/commit/b420196f936929fbd2bfc18015f62256ae680a9d))
+
 ## [2.79.0-rc.2](https://github.com/pagopa/io-app/compare/2.79.0-rc.1...2.79.0-rc.2) (2024-12-04)
 
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -113,8 +113,8 @@ android {
         applicationId "it.pagopa.io.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 100154885
-        versionName "2.79.0.2"
+        versionCode 100154886
+        versionName "2.79.0.3"
         multiDexEnabled true
         // The resConfigs attribute will remove all not required localized resources while building the application,
         // including the localized resources from libraries.

diff --git a/ios/ItaliaApp.xcodeproj/project.pbxproj b/ios/ItaliaApp.xcodeproj/project.pbxproj
@@ -790,7 +790,7 @@
 				CODE_SIGN_ENTITLEMENTS = ItaliaApp/ItaliaApp.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = M2X5YQ4BJ7;
 				ENABLE_BITCODE = NO;
@@ -827,7 +827,7 @@
 				CODE_SIGN_ENTITLEMENTS = ItaliaApp/ItaliaApp.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = M2X5YQ4BJ7;
 				ENABLE_BITCODE = NO;

diff --git a/ios/ItaliaApp/Info.plist b/ios/ItaliaApp/Info.plist
@@ -36,7 +36,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>2</string>
+    <string>3</string>
     <key>ITSAppUsesNonExemptEncryption</key>
     <false/>
     <key>LSApplicationQueriesSchemes</key>

diff --git a/ios/ItaliaAppTests/Info.plist b/ios/ItaliaAppTests/Info.plist
@@ -19,6 +19,6 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>2</string>
+    <string>3</string>
   </dict>
 </plist>
diff --git a/locales/en/index.yml b/locales/en/index.yml
@@ -3319,7 +3319,7 @@ features:
         action: Inizia
       title: La versione digitale dei tuoi documenti, su IO
       content: "###### Documenti su IO: come funziona \n Da oggi puoi aggiungere al Portafoglio di IO **la versione digitale dei tuoi documenti** personali, come la Patente di guida e la Tessera Sanitaria.  \n\n Attiva la funzionalità **Documenti su IO** per averli sempre a portata di mano sul tuo dispositivo.  \n ###### È facile e veloce \n Avrai bisogno delle credenziali **SPID** o **CIE** (Carta d’Identità Elettronica) per completare l’attivazione: è un passaggio di sicurezza necessario per garantire la sicurezza dei tuoi dati."
-      tos: Premendo **Continua** dichiari di aver letto l’[informativa Privacy]({{privacyUrl}}) e i [Termini e Condizioni d’uso]({{tosUrl}}).
+      tos: Premendo **Continua** dichiari di aver letto e compreso l’[Informativa Privacy e i Termini e Condizioni d’uso]({{privacyAndTosUrl}}).
       upcomingWalletBanner:
         title: "Novità in arrivo: i tuoi Documenti su IO"
         content: Presto potrai aggiungere anche tu le versioni digitali dei tuoi documenti personali, come Patente e Tessera Sanitaria, al tuo Portafoglio di IO!

diff --git a/locales/it/index.yml b/locales/it/index.yml
@@ -3319,7 +3319,7 @@ features:
         action: Inizia
       title: La versione digitale dei tuoi documenti, su IO
       content: "###### Documenti su IO: come funziona \n Da oggi puoi aggiungere al Portafoglio di IO **la versione digitale dei tuoi documenti** personali, come la Patente di guida e la Tessera Sanitaria.  \n\n Attiva la funzionalità **Documenti su IO** per averli sempre a portata di mano sul tuo dispositivo.  \n ###### È facile e veloce \n Avrai bisogno delle credenziali **SPID** o **CIE** (Carta d’Identità Elettronica) per completare l’attivazione: è un passaggio di sicurezza necessario per garantire la sicurezza dei tuoi dati."
-      tos: Premendo **Continua** dichiari di aver letto l’[informativa Privacy]({{privacyUrl}}) e i [Termini e Condizioni d’uso]({{tosUrl}}).
+      tos: Premendo **Continua** dichiari di aver letto e compreso l’[Informativa Privacy e i Termini e Condizioni d’uso]({{privacyAndTosUrl}}).
       upcomingWalletBanner:
         title: "Novità in arrivo: i tuoi Documenti su IO"
         content: Presto potrai aggiungere anche tu le versioni digitali dei tuoi documenti personali, come Patente e Tessera Sanitaria, al tuo Portafoglio di IO!

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "italia-app",
-  "version": "2.79.0-rc.2",
+  "version": "2.79.0-rc.3",
   "io_backend_api": "https://raw.githubusercontent.com/pagopa/io-backend/v16.4.0-RELEASE/api_backend.yaml",
   "io_session_manager_api": "https://raw.githubusercontent.com/pagopa/io-auth-n-identity-domain/[email protected]/apps/io-session-manager/api/internal.yaml",
   "io_session_manager_public_api": "https://raw.githubusercontent.com/pagopa/io-auth-n-identity-domain/[email protected]/apps/io-session-manager/api/public.yaml",

diff --git a/publiccode.yml b/publiccode.yml
@@ -9,7 +9,7 @@ releaseDate: "2024-11-21"
 url: "https://github.com/pagopa/io-app"
 applicationSuite: IO
 landingURL: "https://io.italia.it/"
-softwareVersion: 2.79.0-rc.2
+softwareVersion: 2.79.0-rc.3
 developmentStatus: beta
 softwareType: standalone/mobile
 roadmap: "https://io.italia.it/"

diff --git a/ts/components/ui/IOScrollView.tsx b/ts/components/ui/IOScrollView.tsx
@@ -44,6 +44,7 @@ import Animated, {
 } from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { WithTestID } from "../../types/WithTestID";
+import { useStatusAlertProps } from "../../hooks/useStatusAlertProps";
 
 export type IOScrollViewActions =
   | {
@@ -160,6 +161,7 @@ export const IOScrollView = ({
   contentContainerStyle,
   testID
 }: IOScrollView) => {
+  const alertProps = useStatusAlertProps();
   const theme = useIOTheme();
 
   /* Navigation */
@@ -255,12 +257,22 @@ export const IOScrollView = ({
     if (headerConfig) {
       navigation.setOptions({
         header: () => (
-          <HeaderSecondLevel {...headerConfig} scrollValues={scrollValues} />
+          <HeaderSecondLevel
+            {...headerConfig}
+            ignoreSafeAreaMargin={!!alertProps}
+            scrollValues={scrollValues}
+          />
         ),
         headerTransparent: headerConfig.transparent
       });
     }
-  }, [headerConfig, navigation, scrollPositionAbsolute, snapOffset]);
+  }, [
+    headerConfig,
+    navigation,
+    scrollPositionAbsolute,
+    snapOffset,
+    alertProps
+  ]);
 
   const RefreshControlComponent = refreshControlProps ? (
     <RefreshControl {...refreshControlProps} />

diff --git a/ts/components/ui/IOScrollViewWithLargeHeader.tsx b/ts/components/ui/IOScrollViewWithLargeHeader.tsx
@@ -64,7 +64,6 @@ export const IOScrollViewWithLargeHeader = forwardRef<View, Props>(
       contextualHelp,
       contextualHelpMarkdown,
       faqCategories,
-      ignoreSafeAreaMargin = false,
       includeContentMargins = false,
       headerActionsProp = {},
       excludeEndContentMargin,
@@ -91,7 +90,6 @@ export const IOScrollViewWithLargeHeader = forwardRef<View, Props>(
     };
 
     const headerProps: ComponentProps<typeof HeaderSecondLevel> = {
-      ignoreSafeAreaMargin,
       ...useHeaderProps(
         canGoback
           ? {

diff --git a/ts/config.ts b/ts/config.ts
@@ -254,16 +254,6 @@ export const itwIpzsPrivacyUrl: string = pipe(
   t.string.decode,
   E.getOrElse(() => "https://io.italia.it/informativa-ipzs")
 );
-export const itwPrivacyUrl: string = pipe(
-  Config.ITW_PRIVACY_URL,
-  t.string.decode,
-  E.getOrElse(() => "https://io.italia.it/informativa-sperimentazione")
-);
-export const itwTosUrl: string = pipe(
-  Config.ITW_TOS_URL,
-  t.string.decode,
-  E.getOrElse(() => "https://io.italia.it/tos-sperimentazione")
-);
 export const itwDocumentsOnIOUrl: string = pipe(
   Config.ITW_DOCUMENTS_ON_IO_URL,
   t.string.decode,

diff --git a/ts/features/itwallet/discovery/screens/ItwDiscoveryInfoScreen.tsx b/ts/features/itwallet/discovery/screens/ItwDiscoveryInfoScreen.tsx
@@ -21,9 +21,9 @@ import {
   trackItWalletIntroScreen,
   trackOpenItwTos
 } from "../../analytics";
-import { itwPrivacyUrl, itwTosUrl } from "../../../../config";
 import { useIOSelector } from "../../../../store/hooks";
 import { isItwActivationDisabledSelector } from "../../../../store/reducers/backendStatus/remoteConfig";
+import { tosConfigSelector } from "../../../tos/store/selectors";
 
 /**
  * This is the screen that shows the information about the discovery process
@@ -37,6 +37,8 @@ const ItwDiscoveryInfoScreen = () => {
   const machineRef = ItwEidIssuanceMachineContext.useActorRef();
   const isLoading = ItwEidIssuanceMachineContext.useSelector(selectIsLoading);
   const itwActivationDisabled = useIOSelector(isItwActivationDisabledSelector);
+  const tosConfig = useIOSelector(tosConfigSelector);
+  const privacyAndTosUrl = tosConfig.tos_url;
 
   const handleContinuePress = () => {
     trackItWalletActivationStart();
@@ -71,8 +73,7 @@ const ItwDiscoveryInfoScreen = () => {
           onLinkOpen={trackOpenItwTos}
         >
           {I18n.t("features.itWallet.discovery.tos", {
-            privacyUrl: itwPrivacyUrl,
-            tosUrl: itwTosUrl
+            privacyAndTosUrl
           })}
         </ItwMarkdown>
       </ContentWrapper>

diff --git a/ts/hooks/useHeaderSecondLevel.tsx b/ts/hooks/useHeaderSecondLevel.tsx
@@ -132,7 +132,6 @@ export const useHeaderSecondLevel = ({
     const enableDiscreteTransitionProps =
       enableDiscreteTransition && animatedRef
         ? {
-            ignoreSafeAreaMargin: !!alertProps,
             enableDiscreteTransition,
             animatedRef
           }
@@ -142,6 +141,7 @@ export const useHeaderSecondLevel = ({
       scrollValues,
       variant,
       backgroundColor,
+      ignoreSafeAreaMargin: !!alertProps,
       ...enableDiscreteTransitionProps
     };
   }, [

diff --git a/ts/screens/authentication/__tests__/cie/ActivateNfcScreen.test.tsx b/ts/screens/authentication/__tests__/cie/ActivateNfcScreen.test.tsx
@@ -23,6 +23,10 @@ jest.mock("../../../../store/hooks", () => ({
   useIOStore: jest.fn()
 }));
 
+jest.mock("../../../../hooks/useStatusAlertProps", () => ({
+  useStatusAlertProps: jest.fn()
+}));
+
 const mockNavigate = jest.fn();
 const mockReplace = jest.fn();
 jest.mock("@react-navigation/native", () => {

diff --git a/ts/screens/profile/__test__/LanguagesPreferencesScreen.test.tsx b/ts/screens/profile/__test__/LanguagesPreferencesScreen.test.tsx
@@ -17,6 +17,11 @@ jest.mock("../../../store/hooks", () => ({
   useIOStore: jest.fn()
 }));
 
+// Mock the useStatusAlertProps hook
+jest.mock("../../../hooks/useStatusAlertProps", () => ({
+  useStatusAlertProps: jest.fn()
+}));
+
 describe("LanguagesPreferencesScreen", () => {
   beforeAll(() => {
     jest.spyOn(Alert, "alert");