Merge branch 'master' into IOBP-316-resume-start-point-after-payment

package.json

@@ -24,7 +24,7 @@
   "pagopa_api_walletv2": "https://raw.githubusercontent.com/pagopa/io-services-metadata/1.0.29/bonus/specs/bpd/pm/walletv2.json",
   "pagopa_cobadge_configuration": "https://raw.githubusercontent.com/pagopa/io-services-metadata/1.0.29/pagopa/cobadge/abi_definitions.yml",
   "pagopa_privative_configuration": "https://raw.githubusercontent.com/pagopa/io-services-metadata/1.0.29/pagopa/privative/definitions.yml",
-  "idpay_api": "https://raw.githubusercontent.com/pagopa/cstar-infrastructure/v6.5.0/src/domains/idpay-app/api/idpay_appio_full/openapi.appio.full.yml",
+  "idpay_api": "https://raw.githubusercontent.com/pagopa/cstar-infrastructure/v6.9.1/src/domains/idpay-app/api/idpay_appio_full/openapi.appio.full.yml",
   "lollipop_api": "https://raw.githubusercontent.com/pagopa/io-backend/v13.25.1-RELEASE/api_lollipop_first_consumer.yaml",
   "fast_login_api": "https://raw.githubusercontent.com/pagopa/io-backend/v13.25.1-RELEASE/openapi/generated/api_fast_login.yaml",
   "pagopa_api_walletv3": "https://raw.githubusercontent.com/pagopa/pagopa-infra/4cd111e94432ff62580adc391de78a5462a7128e/src/domains/wallet-app/api/payment-wallet/v1/_openapi.json.tpl",

ts/boot/configureStoreAndPersistor.ts

@@ -22,7 +22,7 @@ import {
   persistStore
 } from "redux-persist";
 import createSagaMiddleware from "redux-saga";
