Merge remote-tracking branch 'origin/master' into SIW-1972-remote-pre…

…sentation-same-device
pagopa · Feb 13, 2025 · 4ff90e5 · 4ff90e5
2 parents f2a0a91 + df85e81
commit 4ff90e5
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/ts/components/screens/OperationResultScreenContent.tsx b/ts/components/screens/OperationResultScreenContent.tsx
@@ -31,11 +31,11 @@ type OperationResultScreenContentProps = WithTestID<{
   subtitleProps?: Pick<BodyProps, "textBreakStrategy" | "lineBreakStrategyIOS">;
   action?: Pick<
     ButtonSolidProps,
-    "label" | "accessibilityLabel" | "onPress" | "testID"
+    "label" | "accessibilityLabel" | "onPress" | "testID" | "icon"
   >;
   secondaryAction?: Pick<
     ButtonLinkProps,
-    "label" | "accessibilityLabel" | "onPress" | "testID"
+    "label" | "accessibilityLabel" | "onPress" | "testID" | "icon"
   >;
   isHeaderVisible?: boolean;
 }>;

diff --git a/ts/features/barcode/screens/BarcodeScanScreen.tsx b/ts/features/barcode/screens/BarcodeScanScreen.tsx
@@ -17,10 +17,7 @@ import {
   IOStackNavigationProp
 } from "../../../navigation/params/AppParamsList";
 import { useIOSelector } from "../../../store/hooks";
-import {
-  barcodesScannerConfigSelector,
-  isIdPayEnabledSelector
-} from "../../../store/reducers/backendStatus/remoteConfig";
+import { barcodesScannerConfigSelector } from "../../../store/reducers/backendStatus/remoteConfig";
 import { emptyContextualHelp } from "../../../utils/emptyContextualHelp";
 import { useIOBottomSheetAutoresizableModal } from "../../../utils/hooks/bottomSheet";
 import { IdPayPaymentRoutes } from "../../idpay/payment/navigation/routes";
@@ -45,11 +42,12 @@ import { useHardwareBackButton } from "../../../hooks/useHardwareBackButton";
 import { usePagoPaPayment } from "../../payments/checkout/hooks/usePagoPaPayment";
 import { FCI_ROUTES } from "../../fci/navigation/routes";
 import { paymentAnalyticsDataSelector } from "../../payments/history/store/selectors";
