Merge branch 'master' into IOBP-1101-fix-mixpanel-events

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.81.0-rc.1](https://github.com/pagopa/io-app/compare/2.81.0-rc.0...2.81.0-rc.1) (2025-01-14)
+
 ## [2.81.0-rc.0](https://github.com/pagopa/io-app/compare/2.80.0-rc.10...2.81.0-rc.0) (2025-01-14)
 
 

android/app/build.gradle

@@ -119,8 +119,8 @@ android {
         applicationId "it.pagopa.io.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 100154906
-        versionName "2.81.0.0"
+        versionCode 100154907
+        versionName "2.81.0.1"
         multiDexEnabled true
         // The resConfigs attribute will remove all not required localized resources while building the application,
         // including the localized resources from libraries.

ios/ItaliaApp.xcodeproj/project.pbxproj

@@ -802,7 +802,7 @@
 				CODE_SIGN_ENTITLEMENTS = ItaliaApp/ItaliaApp.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = M2X5YQ4BJ7;
 				ENABLE_BITCODE = NO;
@@ -839,7 +839,7 @@
 				CODE_SIGN_ENTITLEMENTS = ItaliaApp/ItaliaApp.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = M2X5YQ4BJ7;
 				ENABLE_BITCODE = NO;
@@ -1081,7 +1081,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = M2X5YQ4BJ7;

ios/ItaliaApp/Info.plist

@@ -36,7 +36,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>0</string>
+    <string>1</string>
     <key>ITSAppUsesNonExemptEncryption</key>
     <false/>
     <key>LSApplicationQueriesSchemes</key>

ios/ItaliaAppTests/Info.plist

@@ -19,6 +19,6 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>0</string>
+    <string>1</string>
   </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "italia-app",
-  "version": "2.81.0-rc.0",
+  "version": "2.81.0-rc.1",
   "private": true,
   "scripts": {
     "start": "react-native start",

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.81.0-rc.0
+softwareVersion: 2.81.0-rc.1
 developmentStatus: beta
 softwareType: standalone/mobile
 roadmap: "https://io.italia.it/"

ts/features/idpay/code/screens/IdPayCodeDisplayScreen.tsx

@@ -14,7 +14,7 @@ import * as React from "react";
 import { StyleSheet, View } from "react-native";
 import { SafeAreaView } from "react-native-safe-area-context";
 import LoadingSpinnerOverlay from "../../../../components/LoadingSpinnerOverlay";
-import TopScreenComponent from "../../../../components/screens/TopScreenComponent";
+import { useHeaderSecondLevel } from "../../../../hooks/useHeaderSecondLevel";
 import I18n from "../../../../i18n";
 import {
   AppParamsList,
@@ -76,35 +76,40 @@ const IdPayCodeDisplayScreen = () => {
     ? I18n.t("global.buttons.continue")
     : I18n.t("global.buttons.close");
 
+  useHeaderSecondLevel({
+    title: "",
+    canGoBack: true,
+    contextualHelp: emptyContextualHelp,
+    supportRequest: true
+  });
+
   return (
     <>
       <LoadingSpinnerOverlay isLoading={isGeneratingCode} loadingOpacity={1}>
-        <TopScreenComponent contextualHelp={emptyContextualHelp}>
-          <ContentWrapper>
-            <H2>{I18n.t("idpay.code.onboarding.header")}</H2>
-            <VSpacer size={16} />
-            <Body color="grey-700" weight="Regular">
-              {I18n.t("idpay.code.onboarding.body1")}
-            </Body>
-            <Body color="grey-700" weight="Semibold">
-              {I18n.t("idpay.code.onboarding.bodyBold")}
-            </Body>
-            <Body weight="Semibold" asLink onPress={presentCieBottomSheet}>
-              {I18n.t("idpay.code.onboarding.bodyCta")}
-            </Body>
-            <VSpacer size={24} />
-            <CodeDisplayComponent code={idPayCode} />
-            <VSpacer size={24} />
-            <Banner
-              color="neutral"
-              pictogramName="security"
-              size="big"
-              viewRef={bannerRef}
-              title={I18n.t("idpay.code.onboarding.banner.header")}
-              content={I18n.t("idpay.code.onboarding.banner.body")}
-            />
-          </ContentWrapper>
-        </TopScreenComponent>
+        <ContentWrapper>
+          <H2>{I18n.t("idpay.code.onboarding.header")}</H2>
+          <VSpacer size={16} />
+          <Body color="grey-700" weight="Regular">
+            {I18n.t("idpay.code.onboarding.body1")}
+          </Body>
+          <Body color="grey-700" weight="Semibold">
+            {I18n.t("idpay.code.onboarding.bodyBold")}
+          </Body>
+          <Body weight="Semibold" asLink onPress={presentCieBottomSheet}>
+            {I18n.t("idpay.code.onboarding.bodyCta")}
+          </Body>
+          <VSpacer size={24} />
+          <CodeDisplayComponent code={idPayCode} />
+          <VSpacer size={24} />
+          <Banner
+            color="neutral"
+            pictogramName="security"
+            size="big"
+            viewRef={bannerRef}
+            title={I18n.t("idpay.code.onboarding.banner.header")}
+            content={I18n.t("idpay.code.onboarding.banner.body")}
+          />
+        </ContentWrapper>
         <SafeAreaView style={IOStyles.horizontalContentPadding}>
           <ButtonSolid
             accessibilityLabel={buttonLabel}

ts/features/idpay/code/screens/IdPayCodeRenewScreen.tsx

@@ -8,7 +8,7 @@ import {
 import { useNavigation } from "@react-navigation/native";
 import * as React from "react";
 import { Alert, View } from "react-native";
-import TopScreenComponent from "../../../../components/screens/TopScreenComponent";
+import { useHeaderSecondLevel } from "../../../../hooks/useHeaderSecondLevel";
 import I18n from "../../../../i18n";
 import {
   AppParamsList,
@@ -55,31 +55,31 @@ export const IdPayCodeRenewScreen = () => {
     );
   };
 
+  useHeaderSecondLevel({
+    title: "",
+    canGoBack: true,
+    contextualHelp: emptyContextualHelp,
+    supportRequest: true
+  });
+
   return (
     <>
-      <TopScreenComponent
-        customGoBack={false}
-        dark={false}
-        goBack={true}
-        contextualHelp={emptyContextualHelp}
-      >
-        <View style={IOStyles.horizontalContentPadding}>
-          <H2>{I18n.t("idpay.code.renew.screen.header")}</H2>
-          <VSpacer size={16} />
-          <Body>{I18n.t("idpay.code.renew.screen.body")}</Body>
-          <Body weight="Semibold" asLink onPress={presentCieBottomSheet}>
-            {I18n.t("idpay.code.renew.screen.link")}
-          </Body>
-          <VSpacer size={16} />
-          <ListItemAction
-            label={I18n.t("idpay.code.renew.screen.generateCTA")}
-            onPress={() => customAlert(handleConfirm)}
-            icon="change"
-            accessibilityLabel={I18n.t("idpay.code.renew.screen.generateCTA")}
-            variant="danger"
-          />
-        </View>
-      </TopScreenComponent>
+      <View style={IOStyles.horizontalContentPadding}>
+        <H2>{I18n.t("idpay.code.renew.screen.header")}</H2>
+        <VSpacer size={16} />
+        <Body>{I18n.t("idpay.code.renew.screen.body")}</Body>
+        <Body weight="Semibold" asLink onPress={presentCieBottomSheet}>
+          {I18n.t("idpay.code.renew.screen.link")}
+        </Body>
+        <VSpacer size={16} />
+        <ListItemAction
+          label={I18n.t("idpay.code.renew.screen.generateCTA")}
+          onPress={() => customAlert(handleConfirm)}
+          icon="change"
+          accessibilityLabel={I18n.t("idpay.code.renew.screen.generateCTA")}
+          variant="danger"
+        />
+      </View>
       {bottomSheet}
     </>
   );

ts/features/idpay/code/screens/__tests__/IdPayCodeDisplayScreen.test.tsx

@@ -25,7 +25,8 @@ jest.mock("@react-navigation/native", () => {
       addListener: () => jest.fn(),
       removeListener: () => jest.fn(),
       getParent: () => undefined,
-      pop: mockPop
+      pop: mockPop,
+      setOptions: jest.fn
     })
   };
 });

ts/features/idpay/configuration/screens/IbanConfigurationLandingScreen.tsx

@@ -10,7 +10,7 @@ import {
 import React from "react";
 import { SafeAreaView, StyleSheet, View } from "react-native";
 import { IOStyles } from "../../../../components/core/variables/IOStyles";
-import BaseScreenComponent from "../../../../components/screens/BaseScreenComponent";
+import { useHeaderSecondLevel } from "../../../../hooks/useHeaderSecondLevel";
 import I18n from "../../../../i18n";
 import { emptyContextualHelp } from "../../../../utils/emptyContextualHelp";
 import { useIOBottomSheetAutoresizableModal } from "../../../../utils/hooks/bottomSheet";
@@ -45,12 +45,15 @@ export const IbanConfigurationLanding = () => {
     130
   );
 
+  useHeaderSecondLevel({
+    title: I18n.t("idpay.configuration.headerTitle"),
+    goBack: customGoBack,
+    contextualHelp: emptyContextualHelp,
+    supportRequest: true
+  });
+
   return (
-    <BaseScreenComponent
-      goBack={customGoBack}
-      headerTitle={I18n.t("idpay.configuration.headerTitle")}
-      contextualHelp={emptyContextualHelp}
-    >
+    <>
       <View
         style={[
           IOStyles.flex,
@@ -84,7 +87,7 @@ export const IbanConfigurationLanding = () => {
         />
       </SafeAreaView>
       {bottomSheet}
-    </BaseScreenComponent>
+    </>
   );
 };
 

ts/features/idpay/configuration/screens/IbanEnrollmentScreen.tsx

@@ -11,8 +11,8 @@ import React from "react";
 import { SafeAreaView, ScrollView, StyleSheet } from "react-native";
 import { IbanDTO } from "../../../../../definitions/idpay/IbanDTO";
 import LoadingSpinnerOverlay from "../../../../components/LoadingSpinnerOverlay";
-import BaseScreenComponent from "../../../../components/screens/BaseScreenComponent";
 import ListItemComponent from "../../../../components/screens/ListItemComponent";
+import { useHeaderSecondLevel } from "../../../../hooks/useHeaderSecondLevel";
 import I18n from "../../../../i18n";
 import customVariables from "../../../../theme/variables";
 import { emptyContextualHelp } from "../../../../utils/emptyContextualHelp";
@@ -155,32 +155,33 @@ export const IbanEnrollmentScreen = () => {
       );
     });
 
+  useHeaderSecondLevel({
+    title: I18n.t(
+      isIbanOnly
+        ? "idpay.configuration.iban.title"
+        : "idpay.configuration.headerTitle"
+    ),
+    goBack: handleBackPress,
+    contextualHelp: emptyContextualHelp,
+    supportRequest: true
+  });
+
   return (
-    <BaseScreenComponent
-      goBack={handleBackPress}
-      headerTitle={I18n.t(
-        isIbanOnly
-          ? "idpay.configuration.iban.title"
-          : "idpay.configuration.headerTitle"
-      )}
-      contextualHelp={emptyContextualHelp}
-    >
-      <LoadingSpinnerOverlay isLoading={isLoading} loadingOpacity={1}>
-        <ScrollView style={styles.container}>
-          <H2>{I18n.t("idpay.configuration.iban.enrollment.header")}</H2>
-          <VSpacer size={8} />
-          <Body>{I18n.t("idpay.configuration.iban.enrollment.subTitle")}</Body>
-          <VSpacer size={24} />
-          {renderIbanList()}
-          <VSpacer size={16} />
-          <FeatureInfo
-            iconName="profile"
-            body={I18n.t("idpay.configuration.iban.enrollment.footer")}
-          />
-        </ScrollView>
-        <SafeAreaView>{renderFooter()}</SafeAreaView>
-      </LoadingSpinnerOverlay>
-    </BaseScreenComponent>
+    <LoadingSpinnerOverlay isLoading={isLoading} loadingOpacity={1}>
+      <ScrollView style={styles.container}>
+        <H2>{I18n.t("idpay.configuration.iban.enrollment.header")}</H2>
+        <VSpacer size={8} />
+        <Body>{I18n.t("idpay.configuration.iban.enrollment.subTitle")}</Body>
+        <VSpacer size={24} />
+        {renderIbanList()}
+        <VSpacer size={16} />
+        <FeatureInfo
+          iconName="profile"
+          body={I18n.t("idpay.configuration.iban.enrollment.footer")}
+        />
+      </ScrollView>
+      <SafeAreaView>{renderFooter()}</SafeAreaView>
+    </LoadingSpinnerOverlay>
   );
 };
 

ts/features/idpay/configuration/screens/IbanOnboardingScreen.tsx

@@ -1,10 +1,10 @@
 import {
   Body,
+  BodySmall,
   FooterActions,
   H2,
   HSpacer,
   Icon,
-  BodySmall,
   VSpacer
 } from "@pagopa/io-app-design-system";
 import * as O from "fp-ts/lib/Option";
@@ -14,7 +14,7 @@ import { ScrollView, View } from "react-native";
 import { Iban } from "../../../../../definitions/backend/Iban";
 import { LabelledItem } from "../../../../components/LabelledItem";
 import { IOStyles } from "../../../../components/core/variables/IOStyles";
-import BaseScreenComponent from "../../../../components/screens/BaseScreenComponent";
+import { useHeaderSecondLevel } from "../../../../hooks/useHeaderSecondLevel";
 import I18n from "../../../../i18n";
 import { emptyContextualHelp } from "../../../../utils/emptyContextualHelp";
 import { isLoadingSelector } from "../../common/machine/selectors";
@@ -23,7 +23,6 @@ import { IdPayConfigurationMachineContext } from "../machine/provider";
 export const IbanOnboardingScreen = () => {
   const machine = IdPayConfigurationMachineContext.useActorRef();
 
-  const customGoBack = () => machine.send({ type: "back" });
   const [iban, setIban] = React.useState<{
     text: string;
     value: O.Option<string>;
@@ -35,12 +34,15 @@ export const IbanOnboardingScreen = () => {
 
   const isInputValid = O.isSome(iban.value) && ibanName.length > 0;
 
+  useHeaderSecondLevel({
+    title: I18n.t("idpay.configuration.headerTitle"),
+    canGoBack: true,
+    contextualHelp: emptyContextualHelp,
+    supportRequest: true
+  });
+
   return (
-    <BaseScreenComponent
-      goBack={customGoBack}
-      headerTitle={I18n.t("idpay.configuration.headerTitle")}
-      contextualHelp={emptyContextualHelp}
-    >
+    <>
       <ScrollView style={[IOStyles.flex, IOStyles.horizontalContentPadding]}>
         <VSpacer size={16} />
         <H2>{I18n.t("idpay.configuration.iban.onboarding.header")}</H2>
@@ -111,6 +113,6 @@ export const IbanOnboardingScreen = () => {
           }
         }}
       />
-    </BaseScreenComponent>
+    </>
   );
 };