Skip to content

Commit

Permalink
Merge branch 'master' into IOPID-2296-I-came-from-login
Browse files Browse the repository at this point in the history
  • Loading branch information
shadowsheep1 authored Oct 17, 2024
2 parents a73cc95 + 24a9b41 commit df08620
Show file tree
Hide file tree
Showing 49 changed files with 1,306 additions and 450 deletions.
2 changes: 2 additions & 0 deletions .env.local
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,5 @@ ITW_ISSUANCE_REDIRECT_URI_CIE="iowalletcie://cb"
ITW_BYPASS_IDENTITY_MATCH=YES
# Use the test environment for the IDP hint for both CIE and SPID
ITW_IDP_HINT_TEST=YES
# IPZS Privacy Policy URL
ITW_IPZS_PRIVACY_URL='https://io.italia.it/informativa-ipzs'
2 changes: 2 additions & 0 deletions .env.production
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,5 @@ ITW_ISSUANCE_REDIRECT_URI_CIE="iowalletcie://cb"
ITW_BYPASS_IDENTITY_MATCH=NO
# Use the test environment for the IDP hint for both CIE and SPID
ITW_IDP_HINT_TEST=NO
# IPZS Privacy Policy URL
ITW_IPZS_PRIVACY_URL='https://io.italia.it/informativa-ipzs'
11 changes: 9 additions & 2 deletions locales/en/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3215,6 +3215,11 @@ features:
mdl: Patente di Guida
dc: Carta Europea della Disabilità
ts: Tessera Sanitaria - Tessera europea di assicurazione malattia
ipzsPrivacy:
title: I tuoi Documenti su IO sono al sicuro
warning: Premendo **Continua** dichiari di aver letto e compreso l’**Informativa Privacy**.
button:
label: Continua
wallet:
active: Attivo
inactive: Non attivo
Expand Down Expand Up @@ -3250,11 +3255,11 @@ features:
placeOfBirth: "Luogo di nascita"
expirationDate: "Scadenza"
securityLevel: "Livello di sicurezza"
issuedBy: "Credenziale emessa da"
info: "Ulteriori info su questi dati"
issuedByNew: "Emessa da"
releasedBy: Emissione versione digitale
attachments: "Attachments"
authenticSource: Origine dei dati
mdl:
category: "Licenza {{category}}"
issuedDate: "Valida dal"
Expand Down Expand Up @@ -3287,7 +3292,6 @@ features:
cieId:
title: CieID
subtitle: Usa credenziali e app CieID
privacy: Identificandoti dichiari di aver letto e compreso l’[Informativa Privacy](https://io.italia.it/informativa-ipzs-sperimentazione) di **Istituto Poligrafico e Zecca dello Stato**.
nfc:
title: Attiva l'NFC per continuare
description: Per consentire a IO di leggere la tua CIE, attiva l'NFC dalle Impostazioni del tuo dispositivo.
Expand Down Expand Up @@ -3330,6 +3334,9 @@ features:
about:
title: "Chi è?"
subtitle: "È l'ente riconosciuto dallo Stato a fornirti la versione digitale dei tuoi documenti."
authSource:
title: "Chi è?"
subtitle: "È l'ente che detiene i dati contenuti all'interno del tuo documento."
actions:
primary: Aggiungi al portafoglio
secondary: Annulla
Expand Down
11 changes: 9 additions & 2 deletions locales/it/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3215,6 +3215,11 @@ features:
mdl: Patente di Guida
dc: Carta Europea della Disabilità
ts: Tessera Sanitaria - Tessera europea di assicurazione malattia
ipzsPrivacy:
title: I tuoi Documenti su IO sono al sicuro
warning: Premendo **Continua** dichiari di aver letto e compreso l’**Informativa Privacy**.
button:
label: Continua
wallet:
active: Attivo
inactive: Non attivo
Expand Down Expand Up @@ -3250,11 +3255,11 @@ features:
placeOfBirth: "Luogo di nascita"
expirationDate: "Scadenza"
securityLevel: "Livello di sicurezza"
issuedBy: "Credenziale emessa da"
info: "Ulteriori info su questi dati"
issuedByNew: "Emessa da"
releasedBy: Emissione versione digitale
attachments: "Allegati"
authenticSource: Origine dei dati
mdl:
category: "Licenza {{category}}"
issuedDate: "Valida dal"
Expand Down Expand Up @@ -3287,7 +3292,6 @@ features:
cieId:
title: CieID
subtitle: Usa credenziali e app CieID
privacy: Identificandoti dichiari di aver letto e compreso l’[Informativa Privacy](https://io.italia.it/informativa-ipzs-sperimentazione) di **Istituto Poligrafico e Zecca dello Stato**.
nfc:
title: Attiva l'NFC per continuare
description: Per consentire a IO di leggere la tua CIE, attiva l'NFC dalle Impostazioni del tuo dispositivo.
Expand Down Expand Up @@ -3330,6 +3334,9 @@ features:
about:
title: "Chi è?"
subtitle: "È l'ente riconosciuto dallo Stato a fornirti la versione digitale dei tuoi documenti."
authSource:
title: "Chi è?"
subtitle: "È l'ente che detiene i dati contenuti all'interno del tuo documento."
actions:
primary: Aggiungi al portafoglio
secondary: Annulla
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"@pagopa/io-react-native-integrity": "^0.3.0",
"@pagopa/io-react-native-jwt": "^1.2.0",
"@pagopa/io-react-native-login-utils": "1.0.6",
"@pagopa/io-react-native-wallet": "^0.20.0",
"@pagopa/io-react-native-wallet": "^0.21.0",
"@pagopa/io-react-native-zendesk": "^0.3.29",
"@pagopa/react-native-cie": "^1.3.0",
"@pagopa/ts-commons": "^10.15.0",
Expand Down
5 changes: 5 additions & 0 deletions ts/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -255,3 +255,8 @@ export const itwEaaVerifierBaseUrl = Config.ITW_EAA_VERIFIER_BASE_URL;
export const itwBypassIdentityMatch =
Config.ITW_BYPASS_IDENTITY_MATCH === "YES";
export const itwIdpHintTest = Config.ITW_IDP_HINT_TEST === "YES";
export const itwIpzsPrivacyUrl: string = pipe(
Config.ITW_IPZS_PRIVACY_URL,
t.string.decode,
E.getOrElse(() => "https://io.italia.it/informativa-ipzs")
);
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import * as pot from "@pagopa/ts-commons/lib/pot";
import * as React from "react";
import {
Divider,
ListItemHeader,
ListItemInfo
} from "@pagopa/io-app-design-system";
import * as pot from "@pagopa/ts-commons/lib/pot";
import * as React from "react";
import I18n from "../../../../../i18n";
import { profileSelector } from "../../../../../store/reducers/profile";
import { useIOSelector } from "../../../../../store/hooks";
import { capitalize } from "../../../../../utils/strings";
import { profileSelector } from "../../../../../store/reducers/profile";
import { capitalizeTextName } from "../../../../../utils/strings";

/**
* Renders the CGN ownership block for detail screen, including Owner's Fiscal Code (The current user logged in)
Expand All @@ -23,12 +23,12 @@ const CgnOwnershipInformation = (): React.ReactElement => {
<ListItemHeader label={I18n.t("bonus.cgn.detail.ownership")} />
<ListItemInfo
label="Nome"
value={capitalize(currentProfile.value.name)}
value={capitalizeTextName(currentProfile.value.name)}
/>
<Divider />
<ListItemInfo
label="Cognome"
value={capitalize(currentProfile.value.family_name)}
value={capitalizeTextName(currentProfile.value.family_name)}
/>
<Divider />
<ListItemInfo
Expand Down
8 changes: 4 additions & 4 deletions ts/features/bonus/cgn/screens/CgnDetailScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import { profileSelector } from "../../../../store/reducers/profile";
import { GlobalState } from "../../../../store/reducers/types";
import { formatDateAsShortFormat } from "../../../../utils/dates";
import { useActionOnFocus } from "../../../../utils/hooks/useOnFocus";
import { capitalizeTextName } from "../../../../utils/strings";
import { openWebUrl } from "../../../../utils/url";
import { availableBonusTypesSelectorFromId } from "../../common/store/selectors";
import { ID_CGN_TYPE } from "../../common/utils";
Expand Down Expand Up @@ -65,7 +66,6 @@ import {
import { cgnUnsubscribeSelector } from "../store/reducers/unsubscribe";
import { EYCA_WEBSITE_DISCOUNTS_PAGE_URL } from "../utils/constants";
import { canEycaCardBeShown } from "../utils/eyca";
import { capitalize } from "../../../../utils/strings";

type Props = ReturnType<typeof mapStateToProps> &
ReturnType<typeof mapDispatchToProps>;
Expand Down Expand Up @@ -198,9 +198,9 @@ const CgnDetailScreen = (props: Props): React.ReactElement => {
}}
>
{pot.isSome(currentProfile)
? `${capitalize(currentProfile.value.name)} ${capitalize(
currentProfile.value.family_name
)}`
? `${capitalizeTextName(
currentProfile.value.name
)} ${capitalizeTextName(currentProfile.value.family_name)}`
: ""}
</H4>
}
Expand Down
24 changes: 21 additions & 3 deletions ts/features/itwallet/analytics/enum.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@ export enum ITW_SCREENVIEW_EVENTS {
ITW_CREDENTIAL_PREVIEW = "ITW_CREDENTIAL_PREVIEW",
WALLET = "WALLET",
WALLET_ADD_LIST_ITEM = "WALLET_ADD_LIST_ITEM",
ITW_DATA_SHARE = "ITW_DATA_SHARE"
ITW_DATA_SHARE = "ITW_DATA_SHARE",
ITW_CREDENTIAL_DETAIL = "ITW_CREDENTIAL_DETAIL",
ITW_DEFERRED_ISSUING = "ITW_DEFERRED_ISSUING",
"ITW_CREDENTIAL_FAC-SIMILE" = "ITW_CREDENTIAL_FAC-SIMILE"
}

export enum ITW_ACTIONS_EVENTS {
CLOSE_BANNER = "CLOSE_BANNER",
TAP_BANNER = "TAP_BANNER",
ITW_TOS = "ITW_TOS",
ITW_TOS_ACCEPTED = "ITW_TOS_ACCEPTED",
ITW_ID_START = "ITW_ID_START",
ITW_ID_METHOD_SELECTED = "ITW_ID_METHOD_SELECTED",
ITW_SPID_IDP_SELECTED = "ITW_SPID_IDP_SELECTED",
Expand All @@ -30,7 +34,18 @@ export enum ITW_ACTIONS_EVENTS {
WALLET_ADD_START = "WALLET_ADD_START",
ITW_KO_STATE_ACTION_SELECTED = "ITW_KO_STATE_ACTION_SELECTED",
ITW_DATA_SHARE_ACCEPTED = "ITW_DATA_SHARE_ACCEPTED",
WALLET_ADD = "WALLET_ADD"
WALLET_ADD = "WALLET_ADD",
ITW_CREDENTIAL_DELETE = "ITW_CREDENTIAL_DELETE",
WALLET_CATEGORY_FILTER = "WALLET_CATEGORY_FILTER",
ITW_CREDENTIAL_SHOW_BACK = "ITW_CREDENTIAL_SHOW_BACK",
ITW_CREDENTIAL_SHOW_ISSUER = "ITW_CREDENTIAL_SHOW_ISSUER",
ITW_CREDENTIAL_SHOW_AUTH_SOURCE = "ITW_CREDENTIAL_SHOW_AUTH_SOURCE",
ITW_CREDENTIAL_SUPPORT = "ITW_CREDENTIAL_SUPPORT",
"ITW_CREDENTIAL_SHOW_FAC-SIMILE" = "ITW_CREDENTIAL_SHOW_FAC-SIMILE",
ITW_CREDENTIAL_SHOW_TRUSTMARK = "ITW_CREDENTIAL_SHOW_TRUSTMARK",
ITW_START_DEACTIVATION = "ITW_START_DEACTIVATION",
ITW_NEW_ID_RESET = "ITW_NEW_ID_RESET",
ITW_CREDENTIAL_RENEW_START = "ITW_CREDENTIAL_RENEW_START"
}

export enum ITW_ERRORS_EVENTS {
Expand All @@ -43,9 +58,11 @@ export enum ITW_ERRORS_EVENTS {
ITW_CIE_CARD_READING_FAILURE = "ITW_CIE_CARD_READING_FAILURE",
ITW_ADD_CREDENTIAL_TIMEOUT = "ITW_ADD_CREDENTIAL_TIMEOUT",
ITW_ADD_CREDENTIAL_FAILURE = "ITW_ADD_CREDENTIAL_FAILURE",
ITW_ADD_CREDENTIAL_NOT_ENTITLED_FAILURE = "ITW_ADD_CREDENTIAL_NOT_ENTITLED_FAILURE",
ITW_ID_NOT_MATCH = "ITW_ID_NOT_MATCH",
ITW_ID_REQUEST_TIMEOUT = "ITW_ID_REQUEST_TIMEOUT",
ITW_ID_REQUEST_FAILURE = "ITW_ID_REQUEST_FAILURE",
ITW_ID_REQUEST_UNEXPECTED_FAILURE = "ITW_ID_REQUEST_UNEXPECTED_FAILURE",
ITW_LOGIN_ID_NOT_MATCH = "ITW_LOGIN_ID_NOT_MATCH",
ITW_ALREADY_HAS_CREDENTIAL = "ITW_ALREADY_HAS_CREDENTIAL"
}
Expand All @@ -61,5 +78,6 @@ export enum ITW_TECH_EVENTS {
}

export enum ITW_CONFIRM_EVENTS {
ITW_UX_SUCCESS = "ITW_UX_SUCCESS"
ITW_UX_SUCCESS = "ITW_UX_SUCCESS",
ITW_DEACTIVATED = "ITW_DEACTIVATED"
}
Loading

0 comments on commit df08620

Please sign in to comment.