Skip to content

Commit

Permalink
Merge branch 'master' into IOAPPX-240-replace-footer-buttons-share-da…
Browse files Browse the repository at this point in the history
…ta-screen
  • Loading branch information
dmnplb authored Jan 31, 2024
2 parents 9e5afcd + 8c13379 commit b6f72a4
Show file tree
Hide file tree
Showing 33 changed files with 64 additions and 425 deletions.
2 changes: 0 additions & 2 deletions .env.local
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .env.production
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions locales/en/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions locales/it/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 0 additions & 3 deletions ts/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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) {
Expand All @@ -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 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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<typeof mapDispatchToProps> &
Expand All @@ -37,8 +35,6 @@ const CheckResidenceComponent = (props: Props): React.ReactElement => {
boolean | undefined
>();

const navigation = useNavigation();

const cancelButtonProps = {
primary: false,
bordered: true,
Expand All @@ -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
};
Expand Down
14 changes: 0 additions & 14 deletions ts/features/bonus/siciliaVola/navigation/actions.ts

This file was deleted.

127 changes: 0 additions & 127 deletions ts/features/bonus/siciliaVola/navigation/navigator.tsx

This file was deleted.

28 changes: 0 additions & 28 deletions ts/features/bonus/siciliaVola/navigation/params.ts

This file was deleted.

28 changes: 0 additions & 28 deletions ts/features/bonus/siciliaVola/navigation/routes.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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";

/**
Expand All @@ -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;
}

/**
Expand All @@ -47,13 +38,13 @@ export function* handleSvVoucherGenerationStartActivationSaga(): SagaIterator {
const sagaExecution = () =>
withResetNavigationStack(svVoucherGenerationWorkUnit);

const res: SagaCallReturnType<typeof executeWorkUnit> = yield* call(
const res: SagaCallReturnType<typeof executeWorkUnit> | 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);
}
Expand Down
Loading

0 comments on commit b6f72a4

Please sign in to comment.