+import { isIdPayLocallyEnabledSelector } from "../../../store/reducers/persistedPreferences.ts";
 
 const BarcodeScanScreen = () => {
   const navigation = useNavigation<IOStackNavigationProp<AppParamsList>>();
   const openDeepLink = useOpenDeepLink();
-  const isIdPayEnabled = useIOSelector(isIdPayEnabledSelector);
+  const isIdPayEnabled = useIOSelector(isIdPayLocallyEnabledSelector);
   const paymentAnalyticsData = useIOSelector(paymentAnalyticsDataSelector);
 
   const { startPaymentFlowWithRptId } = usePagoPaPayment();

diff --git a/ts/features/payments/checkout/components/WalletPaymentFailureDetail.tsx b/ts/features/payments/checkout/components/WalletPaymentFailureDetail.tsx
@@ -110,6 +110,7 @@ const WalletPaymentFailureDetail = ({ failure }: Props) => {
     accessibilityLabel: I18n.t(
       "wallet.payment.failure.PAYMENT_CANCELED.action"
     ),
+    icon: "categLearning",
     onPress: handleDiscoverMore
   };
 

diff --git a/ts/screens/profile/DeveloperModeSection.tsx b/ts/screens/profile/DeveloperModeSection.tsx
@@ -43,7 +43,7 @@ import {
 } from "../../store/reducers/authentication";
 import { isDebugModeEnabledSelector } from "../../store/reducers/debug";
 import {
-  isIdPayTestEnabledSelector,
+  isIdPayLocallyEnabledSelector,
   isIOMarkdownEnabledLocallySelector,
   isPagoPATestEnabledSelector,
   isPnTestEnabledSelector
@@ -349,7 +349,7 @@ const DesignSystemSection = () => {
 
 const PlaygroundsSection = () => {
   const navigation = useIONavigation();
-  const isIdPayTestEnabled = useIOSelector(isIdPayTestEnabledSelector);
+  const isIdPayTestEnabled = useIOSelector(isIdPayLocallyEnabledSelector);
 
   const playgroundsNavListItems: ReadonlyArray<PlaygroundsNavListItem> = [
     {
@@ -453,7 +453,7 @@ const DeveloperTestEnvironmentSection = ({
   const dispatch = useIODispatch();
   const isPagoPATestEnabled = useIOSelector(isPagoPATestEnabledSelector);
   const isPnTestEnabled = useIOSelector(isPnTestEnabledSelector);
-  const isIdPayTestEnabled = useIOSelector(isIdPayTestEnabledSelector);
+  const isIdPayTestEnabled = useIOSelector(isIdPayLocallyEnabledSelector);
 
   const onPagoPAEnvironmentToggle = (enabled: boolean) => {
     if (enabled) {

diff --git a/ts/screens/profile/SecurityScreen.tsx b/ts/screens/profile/SecurityScreen.tsx
@@ -18,8 +18,10 @@ import ROUTES from "../../navigation/routes";
 import { identificationRequest } from "../../store/actions/identification";
 import { preferenceFingerprintIsEnabledSaveSuccess } from "../../store/actions/persistedPreferences";
 import { useIODispatch, useIOSelector } from "../../store/hooks";
-import { isIdPayEnabledSelector } from "../../store/reducers/backendStatus/remoteConfig";
-import { isFingerprintEnabledSelector } from "../../store/reducers/persistedPreferences";
+import {
+  isFingerprintEnabledSelector,
+  isIdPayLocallyEnabledSelector
+} from "../../store/reducers/persistedPreferences";
 import { getFlowType } from "../../utils/analytics";
 import {
   biometricAuthenticationRequest,
@@ -51,7 +53,7 @@ const SecurityScreen = (): ReactElement => {
   const dispatch = useIODispatch();
   const isFingerprintEnabled = useIOSelector(isFingerprintEnabledSelector);
   const isIdPayCodeOnboarded = useIOSelector(isIdPayCodeOnboardedSelector);
-  const isIdPayEnabled = useIOSelector(isIdPayEnabledSelector);
+  const isIdPayEnabled = useIOSelector(isIdPayLocallyEnabledSelector);
   const isFimsHistoryEnabled = useIOSelector(fimsIsHistoryEnabledSelector);
   const navigation = useIONavigation();
   const [isBiometricDataAvailable, setIsBiometricDataAvailable] =

diff --git a/ts/store/reducers/backendStatus/remoteConfig.ts b/ts/store/reducers/backendStatus/remoteConfig.ts
@@ -19,7 +19,7 @@ import { getAppVersion, isVersionSupported } from "../../../utils/appVersion";
 import { backendStatusLoadSuccess } from "../../actions/backendStatus";
 import { Action } from "../../actions/types";
 import { isPropertyWithMinAppVersionEnabled } from "../featureFlagWithMinAppVersionStatus";
-import { isIdPayTestEnabledSelector } from "../persistedPreferences";
+import { isIdPayLocallyEnabledSelector } from "../persistedPreferences";
 import { GlobalState } from "../types";
 
 export type RemoteConfigState = O.Option<BackendStatus["config"]>;
@@ -279,7 +279,7 @@ export const isFciEnabledSelector = createSelector(
 
 export const isIdPayEnabledSelector = createSelector(
   remoteConfigSelector,
-  isIdPayTestEnabledSelector,
+  isIdPayLocallyEnabledSelector,
   (remoteConfig, isIdPayTestEnabled): boolean =>
     isIdPayTestEnabled ||
     pipe(

diff --git a/ts/store/reducers/persistedPreferences.ts b/ts/store/reducers/persistedPreferences.ts
@@ -205,8 +205,8 @@ export const isMixpanelEnabled = (state: GlobalState): boolean | null =>
 export const isPnTestEnabledSelector = (state: GlobalState) =>
   state.persistedPreferences.isPnTestEnabled;
 
-export const isIdPayTestEnabledSelector = (state: GlobalState) =>
-  !!state.persistedPreferences?.isIdPayTestEnabled;
+export const isIdPayLocallyEnabledSelector = (state: GlobalState) =>
+  state.persistedPreferences?.isIdPayTestEnabled;
 
 // 'isDesignSystemEnabled' has been introduced without a migration
 // (PR https://github.com/pagopa/io-app/pull/4427) so there are cases