Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: [IOBP-1095] Replace legacy headers for IDPay screens #6583

Merged
merged 9 commits into from
Jan 14, 2025
Merged

refactor: [IOBP-1095] Replace legacy headers for IDPay screens #6583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cbd2aa6
refactor: update idpay headers
LeleDallas Jan 3, 2025
aa3c517
refactor: update idpay headers
LeleDallas Jan 3, 2025
673a994
test: add missing navigation mock function
LeleDallas Jan 3, 2025
1151418
Merge branch 'master' into IOBP-1095-new-header-for-idpay-screens
LeleDallas Jan 8, 2025
c0c5830
Merge branch 'master' into IOBP-1095-new-header-for-idpay-screens
LeleDallas Jan 9, 2025
821459e
Merge branch 'master' into IOBP-1095-new-header-for-idpay-screens
LeleDallas Jan 10, 2025
4c36bfd
Merge branch 'master' into IOBP-1095-new-header-for-idpay-screens
LeleDallas Jan 13, 2025
0f0aab2
Merge branch 'master' into IOBP-1095-new-header-for-idpay-screens
LeleDallas Jan 13, 2025
c7ec4e3
Merge branch 'master' into IOBP-1095-new-header-for-idpay-screens
Hantex9 Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 32 additions & 27 deletions ts/features/idpay/code/screens/IdPayCodeDisplayScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import * as React from "react";
import { StyleSheet, View } from "react-native";
import { SafeAreaView } from "react-native-safe-area-context";
import LoadingSpinnerOverlay from "../../../../components/LoadingSpinnerOverlay";
import TopScreenComponent from "../../../../components/screens/TopScreenComponent";
import { useHeaderSecondLevel } from "../../../../hooks/useHeaderSecondLevel";
import I18n from "../../../../i18n";
import {
AppParamsList,
Expand Down Expand Up @@ -76,35 +76,40 @@ const IdPayCodeDisplayScreen = () => {
? I18n.t("global.buttons.continue")
: I18n.t("global.buttons.close");

useHeaderSecondLevel({
title: "",
canGoBack: true,
contextualHelp: emptyContextualHelp,
supportRequest: true
});

return (
<>
<LoadingSpinnerOverlay isLoading={isGeneratingCode} loadingOpacity={1}>
<TopScreenComponent contextualHelp={emptyContextualHelp}>
<ContentWrapper>
<H2>{I18n.t("idpay.code.onboarding.header")}</H2>
<VSpacer size={16} />
<Body color="grey-700" weight="Regular">
{I18n.t("idpay.code.onboarding.body1")}
</Body>
<Body color="grey-700" weight="Semibold">
{I18n.t("idpay.code.onboarding.bodyBold")}
</Body>
<Body weight="Semibold" asLink onPress={presentCieBottomSheet}>
{I18n.t("idpay.code.onboarding.bodyCta")}
</Body>
<VSpacer size={24} />
<CodeDisplayComponent code={idPayCode} />
<VSpacer size={24} />
<Banner
color="neutral"
pictogramName="security"
size="big"
viewRef={bannerRef}
title={I18n.t("idpay.code.onboarding.banner.header")}
content={I18n.t("idpay.code.onboarding.banner.body")}
/>
</ContentWrapper>
</TopScreenComponent>
<ContentWrapper>
<H2>{I18n.t("idpay.code.onboarding.header")}</H2>
<VSpacer size={16} />
<Body color="grey-700" weight="Regular">
{I18n.t("idpay.code.onboarding.body1")}
</Body>
<Body color="grey-700" weight="Semibold">
{I18n.t("idpay.code.onboarding.bodyBold")}
</Body>
<Body weight="Semibold" asLink onPress={presentCieBottomSheet}>
{I18n.t("idpay.code.onboarding.bodyCta")}
</Body>
<VSpacer size={24} />
<CodeDisplayComponent code={idPayCode} />
<VSpacer size={24} />
<Banner
color="neutral"
pictogramName="security"
size="big"
viewRef={bannerRef}
title={I18n.t("idpay.code.onboarding.banner.header")}
content={I18n.t("idpay.code.onboarding.banner.body")}
/>
</ContentWrapper>
<SafeAreaView style={IOStyles.horizontalContentPadding}>
<ButtonSolid
accessibilityLabel={buttonLabel}
Expand Down
48 changes: 24 additions & 24 deletions ts/features/idpay/code/screens/IdPayCodeRenewScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
import { useNavigation } from "@react-navigation/native";
import * as React from "react";
import { Alert, View } from "react-native";
import TopScreenComponent from "../../../../components/screens/TopScreenComponent";
import { useHeaderSecondLevel } from "../../../../hooks/useHeaderSecondLevel";
import I18n from "../../../../i18n";
import {
AppParamsList,
Expand Down Expand Up @@ -55,31 +55,31 @@ export const IdPayCodeRenewScreen = () => {
);
};

useHeaderSecondLevel({
title: "",
canGoBack: true,
contextualHelp: emptyContextualHelp,
supportRequest: true
});

return (
<>
<TopScreenComponent
customGoBack={false}
dark={false}
goBack={true}
contextualHelp={emptyContextualHelp}
>
<View style={IOStyles.horizontalContentPadding}>
<H2>{I18n.t("idpay.code.renew.screen.header")}</H2>
<VSpacer size={16} />
<Body>{I18n.t("idpay.code.renew.screen.body")}</Body>
<Body weight="Semibold" asLink onPress={presentCieBottomSheet}>
{I18n.t("idpay.code.renew.screen.link")}
</Body>
<VSpacer size={16} />
<ListItemAction
label={I18n.t("idpay.code.renew.screen.generateCTA")}
onPress={() => customAlert(handleConfirm)}
icon="change"
accessibilityLabel={I18n.t("idpay.code.renew.screen.generateCTA")}
variant="danger"
/>
</View>
</TopScreenComponent>
<View style={IOStyles.horizontalContentPadding}>
<H2>{I18n.t("idpay.code.renew.screen.header")}</H2>
<VSpacer size={16} />
<Body>{I18n.t("idpay.code.renew.screen.body")}</Body>
<Body weight="Semibold" asLink onPress={presentCieBottomSheet}>
{I18n.t("idpay.code.renew.screen.link")}
</Body>
<VSpacer size={16} />
<ListItemAction
label={I18n.t("idpay.code.renew.screen.generateCTA")}
onPress={() => customAlert(handleConfirm)}
icon="change"
accessibilityLabel={I18n.t("idpay.code.renew.screen.generateCTA")}
variant="danger"
/>
</View>
{bottomSheet}
</>
);
Expand Down
3 changes: 2 additions & 1 deletion ts/features/idpay/code/screens/__tests__/IdPayCodeDisplayScreen.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ jest.mock("@react-navigation/native", () => {
addListener: () => jest.fn(),
removeListener: () => jest.fn(),
getParent: () => undefined,
pop: mockPop
pop: mockPop,
setOptions: jest.fn
})
};
});
Expand Down
17 changes: 10 additions & 7 deletions ts/features/idpay/configuration/screens/IbanConfigurationLandingScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import React from "react";
import { SafeAreaView, StyleSheet, View } from "react-native";
import { IOStyles } from "../../../../components/core/variables/IOStyles";
import BaseScreenComponent from "../../../../components/screens/BaseScreenComponent";
import { useHeaderSecondLevel } from "../../../../hooks/useHeaderSecondLevel";
import I18n from "../../../../i18n";
import { emptyContextualHelp } from "../../../../utils/emptyContextualHelp";
import { useIOBottomSheetAutoresizableModal } from "../../../../utils/hooks/bottomSheet";
Expand Down Expand Up @@ -45,12 +45,15 @@ export const IbanConfigurationLanding = () => {
130
);

