diff --git a/.env.local b/.env.local index 85188a85db2..98ec6031d02 100644 --- a/.env.local +++ b/.env.local @@ -44,8 +44,6 @@ BPD_API_UAT='https://api-io.uat.cstar.pagopa.it' LOCAL_SERVICE_WEB_URL='http://127.0.0.1:3000/services_web_view' # EU Covid Certificate EU_COVID_CERT_ENABLED=YES -# SiciliaVola configuration -SICILIAVOLA_ENABLED=NO # Zendesk configuration ZENDESK_ENABLED=YES # CGN new merchants features diff --git a/.env.production b/.env.production index 38c252e171a..3aa819f2dae 100644 --- a/.env.production +++ b/.env.production @@ -44,8 +44,6 @@ BPD_API_UAT='https://api-io.uat.cstar.pagopa.it' LOCAL_SERVICE_WEB_URL='https://io.italia.it/app-content/enti-servizi.html' # EU Covid Certificate EU_COVID_CERT_ENABLED=YES -# SiciliaVola configuration -SICILIAVOLA_ENABLED=NO # Zendesk configuration ZENDESK_ENABLED=YES # CGN new merchants features diff --git a/locales/en/index.yml b/locales/en/index.yml index f53eb1064e6..396efbffb21 100644 --- a/locales/en/index.yml +++ b/locales/en/index.yml @@ -681,12 +681,12 @@ authentication: contextualHelpContent: Here you can find information on how to authenticate on IO and some security tips. news: News title: It is now easier to access! - identity_check: You’ll no longer have to authenticate with SPID or CIE every 30 days, but only once a year or if you log out. + identity_check: You’ll no longer have to identify yourself with SPID or CIE every 30 days, but only once a year or if you log out. security_suggests: Safety tips passcode: Any other time, you’ll just need your fingerprint, face recognition or unlock code. - notification: Whenever there is a new authentication to IO, we'll send you an email to let you know. If it’s not you, you can remotely lock access to the app. + notification: Whenever there is a new authentication to IO, we'll send you an email to let you know. If it’s not you, you can remotely lock access to the app button_accept_lv: Continue with quick access - button_decline_lv: Authenticate with SPID or CIE every 30 days + button_decline_lv: Log in with SPID or CIE every 30 days security_suggestions: fingerprint: Do not share your unlock code or biometric recognition with anyone. io_logout: If you lose your device, log out from the web. diff --git a/locales/it/index.yml b/locales/it/index.yml index fdcc44df3e6..ea2e411035a 100644 --- a/locales/it/index.yml +++ b/locales/it/index.yml @@ -681,12 +681,12 @@ authentication: contextualHelpContent: Qui puoi trovare le informazioni sulle modalità di autenticazione su IO e alcuni consigli di sicurezza. news: novità title: Ora è più facile accedere! - identity_check: Non dovrai più autenticarti con SPID o CIE ogni 30 giorni, ma solo una volta all’anno o se esci dall’app + identity_check: Non dovrai più identificarti con SPID o CIE ogni 30 giorni, ma solo una volta all’anno o se esci dall’app security_suggests: Alcuni consigli di sicurezza passcode: Per tutte le altre volte basterà il tuo volto, impronta o codice di sblocco - notification: Riceverai un’email a ogni nuovo accesso. Se non lo riconosci, potrai bloccare l’accesso a IO. + notification: Riceverai un’email a ogni nuovo accesso. Se non lo riconosci, potrai bloccare l’accesso a IO button_accept_lv: Continua con l’accesso rapido - button_decline_lv: Autenticati con SPID o CIE ogni 30 giorni + button_decline_lv: Entra con SPID o CIE ogni 30 giorni security_suggestions: fingerprint: Non condividere il tuo codice di sblocco o riconoscimento biometrico con nessuno io_logout: Se perdi il dispositivo, esci dall’app da web diff --git a/package.json b/package.json index 3b2aa48ce5e..ebda8693337 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "dependencies": { "@babel/plugin-transform-regenerator": "^7.18.6", "@gorhom/bottom-sheet": "^4.1.5", - "@pagopa/io-app-design-system": "1.20.0", + "@pagopa/io-app-design-system": "1.20.1", "@pagopa/io-pagopa-commons": "^3.1.0", "@pagopa/io-react-native-crypto": "^0.2.1", "@pagopa/io-react-native-login-utils": "^0.2.2", diff --git a/ts/config.ts b/ts/config.ts index bb504c21df6..be5b14101b0 100644 --- a/ts/config.ts +++ b/ts/config.ts @@ -66,9 +66,6 @@ export const isPlaygroundsEnabled: boolean = export const euCovidCertificateEnabled: boolean = Config.EU_COVID_CERT_ENABLED === "YES"; -// SiciliaVola Feature Flag -export const svEnabled: boolean = Config.SICILIAVOLA_ENABLED === "YES"; - // Zendesk Feature Flag export const zendeskEnabled: boolean = Config.ZENDESK_ENABLED === "YES"; diff --git a/ts/features/bonus/siciliaVola/components/CheckIncomeComponent.tsx b/ts/features/bonus/siciliaVola/components/CheckIncomeComponent.tsx index f2e2daece10..3d379b5e101 100644 --- a/ts/features/bonus/siciliaVola/components/CheckIncomeComponent.tsx +++ b/ts/features/bonus/siciliaVola/components/CheckIncomeComponent.tsx @@ -1,9 +1,8 @@ -import { useNavigation } from "@react-navigation/native"; +import { VSpacer } from "@pagopa/io-app-design-system"; import * as React from "react"; import { SafeAreaView, ScrollView } from "react-native"; import { connect } from "react-redux"; import { Dispatch } from "redux"; -import { VSpacer } from "@pagopa/io-app-design-system"; import { RadioButtonList, RadioItem @@ -16,7 +15,6 @@ import I18n from "../../../../i18n"; import { GlobalState } from "../../../../store/reducers/types"; import { emptyContextualHelp } from "../../../../utils/emptyContextualHelp"; import { formatNumberAmount } from "../../../../utils/stringBuilder"; -import SV_ROUTES from "../navigation/routes"; import { svGenerateVoucherCancel, svGenerateVoucherUnderThresholdIncome @@ -51,7 +49,6 @@ const CheckIncomeComponent = (props: Props): React.ReactElement => { const [incomeUnderThreshold, setIncomeUnderThreshold] = React.useState< boolean | undefined >(); - const navigation = useNavigation(); const handleContinue = () => { if (incomeUnderThreshold === undefined) { @@ -61,10 +58,7 @@ const CheckIncomeComponent = (props: Props): React.ReactElement => { if (incomeUnderThreshold) { props.onContinuePress(); - return; } - - navigation.navigate(SV_ROUTES.VOUCHER_GENERATION.KO_CHECK_INCOME_THRESHOLD); }; const cancelButtonProps = { diff --git a/ts/features/bonus/siciliaVola/components/CheckResidenceComponent.tsx b/ts/features/bonus/siciliaVola/components/CheckResidenceComponent.tsx index 17df711ee80..e189db8b0ce 100644 --- a/ts/features/bonus/siciliaVola/components/CheckResidenceComponent.tsx +++ b/ts/features/bonus/siciliaVola/components/CheckResidenceComponent.tsx @@ -1,9 +1,8 @@ -import { useNavigation } from "@react-navigation/native"; +import { VSpacer } from "@pagopa/io-app-design-system"; import React from "react"; import { SafeAreaView, ScrollView } from "react-native"; import { connect } from "react-redux"; import { Dispatch } from "redux"; -import { VSpacer } from "@pagopa/io-app-design-system"; import { RadioButtonList, RadioItem @@ -16,7 +15,6 @@ import FooterWithButtons from "../../../../components/ui/FooterWithButtons"; import I18n from "../../../../i18n"; import { GlobalState } from "../../../../store/reducers/types"; import { emptyContextualHelp } from "../../../../utils/emptyContextualHelp"; -import SV_ROUTES from "../navigation/routes"; import { svGenerateVoucherCancel } from "../store/actions/voucherGeneration"; type Props = ReturnType & @@ -37,8 +35,6 @@ const CheckResidenceComponent = (props: Props): React.ReactElement => { boolean | undefined >(); - const navigation = useNavigation(); - const cancelButtonProps = { primary: false, bordered: true, @@ -47,12 +43,7 @@ const CheckResidenceComponent = (props: Props): React.ReactElement => { }; const continueButtonProps = { bordered: false, - onPress: () => - isResidentInSicily === true - ? navigation.navigate( - SV_ROUTES.VOUCHER_GENERATION.SELECT_BENEFICIARY_CATEGORY - ) - : navigation.navigate(SV_ROUTES.VOUCHER_GENERATION.KO_CHECK_RESIDENCE), + onPress: () => isResidentInSicily === true, title: I18n.t("global.buttons.continue"), disabled: isResidentInSicily === undefined }; diff --git a/ts/features/bonus/siciliaVola/navigation/actions.ts b/ts/features/bonus/siciliaVola/navigation/actions.ts deleted file mode 100644 index ff1cc515936..00000000000 --- a/ts/features/bonus/siciliaVola/navigation/actions.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { CommonActions } from "@react-navigation/native"; -import NavigationService from "../../../../navigation/NavigationService"; -import ROUTES from "../../../../navigation/routes"; -import SV_ROUTES from "./routes"; - -/** - * @deprecated - */ -export const navigateToSvCheckStatusRouterScreen = () => - NavigationService.dispatchNavigationAction( - CommonActions.navigate(ROUTES.SERVICES_NAVIGATOR, { - screen: SV_ROUTES.VOUCHER_GENERATION.CHECK_STATUS - }) - ); diff --git a/ts/features/bonus/siciliaVola/navigation/navigator.tsx b/ts/features/bonus/siciliaVola/navigation/navigator.tsx deleted file mode 100644 index 5568df70057..00000000000 --- a/ts/features/bonus/siciliaVola/navigation/navigator.tsx +++ /dev/null @@ -1,127 +0,0 @@ -import { PathConfigMap } from "@react-navigation/core"; -import { createStackNavigator } from "@react-navigation/stack"; -import * as React from "react"; -import { isGestureEnabled } from "../../../../utils/navigation"; -import CheckStatusRouterScreen from "../screens/voucherGeneration/CheckStatusRouterScreen"; -import DisabledAdditionalInfoScreen from "../screens/voucherGeneration/DisabledAdditionalInfoScreen"; -import SvCheckIncomeKoScreen from "../screens/voucherGeneration/ko/SvCheckIncomeKoScreen"; -import SvCheckResidenceKoScreen from "../screens/voucherGeneration/ko/SvCheckResidenceKoScreen"; -import SvGeneratedVoucherTimeoutScreen from "../screens/voucherGeneration/ko/SvGeneratedVoucherTimeoutScreen"; -import SvSelectBeneficiaryCategoryKoScreen from "../screens/voucherGeneration/ko/SvSelectBeneficiaryCategoryKoScreen"; -import SelectBeneficiaryCategoryScreen from "../screens/voucherGeneration/SelectBeneficiaryCategoryScreen"; -import SelectFlightsDateScreen from "../screens/voucherGeneration/SelectFlightsDateScreen"; -import SickCheckIncomeScreen from "../screens/voucherGeneration/SickCheckIncomeScreen"; -import SickSelectDestinationScreen from "../screens/voucherGeneration/SickSelectDestinationScreen"; -import StudentSelectDestinationScreen from "../screens/voucherGeneration/StudentSelectDestinationScreen"; -import SummaryScreen from "../screens/voucherGeneration/SummaryScreen"; -import VoucherGeneratedScreen from "../screens/voucherGeneration/VoucherGeneratedScreen"; -import WorkerCheckIncomeScreen from "../screens/voucherGeneration/WorkerCheckIncomeScreen"; -import WorkerSelectDestinationScreen from "../screens/voucherGeneration/WorkerSelectDestinationScreen"; -import VoucherDetailsScreen from "../screens/voucherList/VoucherDetailsScreen"; -import VoucherListScreen from "../screens/voucherList/VoucherListScreen"; -import SV_ROUTES from "./routes"; - -export const svLinkingOptions: PathConfigMap = { - [SV_ROUTES.VOUCHER_GENERATION.MAIN]: { - path: "sv-generation", - screens: { - [SV_ROUTES.VOUCHER_GENERATION.CHECK_STATUS]: "check-status" - } - }, - [SV_ROUTES.VOUCHER_LIST.MAIN]: { - path: "sv-vouchers", - screens: { - [SV_ROUTES.VOUCHER_LIST.LIST]: "list" - } - } -}; - -const ListStack = createStackNavigator(); - -export const SvVoucherListNavigator = () => ( - - - - -); - -const GenerationStack = createStackNavigator(); - -export const SvVoucherGenerationNavigator = () => ( - - - - - - - - - - - - - - - - - -); diff --git a/ts/features/bonus/siciliaVola/navigation/params.ts b/ts/features/bonus/siciliaVola/navigation/params.ts deleted file mode 100644 index 4f3a5f6b4aa..00000000000 --- a/ts/features/bonus/siciliaVola/navigation/params.ts +++ /dev/null @@ -1,28 +0,0 @@ -import SV_ROUTES from "./routes"; - -export type SvMainNavigatorParamsList = { - [SV_ROUTES.MAIN]: undefined; -}; - -export type SvVoucherListNavigatorParamsList = { - [SV_ROUTES.VOUCHER_LIST.LIST]: undefined; - [SV_ROUTES.VOUCHER_LIST.DETAILS]: undefined; -}; - -export type SvVoucherGenerationNavigatorParamsList = { - [SV_ROUTES.VOUCHER_GENERATION.CHECK_STATUS]: undefined; - [SV_ROUTES.VOUCHER_GENERATION.SELECT_BENEFICIARY_CATEGORY]: undefined; - [SV_ROUTES.VOUCHER_GENERATION.STUDENT_SELECT_DESTINATION]: undefined; - [SV_ROUTES.VOUCHER_GENERATION.DISABLED_ADDITIONAL_INFO]: undefined; - [SV_ROUTES.VOUCHER_GENERATION.WORKER_CHECK_INCOME_THRESHOLD]: undefined; - [SV_ROUTES.VOUCHER_GENERATION.WORKER_SELECT_DESTINATION]: undefined; - [SV_ROUTES.VOUCHER_GENERATION.SICK_CHECK_INCOME_THRESHOLD]: undefined; - [SV_ROUTES.VOUCHER_GENERATION.SICK_SELECT_DESTINATION]: undefined; - [SV_ROUTES.VOUCHER_GENERATION.SELECT_FLIGHTS_DATA]: undefined; - [SV_ROUTES.VOUCHER_GENERATION.SUMMARY]: undefined; - [SV_ROUTES.VOUCHER_GENERATION.VOUCHER_GENERATED]: undefined; - [SV_ROUTES.VOUCHER_GENERATION.KO_CHECK_RESIDENCE]: undefined; - [SV_ROUTES.VOUCHER_GENERATION.KO_SELECT_BENEFICIARY_CATEGORY]: undefined; - [SV_ROUTES.VOUCHER_GENERATION.KO_CHECK_INCOME_THRESHOLD]: undefined; - [SV_ROUTES.VOUCHER_GENERATION.TIMEOUT_GENERATED_VOUCHER]: undefined; -}; diff --git a/ts/features/bonus/siciliaVola/navigation/routes.ts b/ts/features/bonus/siciliaVola/navigation/routes.ts deleted file mode 100644 index 1464acb1730..00000000000 --- a/ts/features/bonus/siciliaVola/navigation/routes.ts +++ /dev/null @@ -1,28 +0,0 @@ -const SV_ROUTES = { - MAIN: "MAIN", - VOUCHER_GENERATION: { - MAIN: "SV_GENERATION_MAIN", - CHECK_STATUS: "SV_CHECK_STATUS", - SELECT_BENEFICIARY_CATEGORY: "SV_SELECT_BENEFICIARY_CATEGORY", - STUDENT_SELECT_DESTINATION: "SV_STUDENT_SELECT_DESTINATION", - DISABLED_ADDITIONAL_INFO: "SV_DISABLED_ADDITIONAL_INFO", - WORKER_CHECK_INCOME_THRESHOLD: "SV_WORKER_CHECK_INCOME_THRESHOLD", - WORKER_SELECT_DESTINATION: "SV_WORKER_SELECT_DESTINATION", - SICK_CHECK_INCOME_THRESHOLD: "SV_SICK_CHECK_INCOME_THRESHOLD", - SICK_SELECT_DESTINATION: "SV_SICK_SELECT_DESTINATION", - SELECT_FLIGHTS_DATA: "SV_SELECT_FLIGHTS_DATA", - SUMMARY: "SV_SUMMARY", - VOUCHER_GENERATED: "SV_VOUCHER_GENERATED", - KO_CHECK_RESIDENCE: "SV_KO_CHECK_RESIDENCE", - KO_SELECT_BENEFICIARY_CATEGORY: "SV_KO_SELECT_BENEFICIARY_CATEGORY", - KO_CHECK_INCOME_THRESHOLD: "SV_KO_CHECK_INCOME_THRESHOLD", - TIMEOUT_GENERATED_VOUCHER: "SV_TIMEOUT_GENERATED_VOUCHER" - }, - VOUCHER_LIST: { - MAIN: "SV_VOUCHER_LIST_MAIN", - LIST: "SV_VOUCHER_LIST", - DETAILS: "SV_VOUCHER_DETAILS" - } -} as const; - -export default SV_ROUTES; diff --git a/ts/features/bonus/siciliaVola/saga/orchestration/voucherGeneration.ts b/ts/features/bonus/siciliaVola/saga/orchestration/voucherGeneration.ts index 080f8420a57..02a78f95b9c 100644 --- a/ts/features/bonus/siciliaVola/saga/orchestration/voucherGeneration.ts +++ b/ts/features/bonus/siciliaVola/saga/orchestration/voucherGeneration.ts @@ -10,13 +10,10 @@ import { navigateToWorkunitGenericFailureScreen } from "../../../../../store/actions/navigation"; import { SagaCallReturnType } from "../../../../../types/utils"; -import { navigateToSvCheckStatusRouterScreen } from "../../navigation/actions"; -import SV_ROUTES from "../../navigation/routes"; import { svGenerateVoucherBack, svGenerateVoucherCancel, - svGenerateVoucherCompleted, - svGenerateVoucherFailure + svGenerateVoucherCompleted } from "../../store/actions/voucherGeneration"; /** @@ -26,15 +23,9 @@ import { * - The user aborts the voucher generation {@link svGenerateVoucherCancel} * - The user chooses back from the first screen {@link svGenerateVoucherBack} */ +// eslint-disable-next-line require-yield function* svVoucherGenerationWorkUnit() { - return yield* call(executeWorkUnit, { - startScreenNavigation: navigateToSvCheckStatusRouterScreen, - startScreenName: SV_ROUTES.VOUCHER_GENERATION.CHECK_STATUS, - complete: svGenerateVoucherCompleted, - back: svGenerateVoucherBack, - cancel: svGenerateVoucherCancel, - failure: svGenerateVoucherFailure - }); + return null; } /** @@ -47,13 +38,13 @@ export function* handleSvVoucherGenerationStartActivationSaga(): SagaIterator { const sagaExecution = () => withResetNavigationStack(svVoucherGenerationWorkUnit); - const res: SagaCallReturnType = yield* call( + const res: SagaCallReturnType | null = yield* call( sagaExecution ); if ( // if the activation started from the CTA -> go back - initialRoute === SV_ROUTES.VOUCHER_GENERATION.CHECK_STATUS + initialRoute === null ) { yield* call(navigateBack); } diff --git a/ts/features/bonus/siciliaVola/screens/voucherGeneration/DisabledAdditionalInfoScreen.tsx b/ts/features/bonus/siciliaVola/screens/voucherGeneration/DisabledAdditionalInfoScreen.tsx index 9b5fb9226e7..d0e5cc0b48d 100644 --- a/ts/features/bonus/siciliaVola/screens/voucherGeneration/DisabledAdditionalInfoScreen.tsx +++ b/ts/features/bonus/siciliaVola/screens/voucherGeneration/DisabledAdditionalInfoScreen.tsx @@ -1,10 +1,9 @@ -import { useNavigation } from "@react-navigation/native"; +import { VSpacer } from "@pagopa/io-app-design-system"; import * as React from "react"; import { useState } from "react"; import { SafeAreaView, ScrollView } from "react-native"; import { connect } from "react-redux"; import { Dispatch } from "redux"; -import { VSpacer } from "@pagopa/io-app-design-system"; import { Body } from "../../../../../components/core/typography/Body"; import { H1 } from "../../../../../components/core/typography/H1"; import { Link } from "../../../../../components/core/typography/Link"; @@ -13,15 +12,14 @@ import BaseScreenComponent from "../../../../../components/screens/BaseScreenCom import FooterWithButtons from "../../../../../components/ui/FooterWithButtons"; import I18n from "../../../../../i18n"; import { GlobalState } from "../../../../../store/reducers/types"; +import { dpr28Dec2000Url } from "../../../../../urls"; import { emptyContextualHelp } from "../../../../../utils/emptyContextualHelp"; import { openWebUrl } from "../../../../../utils/url"; import { DeclarationEntry } from "../../../common/components/DeclarationEntry"; -import SV_ROUTES from "../../navigation/routes"; import { svGenerateVoucherBack, svGenerateVoucherCancel } from "../../store/actions/voucherGeneration"; -import { dpr28Dec2000Url } from "../../../../../urls"; type Props = ReturnType & ReturnType; @@ -43,7 +41,6 @@ const loadLocales = () => ({ const DisabledAdditionalInfoScreen = (props: Props): React.ReactElement => { const [acceptedDisclaimer, setAcceptedDisclaimer] = useState(false); - const navigation = useNavigation(); const cancelButtonProps = { primary: false, @@ -53,8 +50,7 @@ const DisabledAdditionalInfoScreen = (props: Props): React.ReactElement => { }; const continueButtonProps = { bordered: false, - onPress: () => - navigation.navigate(SV_ROUTES.VOUCHER_GENERATION.SELECT_FLIGHTS_DATA), + onPress: () => null, title: I18n.t("global.buttons.continue"), disabled: !acceptedDisclaimer }; diff --git a/ts/features/bonus/siciliaVola/screens/voucherGeneration/SelectBeneficiaryCategoryScreen.tsx b/ts/features/bonus/siciliaVola/screens/voucherGeneration/SelectBeneficiaryCategoryScreen.tsx index fe4b4f27e35..3ca60c26f0b 100644 --- a/ts/features/bonus/siciliaVola/screens/voucherGeneration/SelectBeneficiaryCategoryScreen.tsx +++ b/ts/features/bonus/siciliaVola/screens/voucherGeneration/SelectBeneficiaryCategoryScreen.tsx @@ -1,10 +1,9 @@ -import { useNavigation } from "@react-navigation/native"; +import { VSpacer } from "@pagopa/io-app-design-system"; import * as React from "react"; import { useRef, useState } from "react"; import { SafeAreaView, ScrollView } from "react-native"; import { connect } from "react-redux"; import { Dispatch } from "redux"; -import { VSpacer } from "@pagopa/io-app-design-system"; import { RadioButtonList, RadioItem @@ -16,7 +15,6 @@ import FooterWithButtons from "../../../../../components/ui/FooterWithButtons"; import I18n from "../../../../../i18n"; import { GlobalState } from "../../../../../store/reducers/types"; import { emptyContextualHelp } from "../../../../../utils/emptyContextualHelp"; -import SV_ROUTES from "../../navigation/routes"; import { svGenerateVoucherBack, svGenerateVoucherCancel, @@ -72,41 +70,7 @@ const SelectBeneficiaryCategoryScreen = (props: Props): React.ReactElement => { BeneficiaryCategory | undefined >(undefined); - const navigation = useNavigation(); - - const routeNextScreen = () => { - switch (categoryBeneficiary) { - case "student": - props.selectCategory(categoryBeneficiary); - navigation.navigate( - SV_ROUTES.VOUCHER_GENERATION.STUDENT_SELECT_DESTINATION - ); - return; - case "disabled": - props.selectCategory(categoryBeneficiary); - navigation.navigate( - SV_ROUTES.VOUCHER_GENERATION.DISABLED_ADDITIONAL_INFO - ); - return; - case "worker": - props.selectCategory(categoryBeneficiary); - navigation.navigate( - SV_ROUTES.VOUCHER_GENERATION.WORKER_CHECK_INCOME_THRESHOLD - ); - return; - case "sick": - props.selectCategory(categoryBeneficiary); - navigation.navigate( - SV_ROUTES.VOUCHER_GENERATION.SICK_CHECK_INCOME_THRESHOLD - ); - return; - case "other": - navigation.navigate( - SV_ROUTES.VOUCHER_GENERATION.KO_SELECT_BENEFICIARY_CATEGORY - ); - return; - } - }; + const routeNextScreen = () => null; const backButtonProps = { primary: false, diff --git a/ts/features/bonus/siciliaVola/screens/voucherGeneration/SelectFlightsDateScreen.tsx b/ts/features/bonus/siciliaVola/screens/voucherGeneration/SelectFlightsDateScreen.tsx index 9b4b0b5d9cc..678880dab3a 100644 --- a/ts/features/bonus/siciliaVola/screens/voucherGeneration/SelectFlightsDateScreen.tsx +++ b/ts/features/bonus/siciliaVola/screens/voucherGeneration/SelectFlightsDateScreen.tsx @@ -1,10 +1,9 @@ -import { useNavigation } from "@react-navigation/native"; +import { VSpacer } from "@pagopa/io-app-design-system"; import * as React from "react"; import { useRef, useState } from "react"; import { SafeAreaView, ScrollView } from "react-native"; import { connect } from "react-redux"; import { Dispatch } from "redux"; -import { VSpacer } from "@pagopa/io-app-design-system"; import { RadioButtonList, RadioItem @@ -18,7 +17,6 @@ import FooterWithButtons from "../../../../../components/ui/FooterWithButtons"; import I18n from "../../../../../i18n"; import { GlobalState } from "../../../../../store/reducers/types"; import { emptyContextualHelp } from "../../../../../utils/emptyContextualHelp"; -import SV_ROUTES from "../../navigation/routes"; import { FlightsDate, svGenerateVoucherBack, @@ -53,8 +51,6 @@ const SelectFlightsDateScreen = (props: Props): React.ReactElement => { const [showReturn, setShowReturn] = useState(false); - const navigation = useNavigation(); - const handleDisableContinue = (): boolean => { if (showReturn === true) { return departureDate === undefined || returnDate === undefined; @@ -69,7 +65,6 @@ const SelectFlightsDateScreen = (props: Props): React.ReactElement => { returnDate }); } - navigation.navigate(SV_ROUTES.VOUCHER_GENERATION.SUMMARY); }; const cancelButtonProps = { diff --git a/ts/features/bonus/siciliaVola/screens/voucherGeneration/SickCheckIncomeScreen.tsx b/ts/features/bonus/siciliaVola/screens/voucherGeneration/SickCheckIncomeScreen.tsx index fc10ca6d504..60aec283203 100644 --- a/ts/features/bonus/siciliaVola/screens/voucherGeneration/SickCheckIncomeScreen.tsx +++ b/ts/features/bonus/siciliaVola/screens/voucherGeneration/SickCheckIncomeScreen.tsx @@ -1,11 +1,9 @@ -import { useNavigation } from "@react-navigation/native"; import * as O from "fp-ts/lib/Option"; import * as React from "react"; import { connect } from "react-redux"; import { Dispatch } from "redux"; import { GlobalState } from "../../../../../store/reducers/types"; import CheckIncomeComponent from "../../components/CheckIncomeComponent"; -import SV_ROUTES from "../../navigation/routes"; import { svGenerateVoucherFailure, svGenerateVoucherSelectCategory @@ -17,8 +15,6 @@ type Props = ReturnType & ReturnType; const SickCheckIncomeScreen = (props: Props): React.ReactElement | null => { - const navigation = useNavigation(); - if ( O.isSome(props.selectedBeneficiaryCategory) && props.selectedBeneficiaryCategory.value !== "sick" @@ -27,15 +23,7 @@ const SickCheckIncomeScreen = (props: Props): React.ReactElement | null => { return null; } - return ( - - navigation.navigate( - SV_ROUTES.VOUCHER_GENERATION.SICK_SELECT_DESTINATION - ) - } - /> - ); + return null} />; }; const mapDispatchToProps = (dispatch: Dispatch) => ({ failure: (reason: string) => dispatch(svGenerateVoucherFailure(reason)), diff --git a/ts/features/bonus/siciliaVola/screens/voucherGeneration/SickSelectDestinationScreen.tsx b/ts/features/bonus/siciliaVola/screens/voucherGeneration/SickSelectDestinationScreen.tsx index cbe11067b61..766afdc19f4 100644 --- a/ts/features/bonus/siciliaVola/screens/voucherGeneration/SickSelectDestinationScreen.tsx +++ b/ts/features/bonus/siciliaVola/screens/voucherGeneration/SickSelectDestinationScreen.tsx @@ -1,4 +1,3 @@ -import { useNavigation } from "@react-navigation/native"; import * as O from "fp-ts/lib/Option"; import * as React from "react"; import { useRef } from "react"; @@ -12,7 +11,6 @@ import FooterWithButtons from "../../../../../components/ui/FooterWithButtons"; import I18n from "../../../../../i18n"; import { GlobalState } from "../../../../../store/reducers/types"; import { emptyContextualHelp } from "../../../../../utils/emptyContextualHelp"; -import SV_ROUTES from "../../navigation/routes"; import { svGenerateVoucherBack, svGenerateVoucherCancel, @@ -29,7 +27,6 @@ const SickSelectDestinationScreen = ( props: Props ): React.ReactElement | null => { const elementRef = useRef(null); - const navigation = useNavigation(); const backButtonProps = { primary: false, @@ -40,8 +37,7 @@ const SickSelectDestinationScreen = ( const continueButtonProps = { primary: false, bordered: true, - onPress: () => - navigation.navigate(SV_ROUTES.VOUCHER_GENERATION.SELECT_FLIGHTS_DATA), + onPress: () => null, title: "Continue" }; diff --git a/ts/features/bonus/siciliaVola/screens/voucherGeneration/StudentSelectDestinationScreen.tsx b/ts/features/bonus/siciliaVola/screens/voucherGeneration/StudentSelectDestinationScreen.tsx index 03aebfe6caa..465b15016dd 100644 --- a/ts/features/bonus/siciliaVola/screens/voucherGeneration/StudentSelectDestinationScreen.tsx +++ b/ts/features/bonus/siciliaVola/screens/voucherGeneration/StudentSelectDestinationScreen.tsx @@ -1,4 +1,3 @@ -import { useNavigation } from "@react-navigation/native"; import * as O from "fp-ts/lib/Option"; import * as React from "react"; import { useRef } from "react"; @@ -12,7 +11,6 @@ import FooterWithButtons from "../../../../../components/ui/FooterWithButtons"; import I18n from "../../../../../i18n"; import { GlobalState } from "../../../../../store/reducers/types"; import { emptyContextualHelp } from "../../../../../utils/emptyContextualHelp"; -import SV_ROUTES from "../../navigation/routes"; import { svGenerateVoucherBack, svGenerateVoucherCancel, @@ -29,7 +27,6 @@ const StudentSelectDestinationScreen = ( props: Props ): React.ReactElement | null => { const elementRef = useRef(null); - const navigation = useNavigation(); const backButtonProps = { primary: false, @@ -40,8 +37,7 @@ const StudentSelectDestinationScreen = ( const continueButtonProps = { primary: false, bordered: true, - onPress: () => - navigation.navigate(SV_ROUTES.VOUCHER_GENERATION.SELECT_FLIGHTS_DATA), + onPress: () => null, title: "Continue" }; diff --git a/ts/features/bonus/siciliaVola/screens/voucherGeneration/SummaryScreen.tsx b/ts/features/bonus/siciliaVola/screens/voucherGeneration/SummaryScreen.tsx index ceddac3dddc..a0c4846b0d9 100644 --- a/ts/features/bonus/siciliaVola/screens/voucherGeneration/SummaryScreen.tsx +++ b/ts/features/bonus/siciliaVola/screens/voucherGeneration/SummaryScreen.tsx @@ -1,12 +1,13 @@ -import { useNavigation } from "@react-navigation/native"; +import { HSpacer, IOColors, VSpacer } from "@pagopa/io-app-design-system"; import * as O from "fp-ts/lib/Option"; import * as React from "react"; import { useEffect } from "react"; -import { View, SafeAreaView, ScrollView, StyleSheet } from "react-native"; +import { SafeAreaView, ScrollView, StyleSheet, View } from "react-native"; import { connect } from "react-redux"; import { Dispatch } from "redux"; -import { IOColors, HSpacer, VSpacer } from "@pagopa/io-app-design-system"; import { AeroportiAmmessiInputBean } from "../../../../../../definitions/api_sicilia_vola/AeroportiAmmessiInputBean"; +import { isLoading, isReady } from "../../../../../common/model/RemoteValue"; +import { LoadingErrorComponent } from "../../../../../components/LoadingErrorComponent"; import { H1 } from "../../../../../components/core/typography/H1"; import { H4 } from "../../../../../components/core/typography/H4"; import { Link } from "../../../../../components/core/typography/Link"; @@ -15,12 +16,10 @@ import BaseScreenComponent from "../../../../../components/screens/BaseScreenCom import FooterWithButtons from "../../../../../components/ui/FooterWithButtons"; import I18n from "../../../../../i18n"; import { GlobalState } from "../../../../../store/reducers/types"; +import { dpr28Dec2000Url } from "../../../../../urls"; import { formatDateAsLocal } from "../../../../../utils/dates"; import { emptyContextualHelp } from "../../../../../utils/emptyContextualHelp"; import { openWebUrl } from "../../../../../utils/url"; -import { LoadingErrorComponent } from "../../../../../components/LoadingErrorComponent"; -import { isLoading, isReady } from "../../../../../common/model/RemoteValue"; -import SV_ROUTES from "../../navigation/routes"; import { svGenerateVoucherAvailableDestination, svGenerateVoucherBack, @@ -34,7 +33,6 @@ import { destinationsInfoFromVoucherRequest, isVoucherRequest } from "../../utils"; -import { dpr28Dec2000Url } from "../../../../../urls"; type Props = ReturnType & ReturnType; @@ -67,8 +65,6 @@ const styles = StyleSheet.create({ // TODO: update with the correct disclaimer: https://pagopa.atlassian.net/browse/IASV-40 const SummaryScreen = (props: Props): React.ReactElement | null => { - const navigation = useNavigation(); - const { maybeVoucherRequest, requestAvailableDestinations, @@ -127,8 +123,7 @@ const SummaryScreen = (props: Props): React.ReactElement | null => { }; const continueButtonProps = { primary: true, - onPress: () => - navigation.navigate(SV_ROUTES.VOUCHER_GENERATION.VOUCHER_GENERATED), + onPress: () => null, title: I18n.t("global.buttons.continue") }; diff --git a/ts/features/bonus/siciliaVola/screens/voucherGeneration/WorkerCheckIncomeScreen.tsx b/ts/features/bonus/siciliaVola/screens/voucherGeneration/WorkerCheckIncomeScreen.tsx index f157242b0a7..9b8005c0bf5 100644 --- a/ts/features/bonus/siciliaVola/screens/voucherGeneration/WorkerCheckIncomeScreen.tsx +++ b/ts/features/bonus/siciliaVola/screens/voucherGeneration/WorkerCheckIncomeScreen.tsx @@ -1,11 +1,9 @@ -import { useNavigation } from "@react-navigation/native"; import * as O from "fp-ts/lib/Option"; import * as React from "react"; import { connect } from "react-redux"; import { Dispatch } from "redux"; import { GlobalState } from "../../../../../store/reducers/types"; import CheckIncomeComponent from "../../components/CheckIncomeComponent"; -import SV_ROUTES from "../../navigation/routes"; import { svGenerateVoucherFailure } from "../../store/actions/voucherGeneration"; import { selectedBeneficiaryCategorySelector } from "../../store/reducers/voucherGeneration/voucherRequest"; @@ -13,8 +11,6 @@ type Props = ReturnType & ReturnType; const WorkerCheckIncomeScreen = (props: Props): React.ReactElement | null => { - const navigation = useNavigation(); - if ( O.isSome(props.selectedBeneficiaryCategory) && props.selectedBeneficiaryCategory.value !== "worker" @@ -23,15 +19,7 @@ const WorkerCheckIncomeScreen = (props: Props): React.ReactElement | null => { return null; } - return ( - - navigation.navigate( - SV_ROUTES.VOUCHER_GENERATION.WORKER_SELECT_DESTINATION - ) - } - /> - ); + return null} />; }; const mapDispatchToProps = (dispatch: Dispatch) => ({ failure: (reason: string) => dispatch(svGenerateVoucherFailure(reason)) diff --git a/ts/features/bonus/siciliaVola/screens/voucherGeneration/WorkerSelectDestinationScreen.tsx b/ts/features/bonus/siciliaVola/screens/voucherGeneration/WorkerSelectDestinationScreen.tsx index e89a7003de1..6934ae3897e 100644 --- a/ts/features/bonus/siciliaVola/screens/voucherGeneration/WorkerSelectDestinationScreen.tsx +++ b/ts/features/bonus/siciliaVola/screens/voucherGeneration/WorkerSelectDestinationScreen.tsx @@ -1,4 +1,3 @@ -import { useNavigation } from "@react-navigation/native"; import * as O from "fp-ts/lib/Option"; import * as React from "react"; import { useRef } from "react"; @@ -12,7 +11,6 @@ import FooterWithButtons from "../../../../../components/ui/FooterWithButtons"; import I18n from "../../../../../i18n"; import { GlobalState } from "../../../../../store/reducers/types"; import { emptyContextualHelp } from "../../../../../utils/emptyContextualHelp"; -import SV_ROUTES from "../../navigation/routes"; import { svGenerateVoucherBack, svGenerateVoucherCancel, @@ -29,7 +27,6 @@ const WorkerSelectDestinationScreen = ( props: Props ): React.ReactElement | null => { const elementRef = useRef(null); - const navigation = useNavigation(); const backButtonProps = { primary: false, @@ -40,8 +37,7 @@ const WorkerSelectDestinationScreen = ( const continueButtonProps = { primary: false, bordered: true, - onPress: () => - navigation.navigate(SV_ROUTES.VOUCHER_GENERATION.SELECT_FLIGHTS_DATA), + onPress: () => null, title: "Continue" }; diff --git a/ts/features/bonus/siciliaVola/screens/voucherList/VoucherListScreen.tsx b/ts/features/bonus/siciliaVola/screens/voucherList/VoucherListScreen.tsx index a103ce639b6..19188eaf4a9 100644 --- a/ts/features/bonus/siciliaVola/screens/voucherList/VoucherListScreen.tsx +++ b/ts/features/bonus/siciliaVola/screens/voucherList/VoucherListScreen.tsx @@ -1,15 +1,22 @@ -import { useNavigation } from "@react-navigation/native"; +import { VSpacer } from "@pagopa/io-app-design-system"; import * as React from "react"; import { useContext, useEffect, useState } from "react"; import { ActivityIndicator, FlatList, SafeAreaView } from "react-native"; import { connect } from "react-redux"; import { Dispatch } from "redux"; -import { VSpacer } from "@pagopa/io-app-design-system"; import EmptyListImage from "../../../../../../img/bonus/siciliaVola/emptyVoucherList.svg"; +import { + isError, + isLoading, + isReady, + isUndefined +} from "../../../../../common/model/RemoteValue"; +import ItemSeparatorComponent from "../../../../../components/ItemSeparatorComponent"; +import { LoadingErrorComponent } from "../../../../../components/LoadingErrorComponent"; +import { confirmButtonProps } from "../../../../../components/buttons/ButtonConfigurations"; import { H1 } from "../../../../../components/core/typography/H1"; import { IOStyles } from "../../../../../components/core/variables/IOStyles"; import { InfoScreenComponent } from "../../../../../components/infoScreen/InfoScreenComponent"; -import ItemSeparatorComponent from "../../../../../components/ItemSeparatorComponent"; import BaseScreenComponent from "../../../../../components/screens/BaseScreenComponent"; import ListItemComponent from "../../../../../components/screens/ListItemComponent"; import FooterWithButtons from "../../../../../components/ui/FooterWithButtons"; @@ -24,16 +31,7 @@ import { GlobalState } from "../../../../../store/reducers/types"; import { formatDateAsLocal } from "../../../../../utils/dates"; import { emptyContextualHelp } from "../../../../../utils/emptyContextualHelp"; import { showToast } from "../../../../../utils/showToast"; -import { confirmButtonProps } from "../../../../../components/buttons/ButtonConfigurations"; -import { LoadingErrorComponent } from "../../../../../components/LoadingErrorComponent"; -import { - isError, - isLoading, - isReady, - isUndefined -} from "../../../../../common/model/RemoteValue"; import SvVoucherListFilters from "../../components/SvVoucherListFilters"; -import SV_ROUTES from "../../navigation/routes"; import { svGenerateVoucherStart } from "../../store/actions/voucherGeneration"; import { svPossibleVoucherStateGet, @@ -59,7 +57,6 @@ type Props = ReturnType & const RenderItemBase = (voucher: VoucherPreview): React.ReactElement => { const dispatch = useIODispatch(); - const navigation = useNavigation(); return ( { subTitle={formatDateAsLocal(voucher.departureDate, true, true)} onPress={() => { dispatch(svSelectVoucher(voucher.idVoucher)); - navigation.navigate(SV_ROUTES.VOUCHER_LIST.DETAILS); }} /> ); diff --git a/ts/features/walletV3/transaction/navigation/navigator.tsx b/ts/features/walletV3/transaction/navigation/navigator.tsx index 402c2f449ff..9b26df0638d 100644 --- a/ts/features/walletV3/transaction/navigation/navigator.tsx +++ b/ts/features/walletV3/transaction/navigation/navigator.tsx @@ -35,12 +35,12 @@ export const WalletTransactionNavigator = () => ( ); diff --git a/ts/navigation/AppStackNavigator.tsx b/ts/navigation/AppStackNavigator.tsx index 63e73a3ad5f..5641f27fb5f 100644 --- a/ts/navigation/AppStackNavigator.tsx +++ b/ts/navigation/AppStackNavigator.tsx @@ -9,9 +9,8 @@ import { useRef } from "react"; import { View } from "react-native"; import { useStoredExperimentalDesign } from "../common/context/DSExperimentalContext"; import LoadingSpinnerOverlay from "../components/LoadingSpinnerOverlay"; -import { fimsEnabled, myPortalEnabled, svEnabled } from "../config"; +import { fimsEnabled, myPortalEnabled } from "../config"; import { cgnLinkingOptions } from "../features/bonus/cgn/navigation/navigator"; -import { svLinkingOptions } from "../features/bonus/siciliaVola/navigation/navigator"; import { fciLinkingOptions } from "../features/fci/navigation/FciStackNavigator"; import { fimsLinkingOptions } from "../features/fims/navigation/navigator"; import { idPayLinkingOptions } from "../features/idpay/common/navigation/linking"; @@ -122,8 +121,7 @@ const InnerNavigationContainer = (props: { children: React.ReactElement }) => { activate: activate => activate === "true" } }, - ...(myPortalEnabled && { [ROUTES.SERVICE_WEBVIEW]: "webview" }), - ...(svEnabled && svLinkingOptions) + ...(myPortalEnabled && { [ROUTES.SERVICE_WEBVIEW]: "webview" }) } }, ...fciLinkingOptions, diff --git a/ts/navigation/ServicesNavigator.tsx b/ts/navigation/ServicesNavigator.tsx index e4fd4a9ebef..db1edc1783e 100644 --- a/ts/navigation/ServicesNavigator.tsx +++ b/ts/navigation/ServicesNavigator.tsx @@ -1,11 +1,6 @@ import { createStackNavigator } from "@react-navigation/stack"; import * as React from "react"; -import { myPortalEnabled, svEnabled } from "../config"; -import { - SvVoucherGenerationNavigator, - SvVoucherListNavigator -} from "../features/bonus/siciliaVola/navigation/navigator"; -import SV_ROUTES from "../features/bonus/siciliaVola/navigation/routes"; +import { myPortalEnabled } from "../config"; import ServiceDetailsScreen from "../screens/services/ServiceDetailsScreen"; import ServicesWebviewScreen from "../screens/services/ServicesWebviewScreen"; import { isGestureEnabled } from "../utils/navigation"; @@ -29,18 +24,6 @@ const ServicesNavigator = () => ( component={ServicesWebviewScreen} /> )} - {svEnabled && ( - <> - - - - )} ); diff --git a/ts/navigation/params/ServicesParamsList.ts b/ts/navigation/params/ServicesParamsList.ts index 305ee9d7d60..66253c09d4e 100644 --- a/ts/navigation/params/ServicesParamsList.ts +++ b/ts/navigation/params/ServicesParamsList.ts @@ -1,8 +1,3 @@ -import { - SvMainNavigatorParamsList, - SvVoucherGenerationNavigatorParamsList, - SvVoucherListNavigatorParamsList -} from "../../features/bonus/siciliaVola/navigation/params"; import { ServiceDetailsScreenNavigationParams } from "../../screens/services/ServiceDetailsScreen"; import { ServiceWebviewScreenNavigationParams } from "../../screens/services/ServicesWebviewScreen"; import ROUTES from "../routes"; @@ -10,6 +5,4 @@ import ROUTES from "../routes"; export type ServicesParamsList = { [ROUTES.SERVICE_DETAIL]: ServiceDetailsScreenNavigationParams; [ROUTES.SERVICE_WEBVIEW]: ServiceWebviewScreenNavigationParams; -} & SvVoucherGenerationNavigatorParamsList & - SvVoucherListNavigatorParamsList & - SvMainNavigatorParamsList; +}; diff --git a/ts/sagas/startup.ts b/ts/sagas/startup.ts index 82cb9d94987..6ea9ba5f1d6 100644 --- a/ts/sagas/startup.ts +++ b/ts/sagas/startup.ts @@ -27,13 +27,11 @@ import { euCovidCertificateEnabled, pagoPaApiUrlPrefix, pagoPaApiUrlPrefixTest, - svEnabled, zendeskEnabled } from "../config"; import { watchBonusCdcSaga } from "../features/bonus/cdc/saga"; import { watchBonusCgnSaga } from "../features/bonus/cgn/saga"; import { watchBonusSaga } from "../features/bonus/common/store/sagas/bonusSaga"; -import { watchBonusSvSaga } from "../features/bonus/siciliaVola/saga"; import { watchEUCovidCertificateSaga } from "../features/euCovidCert/saga"; import { setSecurityAdviceReadyToShow } from "../features/fastLogin/store/actions/securityAdviceActions"; import { refreshSessionToken } from "../features/fastLogin/store/actions/tokenRefreshActions"; @@ -530,11 +528,6 @@ export function* initializeApplicationSaga( yield* fork(watchBonusSaga, sessionToken); yield* fork(watchBonusCgnSaga, sessionToken); - if (svEnabled) { - // Start watching for sv actions - yield* fork(watchBonusSvSaga, sessionToken); - } - if (euCovidCertificateEnabled) { // Start watching for EU Covid Certificate actions yield* fork(watchEUCovidCertificateSaga, sessionToken); diff --git a/ts/screens/authentication/NewOptInScreen.tsx b/ts/screens/authentication/NewOptInScreen.tsx index 83fc492484e..5c088079a8f 100644 --- a/ts/screens/authentication/NewOptInScreen.tsx +++ b/ts/screens/authentication/NewOptInScreen.tsx @@ -35,6 +35,8 @@ const contextualHelpMarkdown: ContextualHelpPropsMarkdown = { body: "authentication.opt_in.contextualHelpContent" }; +export const MIN_HEIGHT_TO_SHOW_FULL_RENDER = 820; + export type ChosenIdentifier = { identifier: "SPID" | "CIE"; }; @@ -98,7 +100,11 @@ const NewOptInScreen = (props: Props) => { }} > - {Dimensions.get("screen").height > 780 && ( + {/* + if the device height is > 820 then the pictogram will be visible, + otherwise it will not be visible + */} + {Dimensions.get("screen").height > MIN_HEIGHT_TO_SHOW_FULL_RENDER && ( diff --git a/ts/screens/onboarding/UnlockAccessScreen.tsx b/ts/screens/onboarding/UnlockAccessScreen.tsx index 5da1599e745..6be74c5b78a 100644 --- a/ts/screens/onboarding/UnlockAccessScreen.tsx +++ b/ts/screens/onboarding/UnlockAccessScreen.tsx @@ -9,7 +9,6 @@ import { H6, IOColors, IOStyles, - LabelSmall, Pictogram, VSpacer } from "@pagopa/io-app-design-system"; @@ -56,7 +55,7 @@ const UnlockAccessScreen = (props: Props) => { + {I18n.t("authentication.unlockmodal.listitem3_1")}{" "} {I18n.t("authentication.unlockmodal.listitem3_2")}{" "} @@ -66,7 +65,7 @@ const UnlockAccessScreen = (props: Props) => { {I18n.t("authentication.unlockmodal.listitem3_4")}{" "} {I18n.t("authentication.unlockmodal.listitem3_5")} - + } /> diff --git a/ts/screens/wallet/WalletHomeScreen.tsx b/ts/screens/wallet/WalletHomeScreen.tsx index feaf4384e31..30b99d3e879 100644 --- a/ts/screens/wallet/WalletHomeScreen.tsx +++ b/ts/screens/wallet/WalletHomeScreen.tsx @@ -54,7 +54,6 @@ import { IOStackNavigationRouteProps } from "../../navigation/params/AppParamsLi import { MainTabParamsList } from "../../navigation/params/MainTabParamsList"; import { navigateBack, - navigateToPaymentScanQrCode, navigateToTransactionDetailsScreen, navigateToWalletAddPaymentMethod } from "../../store/actions/navigation"; @@ -421,13 +420,9 @@ class WalletHomeScreen extends React.PureComponent { } private navigateToPaymentScanQrCode = () => { - if (this.props.isDesignSystemEnabled) { - this.props.navigation.navigate(WalletBarcodeRoutes.WALLET_BARCODE_MAIN, { - screen: WalletBarcodeRoutes.WALLET_BARCODE_SCAN - }); - } else { - this.props.navigateToPaymentScanQrCode(); - } + this.props.navigation.navigate(WalletBarcodeRoutes.WALLET_BARCODE_MAIN, { + screen: WalletBarcodeRoutes.WALLET_BARCODE_SCAN + }); }; private footerButton(potWallets: pot.Pot, Error>) { @@ -532,7 +527,6 @@ const mapDispatchToProps = (dispatch: Dispatch) => ({ loadIdPayWalletData: () => dispatch(idPayWalletGet.request()), navigateToWalletAddPaymentMethod: (keyFrom?: string) => navigateToWalletAddPaymentMethod({ inPayment: O.none, keyFrom }), - navigateToPaymentScanQrCode: () => navigateToPaymentScanQrCode(), navigateToTransactionDetailsScreen: (transaction: Transaction) => { navigateToTransactionDetailsScreen({ transaction, diff --git a/ts/utils/internalLink.ts b/ts/utils/internalLink.ts index 3d904fce5a3..8c1f9d2ba88 100644 --- a/ts/utils/internalLink.ts +++ b/ts/utils/internalLink.ts @@ -8,11 +8,9 @@ import { fciEnabled, fimsEnabled, myPortalEnabled, - svEnabled, uaDonationsEnabled } from "../config"; import CGN_ROUTES from "../features/bonus/cgn/navigation/routes"; -import SV_ROUTES from "../features/bonus/siciliaVola/navigation/routes"; import { FCI_ROUTES } from "../features/fci/navigation/routes"; import FIMS_ROUTES from "../features/fims/navigation/routes"; import UADONATION_ROUTES from "../features/uaDonations/navigation/routes"; @@ -66,12 +64,6 @@ const uaDonationsRoutesToNavigationLink: Record = { [UADONATION_ROUTES.WEBVIEW]: "/uadonations-webview" }; -const svRoutesToNavigationLink: Record = { - [SV_ROUTES.VOUCHER_GENERATION.CHECK_STATUS]: - "/services/sv-generation/check-status", - [SV_ROUTES.VOUCHER_LIST.LIST]: "/services/sv-vouchers/list" -}; - const fimsRoutesToNavigationLink: Record = { [FIMS_ROUTES.WEBVIEW]: "/fims/webview" }; @@ -85,7 +77,6 @@ const allowedRoutes = { ...cgnRoutesToNavigationLink, ...legacyRoutesToNavigationLink, ...(myPortalEnabled ? myPortalRoutesToNavigationLink : {}), - ...(svEnabled ? svRoutesToNavigationLink : {}), ...(uaDonationsEnabled ? uaDonationsRoutesToNavigationLink : {}), ...(fimsEnabled ? fimsRoutesToNavigationLink : {}), ...(fciEnabled ? fciRoutesToNavigationLink : {}) diff --git a/yarn.lock b/yarn.lock index 4bbe42459b7..3a737a2cc91 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3051,10 +3051,10 @@ dependencies: "@types/node" ">= 8" -"@pagopa/io-app-design-system@1.20.0": - version "1.20.0" - resolved "https://registry.yarnpkg.com/@pagopa/io-app-design-system/-/io-app-design-system-1.20.0.tgz#d72025055360f7e8640c7a4c540835274108b626" - integrity sha512-sXe43yVbCpNrSivHgNiGis6qB4PGmP9z3ecY8A+s6jM9HowaAzgWdHb66FQwNqrxbGoJr/KbtFiSiNC3AwHAZA== +"@pagopa/io-app-design-system@1.20.1": + version "1.20.1" + resolved "https://registry.yarnpkg.com/@pagopa/io-app-design-system/-/io-app-design-system-1.20.1.tgz#e439ad96e5dc73eeece2172f5141abfbcb30558e" + integrity sha512-ClSiEj5BrJpTMfR95wrhLz9FkFmitbZivPdEj2VRgi3Xusoclv8lb2RBUQetpPsVTK0cEV4uWPlthSJG/iNbiA== dependencies: "@pagopa/ts-commons" "^12.0.0" "@testing-library/jest-native" "^5.4.2"