Skip to content

Commit c2b3cf8

Browse files
authored
Merge branch 'master' into IOCOM-2939_sendLPPlayground
2 parents 34ce84a + a853401 commit c2b3cf8

File tree

13 files changed

+86
-35
lines changed

13 files changed

+86
-35
lines changed

locales/it/index.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4902,7 +4902,7 @@
49024902
},
49034903
"modeSelection": {
49044904
"section": {
4905-
"issuance": "Ottieni {{ feature }}",
4905+
"issuance": "Attiva {{ feature }}",
49064906
"reissuance": "Conferma periodica dell'identità"
49074907
},
49084908
"title": {
@@ -5142,7 +5142,8 @@
51425142
"title": "Identità verificata",
51435143
"titleL3": "Ci siamo quasi!",
51445144
"subtitle": "Stai attivando **Documenti su IO** come:",
5145-
"subtitleL3": "Hai verificato la tua identità. \nIl tuo portafoglio IT-Wallet sarà associato a questi dati:",
5145+
"subtitleL3": "Hai confermato la tua identità. \nIl tuo portafoglio IT-Wallet sarà associato a questi dati:",
5146+
"bottomTextL3": "Se hai già aggiunto documenti al Portafoglio, questi saranno aggiornati alle funzionalità IT-Wallet, senza modifiche ai tuoi dati.",
51465147
"actions": {
51475148
"primary": "Continua",
51485149
"secondary": "Annulla"

ts/features/fci/components/DocumentWithSignature.tsx

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ import {
55
HSpacer,
66
IconButton,
77
IOColors,
8+
IOSpacing,
9+
IOSpacingScale,
10+
useFooterActionsMeasurements,
811
useIOTheme,
912
VSpacer
1013
} from "@pagopa/io-app-design-system";
@@ -13,7 +16,7 @@ import { constNull, pipe } from "fp-ts/lib/function";
1316
import * as O from "fp-ts/lib/Option";
1417
import I18n from "i18next";
1518
import { useCallback, useRef, useState } from "react";
16-
import { StyleSheet } from "react-native";
19+
import { StyleSheet, View } from "react-native";
1720
import Pdf, { PdfRef } from "react-native-pdf";
1821
import { SafeAreaView } from "react-native-safe-area-context";
1922
import { ExistingSignatureFieldAttrs } from "../../../../definitions/fci/ExistingSignatureFieldAttrs";
@@ -60,8 +63,13 @@ const DocumentWithSignature = (props: Props) => {
6063
const dispatch = useIODispatch();
6164
const onContinuePress = () => props.onClose();
6265

66+
const extraFooterActionsMargin: IOSpacingScale = 16;
67+
6368
const theme = useIOTheme();
6469

70+
const { footerActionsMeasurements, handleFooterActionsMeasurements } =
71+
useFooterActionsMeasurements();
72+
6573
const continueButtonProps: ButtonBlockProps = {
6674
onPress: onContinuePress,
6775
label: I18n.t("features.fci.documents.footer.backToSignFieldsList")
@@ -225,8 +233,19 @@ const DocumentWithSignature = (props: Props) => {
225233
disabled={false}
226234
testID={"FciDocumentsNavBarTestID"}
227235
/>
228-
<RenderMask />
236+
<View
237+
style={{
238+
flex: 1,
239+
marginBottom:
240+
footerActionsMeasurements.safeBottomAreaHeight -
241+
IOSpacing.screenEndMargin +
242+
extraFooterActionsMargin
243+
}}
244+
>
245+
<RenderMask />
246+
</View>
229247
<FooterActions
248+
onMeasure={handleFooterActionsMeasurements}
230249
actions={{
231250
type: "SingleButton",
232251
primary: continueButtonProps

ts/features/fci/screens/valid/FciDocumentsScreen.tsx

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
import { FooterActionsInline, IOColors } from "@pagopa/io-app-design-system";
1+
import {
2+
FooterActionsInline,
3+
IOColors,
4+
IOSpacing,
5+
useFooterActionsInlineMeasurements
6+
} from "@pagopa/io-app-design-system";
27
import {
38
RouteProp,
49
StackActions,
@@ -69,6 +74,11 @@ const FciDocumentsScreen = () => {
6974
const isFocused = useIsFocused();
7075
const [focusEpoch, setFocusEpoch] = useState(0);
7176

77+
const {
78+
footerActionsInlineMeasurements,
79+
handleFooterActionsInlineMeasurements
80+
} = useFooterActionsInlineMeasurements();
81+
7282
useEffect(() => {
7383
if (documents.length !== 0 && isFocused) {
7484
dispatch(fciDownloadPreview.request({ url: documents[currentDoc].url }));
@@ -272,8 +282,18 @@ const FciDocumentsScreen = () => {
272282
<View style={{ flex: 1 }} testID={"FciDocumentsScreenTestID"}>
273283
{documents.length > 0 && (
274284
<>
275-
{renderPager()}
285+
<View
286+
style={{
287+
flex: 1,
288+
marginBottom:
289+
footerActionsInlineMeasurements.safeBottomAreaHeight -
290+
IOSpacing.screenEndMargin
291+
}}
292+
>
293+
{renderPager()}
294+
</View>
276295
<FooterActionsInline
296+
onMeasure={handleFooterActionsInlineMeasurements}
277297
startAction={cancelButtonProps}
278298
endAction={endActionButtonProps}
279299
/>

ts/features/itwallet/common/store/selectors/remoteConfig.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,16 @@ export const itwIPatenteCtaConfigSelector = createSelector(
117117
O.toUndefined
118118
)
119119
);
120+
121+
/**
122+
* Return the remote config about ipzs privacy url for the IPZS privacy screen.
123+
*/
124+
export const itwIpzsPrivacyUrlSelector = createSelector(
125+
itwRemoteConfigSelector,
126+
itwConfig =>
127+
pipe(
128+
itwConfig,
129+
O.map(itw => itw.ipzs_privacy_url),
130+
O.toUndefined
131+
)
132+
);

ts/features/itwallet/discovery/screens/ItwIpzsPrivacyScreen.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import {
1313
} from "../../machine/eid/selectors";
1414
import ItwPrivacyWebViewComponent from "../components/ItwPrivacyWebViewComponent";
1515
import LoadingScreenContent from "../../../../components/screens/LoadingScreenContent";
16+
import { useIOSelector } from "../../../../store/hooks";
17+
import { itwIpzsPrivacyUrlSelector } from "../../common/store/selectors/remoteConfig";
1618

1719
const ItwIpzsPrivacyScreen = () => {
1820
const [isLoading, setIsLoading] = useState(true);
@@ -24,8 +26,7 @@ const ItwIpzsPrivacyScreen = () => {
2426
isL3FeaturesEnabledSelector
2527
);
2628

27-
// TODO [SIW-2992] add this url to remote config
28-
const privacyUrl = "https://util.wallet.ipzs.it/privacy.html";
29+
const privacyUrl = useIOSelector(itwIpzsPrivacyUrlSelector);
2930

3031
const handleContinuePress = () => {
3132
trackOpenItwTosAccepted(isL3 ? "L3" : "L2");
@@ -89,7 +90,7 @@ const ItwIpzsPrivacyScreen = () => {
8990
</ContentWrapper>
9091
<ItwPrivacyWebViewComponent
9192
source={{
92-
uri: privacyUrl
93+
uri: privacyUrl ?? ""
9394
}}
9495
onLoadEnd={onLoadEnd}
9596
onError={onError}

ts/features/itwallet/discovery/screens/__tests__/__snapshots__/ItwIpzsPrivacyScreen.test.tsx.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ exports[`ItwIpzsPrivacyScreen should match the snapshot (L3 disabled) 1`] = `
598598
messagingModuleName=""
599599
newSource={
600600
{
601-
"uri": "https://util.wallet.ipzs.it/privacy.html",
601+
"uri": "",
602602
}
603603
}
604604
onContentProcessDidTerminate={[Function]}
@@ -612,7 +612,7 @@ exports[`ItwIpzsPrivacyScreen should match the snapshot (L3 disabled) 1`] = `
612612
scrollEnabled={false}
613613
source={
614614
{
615-
"uri": "https://util.wallet.ipzs.it/privacy.html",
615+
"uri": "",
616616
}
617617
}
618618
style={
@@ -1850,7 +1850,7 @@ exports[`ItwIpzsPrivacyScreen should match the snapshot (L3 enabled) 1`] = `
18501850
messagingModuleName=""
18511851
newSource={
18521852
{
1853-
"uri": "https://util.wallet.ipzs.it/privacy.html",
1853+
"uri": "",
18541854
}
18551855
}
18561856
onContentProcessDidTerminate={[Function]}
@@ -1864,7 +1864,7 @@ exports[`ItwIpzsPrivacyScreen should match the snapshot (L3 enabled) 1`] = `
18641864
scrollEnabled={false}
18651865
source={
18661866
{
1867-
"uri": "https://util.wallet.ipzs.it/privacy.html",
1867+
"uri": "",
18681868
}
18691869
}
18701870
style={

ts/features/itwallet/identification/analytics/enum.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ export enum ITW_IDENTIFICATION_SCREENVIEW_EVENTS {
1717

1818
export enum ITW_IDENTIFICATION_ACTIONS_EVENTS {
1919
ITW_SPID_IDP_SELECTED = "ITW_SPID_IDP_SELECTED",
20-
ITW_CIE_PIN_INFO = "ITW_CIE_PIN_INFO",
2120
ITW_CIE_PIN_FORGOTTEN = "ITW_CIE_PIN_FORGOTTEN",
2221
ITW_CIE_PUK_FORGOTTEN = "ITW_CIE_PUK_FORGOTTEN",
2322
ITW_CIE_NFC_GO_TO_SETTINGS = "ITW_CIE_NFC_GO_TO_SETTINGS",

ts/features/itwallet/identification/analytics/index.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,6 @@ export const trackItWalletSpidIDPSelected = (
144144
);
145145
};
146146

147-
export const trackItWalletCiePinInfo = (itw_flow: ItwFlow) => {
148-
void mixpanelTrack(
149-
ITW_IDENTIFICATION_ACTIONS_EVENTS.ITW_CIE_PIN_INFO,
150-
buildEventProperties("UX", "action", { itw_flow })
151-
);
152-
};
153-
154147
export const trackItWalletCiePinForgotten = (itw_flow: ItwFlow) => {
155148
void mixpanelTrack(
156149
ITW_IDENTIFICATION_ACTIONS_EVENTS.ITW_CIE_PIN_FORGOTTEN,

ts/features/itwallet/identification/cie/screens/ItwCiePinScreen.tsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ import { ContextualHelpPropsMarkdown } from "../../../../../utils/contextualHelp
2525
import { usePreventScreenCapture } from "../../../../../utils/hooks/usePreventScreenCapture";
2626
import { withTrailingPoliceCarLightEmojii } from "../../../../../utils/strings";
2727
import { isCieLoginUatEnabledSelector } from "../../../../authentication/login/cie/store/selectors";
28-
import {
29-
trackItWalletCiePinEnter,
30-
trackItWalletCiePinInfo
31-
} from "../../analytics";
28+
import { trackItWalletCiePinEnter } from "../../analytics";
3229
import { ItwEidIssuanceMachineContext } from "../../../machine/eid/provider";
3330
import { isL3FeaturesEnabledSelector } from "../../../machine/eid/selectors";
3431
import { useCieInfoBottomSheet } from "../hooks/useCieInfoBottomSheet";
@@ -116,10 +113,7 @@ export const ItwCiePinScreen = () => {
116113
"features.itWallet.identification.cie.inputPin.buttonLink"
117114
)}
118115
onPress={() => {
119-
trackItWalletCiePinInfo(itw_flow);
120-
pinInfoBottomSheet.present({
121-
skipTracking: true
122-
});
116+
pinInfoBottomSheet.present();
123117
}}
124118
/>
125119
<VSpacer size={24} />

ts/features/itwallet/issuance/screens/ItwIssuanceEidPreviewScreen.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {
2+
BodySmall,
23
ContentWrapper,
34
ForceScrollDownView,
45
H2,
@@ -193,6 +194,11 @@ const ContentView = ({ eid }: ContentViewProps) => {
193194
)}
194195
/>
195196
<ItwCredentialPreviewClaimsList data={eid} releaserVisible={false} />
197+
{isL3 && (
198+
<BodySmall>
199+
{I18n.t("features.itWallet.issuance.eidPreview.bottomTextL3")}
200+
</BodySmall>
201+
)}
196202
</VStack>
197203
</ContentWrapper>
198204
</ForceScrollDownView>

0 commit comments

Comments
 (0)