-import { remoteUndefined } from "../features/bonus/bpd/model/RemoteValue";
+import { remoteUndefined } from "../common/model/RemoteValue";
 import { CURRENT_REDUX_LOLLIPOP_STORE_VERSION } from "../features/lollipop/store";
 import {
   initialLollipopState,

ts/features/bonus/bonusVacanze/components/FooterTopShadow.tsx → ts/components/FooterTopShadow.tsx

@@ -1,7 +1,7 @@
+import { IOStyles } from "@pagopa/io-app-design-system";
 import * as React from "react";
-import { View, StyleSheet } from "react-native";
-import { IOStyles } from "../../../../components/core/variables/IOStyles";
-import variables from "../../../../theme/variables";
+import { StyleSheet, View } from "react-native";
+import variables from "../theme/variables";
 
 // TODO: after bonus vacanze,create a common style for footer, atm duplicated in FooterWithButtons
 const styles = StyleSheet.create({

ts/features/bonus/bonusVacanze/components/loadingErrorScreen/LoadingErrorComponent.tsx → ts/components/LoadingErrorComponent.tsx

@@ -1,12 +1,12 @@
 import { Millisecond } from "@pagopa/ts-commons/lib/units";
 import * as React from "react";
 import { useEffect } from "react";
-import { View, ActivityIndicator, SafeAreaView } from "react-native";
-import { IOStyles } from "../../../../../components/core/variables/IOStyles";
-import { InfoScreenComponent } from "../../../../../components/infoScreen/InfoScreenComponent";
-import GenericErrorComponent from "../../../../../components/screens/GenericErrorComponent";
-import { WithTestID } from "../../../../../types/WithTestID";
-import { setAccessibilityFocus } from "../../../../../utils/accessibility";
+import { ActivityIndicator, SafeAreaView, View } from "react-native";
+import { WithTestID } from "../types/WithTestID";
+import { setAccessibilityFocus } from "../utils/accessibility";
+import { IOStyles } from "./core/variables/IOStyles";
+import { InfoScreenComponent } from "./infoScreen/InfoScreenComponent";
+import GenericErrorComponent from "./screens/GenericErrorComponent";
 
 export type LoadingErrorProps = WithTestID<{
   isLoading: boolean;

ts/components/PinCreationForm.tsx

@@ -2,7 +2,6 @@ import { ButtonOutline, IOColors, VSpacer } from "@pagopa/io-app-design-system";
 import * as React from "react";
 import { ScrollView, StyleSheet, View } from "react-native";
 import { defaultPin } from "../config";
-import { confirmButtonProps } from "../features/bonus/bonusVacanze/components/buttons/ButtonConfigurations";
 import { isValidPinNumber } from "../features/fastLogin/utils/pinPolicy";
 import I18n from "../i18n";
 import { trackPinError } from "../screens/profile/analytics";
@@ -12,6 +11,7 @@ import { PinString } from "../types/PinString";
 import { getFlowType } from "../utils/analytics";
 import { PIN_LENGTH_SIX } from "../utils/constants";
 import { isDevEnv } from "../utils/environment";
+import { confirmButtonProps } from "./buttons/ButtonConfigurations";
 import { LabelledItem } from "./LabelledItem";
 import { InfoBox } from "./box/InfoBox";
 import { Body } from "./core/typography/Body";

ts/features/bonus/bonusVacanze/components/buttons/ButtonConfigurations.ts → ts/components/buttons/ButtonConfigurations.ts

@@ -1,6 +1,6 @@
 import { IOColors, IOIcons } from "@pagopa/io-app-design-system";
-import { BlockButtonProps } from "../../../../../components/ui/BlockButtons";
-import I18n from "../../../../../i18n";
+import { BlockButtonProps } from "../ui/BlockButtons";
+import I18n from "../../i18n";
 
 /**
  * A common configuration for all the buttons that represent a cancel/abort action

ts/features/bonus/bonusVacanze/components/buttons/FooterStackButtons.tsx → ts/components/buttons/FooterStackButtons.tsx

@@ -4,8 +4,8 @@ import { Text as NBButtonText } from "native-base";
 import * as React from "react";
 import { View, StyleSheet } from "react-native";
 import { HSpacer, Icon, VSpacer } from "@pagopa/io-app-design-system";
-import ButtonDefaultOpacity from "../../../../../components/ButtonDefaultOpacity";
-import { BlockButtonProps } from "../../../../../components/ui/BlockButtons";
+import ButtonDefaultOpacity from "../ButtonDefaultOpacity";
+import { BlockButtonProps } from "../ui/BlockButtons";
 import { FooterTopShadow } from "../FooterTopShadow";
 
 const styles = StyleSheet.create({

ts/components/error/WorkunitGenericFailure.tsx

@@ -3,7 +3,7 @@ import { SafeAreaView } from "react-native";
 import { connect } from "react-redux";
 import { Dispatch } from "redux";
 import image from "../../../img/servicesStatus/error-detail-icon.png";
-import { cancelButtonProps } from "../../features/bonus/bonusVacanze/components/buttons/ButtonConfigurations";
+import { cancelButtonProps } from "../buttons/ButtonConfigurations";
 import I18n from "../../i18n";
 import { navigateBack } from "../../store/actions/navigation";
 import { IOStyles } from "../core/variables/IOStyles";

ts/features/bonus/bonusVacanze/components/markdown/FooterSingleButton.tsx → ts/components/markdown/FooterSingleButton.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import FooterWithButtons from "../../../../../components/ui/FooterWithButtons";
+import FooterWithButtons from "../ui/FooterWithButtons";
 import { cancelButtonProps } from "../buttons/ButtonConfigurations";
 
 export type OnCancelProps = {

ts/features/bonus/bonusVacanze/components/markdown/FooterTwoButtons.tsx → ts/components/markdown/FooterTwoButtons.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import FooterWithButtons from "../../../../../components/ui/FooterWithButtons";
+import FooterWithButtons from "../ui/FooterWithButtons";
 import {
   cancelButtonProps,
   confirmButtonProps,

ts/features/bonus/bonusVacanze/components/markdown/MarkdownBaseScreen.tsx → ts/components/markdown/MarkdownBaseScreen.tsx

@@ -1,11 +1,11 @@
 import { useEffect, useState } from "react";
 import * as React from "react";
 import { View, StyleSheet } from "react-native";
-import BaseScreenComponent from "../../../../../components/screens/BaseScreenComponent";
-import { EdgeBorderComponent } from "../../../../../components/screens/EdgeBorderComponent";
-import ScreenContent from "../../../../../components/screens/ScreenContent";
-import Markdown from "../../../../../components/ui/Markdown";
-import themeVariables from "../../../../../theme/variables";
+import BaseScreenComponent from "../screens/BaseScreenComponent";
+import { EdgeBorderComponent } from "../screens/EdgeBorderComponent";
+import ScreenContent from "../screens/ScreenContent";
+import Markdown from "../ui/Markdown";
+import themeVariables from "../../theme/variables";
 
 /**
  * TODO Rename the title prop in the BaseScreenComponent to navigationTitle

ts/components/screens/LogoutScreen.tsx

@@ -6,7 +6,7 @@ import { HSpacer } from "@pagopa/io-app-design-system";
 import { Dispatch } from "../../store/actions/types";
 import { logoutRequest } from "../../store/actions/authentication";
 import I18n from "../../i18n";
-import { LoadingErrorComponent } from "../../features/bonus/bonusVacanze/components/loadingErrorScreen/LoadingErrorComponent";
+import { LoadingErrorComponent } from "../LoadingErrorComponent";
 import BaseScreenComponent from "./BaseScreenComponent";
 
 type Props = ReturnType<typeof mapDispatchToProps>;

ts/components/wallet/OutcomeCodeMessageComponent.tsx

@@ -10,7 +10,7 @@ import FooterWithButtons from "../ui/FooterWithButtons";
 import {
   cancelButtonProps,
   confirmButtonProps
-} from "../../features/bonus/bonusVacanze/components/buttons/ButtonConfigurations";
+} from "../buttons/ButtonConfigurations";
 import { OutcomeCode } from "../../types/outcomeCode";
 import { getFullLocale } from "../../utils/locale";
 

ts/features/bonus/bonusVacanze/__mock__/availableBonuses.ts → ts/features/bonus/__mock__/availableBonuses.ts

@@ -1,11 +1,11 @@
-import { BonusAvailable } from "../../../../../definitions/content/BonusAvailable";
-import { BonusesAvailable } from "../../../../../definitions/content/BonusesAvailable";
+import { BonusAvailable } from "../../../../definitions/content/BonusAvailable";
+import { BonusesAvailable } from "../../../../definitions/content/BonusesAvailable";
 import {
   ID_BONUS_VACANZE_TYPE,
   ID_BPD_TYPE,
   ID_CGN_TYPE
-} from "../utils/bonus";
-import { BonusVisibilityEnum } from "../../../../../definitions/content/BonusVisibility";
+} from "../common/utils";
+import { BonusVisibilityEnum } from "../../../../definitions/content/BonusVisibility";
 
 export const contentBonusVacanzeIT = `#### Chi può richiederlo?