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

fix(Bonus Pagamenti Digitali): [IAC-115] IBAN textinput is in error state even when it's empty #3355

Closed
wants to merge 10 commits into from
Closed

fix(Bonus Pagamenti Digitali): [IAC-115] IBAN textinput is in error state even when it's empty #3355

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
591e131
Upgrade ts-node to 10.2.1
pietro909 Sep 2, 2021
68c39b3
Remove unused dependencies
pietro909 Sep 2, 2021
9086d0f
Fix markdown upgrade issues
pietro909 Sep 2, 2021
c869eec
Revert ts-node upgrade
pietro909 Sep 7, 2021
a5324dc
Rever yarn.lock
pietro909 Sep 8, 2021
acfa4f9
Update yarn.lock
pietro909 Sep 8, 2021
cb4afee
Only remove unused deps
pietro909 Sep 8, 2021
d50b885
Merge branch 'master' into IAI-30-remove-unused-deps
pietro909 Sep 8, 2021
26aeb05
Merge branch 'master' of github.com:pagopa/io-app
Undermaken Sep 8, 2021
2d29c3d
fix
Undermaken Sep 8, 2021
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
120 changes: 118 additions & 2 deletions ts/features/bonus/bpd/screens/iban/insertion/IbanInsertionComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import { View } from "native-base";
import * as React from "react";
import { useState } from "react";
import { Platform, SafeAreaView, ScrollView } from "react-native";
import { fromNullable } from "fp-ts/lib/Option";
import { View } from "native-base";
import * as React from "react";
import { useState } from "react";
import { Platform, SafeAreaView, ScrollView } from "react-native";
import { Iban } from "../../../../../../../definitions/backend/Iban";
import { makeFontStyleObject } from "../../../../../../components/core/fonts";
import { Body } from "../../../../../../components/core/typography/Body";
Expand All @@ -14,6 +17,7 @@ import { LabelledItem } from "../../../../../../components/LabelledItem";
import BaseScreenComponent from "../../../../../../components/screens/BaseScreenComponent";
import I18n from "../../../../../../i18n";
import { FooterTwoButtons } from "../../../../bonusVacanze/components/markdown/FooterTwoButtons";
import { maybeNotNullyString } from "../../../../../../utils/strings";

type OwnProps = {
onBack: () => void;
Expand Down Expand Up @@ -55,7 +59,119 @@ export const IbanInsertionComponent: React.FunctionComponent<Props> = props => {
body2,
ibanDescription
} = loadLocales();
return (
<BaseScreenComponent
goBack={props.onBack}
headerTitle={headerTitle}
contextualHelp={props.contextualHelp}
>
<SafeAreaView style={IOStyles.flex}>
<ScrollView>
<View style={[IOStyles.horizontalContentPadding, IOStyles.flex]}>
<View spacer={true} large={true} />
<H1>{title}</H1>
<View spacer={true} large={true} />
<Body>
{body1}
<H4>{body1Bold}</H4>
</Body>
<View spacer={true} large={true} />
<H5>{ibanDescription}</H5>
<LabelledItem
isValid={maybeNotNullyString(iban).fold(undefined, _ =>
Iban.decode(iban).isRight()
)}
inputProps={{
value: iban,
autoCapitalize: "characters",
maxLength: IbanMaxLength,
onChangeText: text => {
// On Android we cannot modify the input text, or the text is duplicated
setIban(
text
? Platform.select({
android: text,
default: upperCaseAndNoBlanks(text)
})
: undefined
);
},
style: IBANInputStyle
}}
/>
<View spacer={true} large={true} />
<View spacer={true} small={true} />
<Body>{body2}</Body>
</View>
</ScrollView>
<FooterTwoButtons
rightDisabled={!isValidIban}
onRight={() =>
Iban.decode(upperCaseAndNoBlanks(iban as string)).map(
props.onIbanConfirm
)
}
onCancel={props.onContinue}
rightText={I18n.t("global.buttons.continue")}
leftText={props.cancelText}
/>
</SafeAreaView>
</BaseScreenComponent>
);
};
import { Iban } from "../../../../../../../definitions/backend/Iban";
import { makeFontStyleObject } from "../../../../../../components/core/fonts";
import { Body } from "../../../../../../components/core/typography/Body";
import { H1 } from "../../../../../../components/core/typography/H1";
import { H4 } from "../../../../../../components/core/typography/H4";
import { H5 } from "../../../../../../components/core/typography/H5";
import { IOStyles } from "../../../../../../components/core/variables/IOStyles";
import { LabelledItem } from "../../../../../../components/LabelledItem";
import BaseScreenComponent from "../../../../../../components/screens/BaseScreenComponent";
import I18n from "../../../../../../i18n";
import { FooterTwoButtons } from "../../../../bonusVacanze/components/markdown/FooterTwoButtons";
import { maybeNotNullyString } from "../../../../../../utils/strings";

type OwnProps = {
onBack: () => void;
onIbanConfirm: (iban: Iban) => void;
onContinue: () => void;
startIban?: string;
cancelText: string;
};

type Props = OwnProps &
Pick<React.ComponentProps<typeof BaseScreenComponent>, "contextualHelp">;

// https://en.wikipedia.org/wiki/International_Bank_Account_Number
// Italian Iban max length: 27 (sample: IT60X0542811101000000123456)
const IbanMaxLength = 34;

const loadLocales = () => ({
headerTitle: I18n.t("bonus.bpd.title"),
title: I18n.t("bonus.bpd.iban.insertion.title"),
body1: I18n.t("bonus.bpd.iban.insertion.body1"),
body1Bold: I18n.t("bonus.bpd.iban.insertion.body1Bold"),
body2: I18n.t("bonus.bpd.iban.insertion.body2"),
ibanDescription: I18n.t("bonus.bpd.iban.iban")
});

const IBANInputStyle = makeFontStyleObject("Regular", false, "RobotoMono");

const upperCaseAndNoBlanks = (text: string) =>
text.replace(/\s/g, "").toUpperCase();

export const IbanInsertionComponent: React.FunctionComponent<Props> = props => {
const [iban, setIban] = useState<string | undefined>(props.startIban);
const isValidIban = iban && Iban.decode(iban).isRight();
const {
headerTitle,
title,
body1,
body1Bold,
body2,
ibanDescription
} = loadLocales();
return (
<BaseScreenComponent
goBack={props.onBack}
Expand All @@ -75,7 +191,7 @@ export const IbanInsertionComponent: React.FunctionComponent<Props> = props => {
<View spacer={true} large={true} />
<H5>{ibanDescription}</H5>
<LabelledItem
isValid={fromNullable(iban).fold(undefined, _ =>
isValid={maybeNotNullyString(iban).fold(undefined, _ =>
Iban.decode(iban).isRight()
)}
inputProps={{
Expand Down