useHeaderSecondLevel({
title: I18n.t("idpay.configuration.headerTitle"),
goBack: customGoBack,
contextualHelp: emptyContextualHelp,
supportRequest: true
});

return (
<BaseScreenComponent
goBack={customGoBack}
headerTitle={I18n.t("idpay.configuration.headerTitle")}
contextualHelp={emptyContextualHelp}
>
<>
<View
style={[
IOStyles.flex,
Expand Down Expand Up @@ -84,7 +87,7 @@ export const IbanConfigurationLanding = () => {
/>
</SafeAreaView>
{bottomSheet}
</BaseScreenComponent>
</>
);
};

Expand Down
53 changes: 27 additions & 26 deletions ts/features/idpay/configuration/screens/IbanEnrollmentScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import React from "react";
import { SafeAreaView, ScrollView, StyleSheet } from "react-native";
import { IbanDTO } from "../../../../../definitions/idpay/IbanDTO";
import LoadingSpinnerOverlay from "../../../../components/LoadingSpinnerOverlay";
import BaseScreenComponent from "../../../../components/screens/BaseScreenComponent";
import ListItemComponent from "../../../../components/screens/ListItemComponent";
import { useHeaderSecondLevel } from "../../../../hooks/useHeaderSecondLevel";
import I18n from "../../../../i18n";
import customVariables from "../../../../theme/variables";
import { emptyContextualHelp } from "../../../../utils/emptyContextualHelp";
Expand Down Expand Up @@ -155,32 +155,33 @@ export const IbanEnrollmentScreen = () => {
);
});

useHeaderSecondLevel({
title: I18n.t(
isIbanOnly
? "idpay.configuration.iban.title"
: "idpay.configuration.headerTitle"
),
goBack: handleBackPress,
contextualHelp: emptyContextualHelp,
supportRequest: true
});

return (
<BaseScreenComponent
goBack={handleBackPress}
headerTitle={I18n.t(
isIbanOnly
? "idpay.configuration.iban.title"
: "idpay.configuration.headerTitle"
)}
contextualHelp={emptyContextualHelp}
>
<LoadingSpinnerOverlay isLoading={isLoading} loadingOpacity={1}>
<ScrollView style={styles.container}>
<H2>{I18n.t("idpay.configuration.iban.enrollment.header")}</H2>
<VSpacer size={8} />
<Body>{I18n.t("idpay.configuration.iban.enrollment.subTitle")}</Body>
<VSpacer size={24} />
{renderIbanList()}
<VSpacer size={16} />
<FeatureInfo
iconName="profile"
body={I18n.t("idpay.configuration.iban.enrollment.footer")}
/>
</ScrollView>
<SafeAreaView>{renderFooter()}</SafeAreaView>
</LoadingSpinnerOverlay>
</BaseScreenComponent>
<LoadingSpinnerOverlay isLoading={isLoading} loadingOpacity={1}>
<ScrollView style={styles.container}>
<H2>{I18n.t("idpay.configuration.iban.enrollment.header")}</H2>
<VSpacer size={8} />
<Body>{I18n.t("idpay.configuration.iban.enrollment.subTitle")}</Body>
<VSpacer size={24} />
{renderIbanList()}
<VSpacer size={16} />
<FeatureInfo
iconName="profile"
body={I18n.t("idpay.configuration.iban.enrollment.footer")}
/>
</ScrollView>
<SafeAreaView>{renderFooter()}</SafeAreaView>
</LoadingSpinnerOverlay>
);
};

Expand Down
20 changes: 11 additions & 9 deletions ts/features/idpay/configuration/screens/IbanOnboardingScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {
Body,
BodySmall,
FooterActions,
H2,
HSpacer,
Icon,
BodySmall,
VSpacer
} from "@pagopa/io-app-design-system";
import * as O from "fp-ts/lib/Option";
Expand All @@ -14,7 +14,7 @@ import { ScrollView, View } from "react-native";
import { Iban } from "../../../../../definitions/backend/Iban";
import { LabelledItem } from "../../../../components/LabelledItem";
import { IOStyles } from "../../../../components/core/variables/IOStyles";
import BaseScreenComponent from "../../../../components/screens/BaseScreenComponent";
import { useHeaderSecondLevel } from "../../../../hooks/useHeaderSecondLevel";
import I18n from "../../../../i18n";
import { emptyContextualHelp } from "../../../../utils/emptyContextualHelp";
import { isLoadingSelector } from "../../common/machine/selectors";
Expand All @@ -23,7 +23,6 @@ import { IdPayConfigurationMachineContext } from "../machine/provider";
export const IbanOnboardingScreen = () => {
const machine = IdPayConfigurationMachineContext.useActorRef();

const customGoBack = () => machine.send({ type: "back" });
const [iban, setIban] = React.useState<{
text: string;
value: O.Option<string>;
Expand All @@ -35,12 +34,15 @@ export const IbanOnboardingScreen = () => {

const isInputValid = O.isSome(iban.value) && ibanName.length > 0;

useHeaderSecondLevel({
title: I18n.t("idpay.configuration.headerTitle"),
canGoBack: true,
contextualHelp: emptyContextualHelp,
supportRequest: true
});

return (
<BaseScreenComponent
goBack={customGoBack}
headerTitle={I18n.t("idpay.configuration.headerTitle")}
contextualHelp={emptyContextualHelp}
>
<>
<ScrollView style={[IOStyles.flex, IOStyles.horizontalContentPadding]}>
<VSpacer size={16} />
<H2>{I18n.t("idpay.configuration.iban.onboarding.header")}</H2>
Expand Down Expand Up @@ -111,6 +113,6 @@ export const IbanOnboardingScreen = () => {
}
}}
/>
</BaseScreenComponent>
</>
);
};
Loading
Loading