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

[#173733388] update copy about household composition #2028

Merged
merged 3 commits into from
Jul 10, 2020
Merged

[#173733388] update copy about household composition #2028

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3b9666
[#173733388] update copy about household composition
fabriziofff Jul 9, 2020
e30072c
Merge branch 'master' into 173733388-update-eligibility-reminder
Undermaken Jul 9, 2020
d60d7b3
Merge branch 'master' into 173733388-update-eligibility-reminder
Undermaken Jul 10, 2020
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
3 changes: 1 addition & 2 deletions locales/en/index.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,8 +1405,7 @@ bonus:
title: Good news!
description: "Your family is entitled to the following Bonus Vacanze:"
reminder:
text: "We remind you that each member of your household can spend the bonus. If the information shown is incorrect, please check with the"
link: "INPS customer service."
text: "Each member of your family helps determine the amount and can spend the bonus. If the data is incorrect or updated, to avoid problems following the use of the Bonus, we invite you to submit a new DSU before proceeding with the request."
discrepancies:
attention: "Warning!"
text: "INPS has reported some omissions or discrepancies in your ISEE. Check that everything is correct before continuing. If you decide to continue, you may be called to provide documentation to prove the completeness and truthfulness of the data indicated in the DSU. Otherwise, you can present a new DSU and check the bonus at a later time."
Expand Down
3 changes: 1 addition & 2 deletions locales/it/index.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1437,8 +1437,7 @@ bonus:
title: Buone notizie!
description: "Il tuo nucleo familiare ha diritto al seguente Bonus Vacanze:"
reminder:
text: "Ti ricordiamo che ciascun componente del tuo nucleo famigliare può spendere il bonus. Se le informazioni riportate non ti risultano corrette, ti preghiamo di verificare con il"
link: "servizio clienti di INPS."
text: "Ciascun componente del tuo nucleo familiare concorre a determinare l'importo e potrà spendere il bonus. Se i dati non sono corretti o aggiornati, per evitare problemi in seguito all'utilizzo del Bonus, ti invitiamo a presentare una nuova DSU prima di procedere con la richiesta."
discrepancies:
attention: "Attenzione!"
text: "INPS ha segnalato alcune omissioni o difformità nel tuo ISEE. Verifica che sia tutto corretto prima di continuare. Se decidi di proseguire, potresti essere chiamato a fornire la documentazione per provare la completezza e la veridicità dei dati indicati nella DSU Altrimenti, puoi presentare una nuova DSU e richiedere il Bonus in un secondo momento."
Expand Down
14 changes: 1 addition & 13 deletions ts/features/bonusVacanze/screens/activation/request/ActivateBonusReminder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ import { Text, View } from "native-base";
import * as React from "react";
import { StyleSheet } from "react-native";
import IconFont from "../../../../../components/ui/IconFont";
import { openLink } from "../../../../../components/ui/Markdown/handlers/link";
import themeVariables from "../../../../../theme/variables";
import { bonusVacanzeStyle } from "../../../components/Styles";
import { activateBonusStyle } from "./Style";

type Props = {
text: string;
link: string;
};

const styles = StyleSheet.create({
Expand All @@ -21,9 +19,6 @@ const styles = StyleSheet.create({
}
});

const inpsCustomerCareLink =
"https://www.inps.it/nuovoportaleinps/default.aspx?imenu=24";

/**
* This component display a box with an icon and some text that remind the user some details about the bonus.
* @param props
Expand All @@ -39,14 +34,7 @@ export const ActivateBonusReminder: React.FunctionComponent<Props> = props => {
/>
<View hspacer={true} />
<Text style={[activateBonusStyle.boxText, styles.reminder]}>
{`${props.text} `}
<Text
style={[activateBonusStyle.boxText, styles.link]}
link={true}
onPress={() => openLink(inpsCustomerCareLink)}
>
{props.link}
</Text>
{props.text}
</Text>
</View>
);
Expand Down
9 changes: 4 additions & 5 deletions ts/features/bonusVacanze/screens/activation/request/ActivateBonusRequestComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,9 @@ export const loadLocales = () => ({
"bonus.bonusVacanze.eligibility.activateBonus.discrepancies.text"
)
},
reminder: {
text: I18n.t("bonus.bonusVacanze.eligibility.activateBonus.reminder.text"),
link: I18n.t("bonus.bonusVacanze.eligibility.activateBonus.reminder.link")
},
reminder: I18n.t(
"bonus.bonusVacanze.eligibility.activateBonus.reminder.text"
),
activateBonusText: I18n.t(
"bonus.bonusVacanze.eligibility.activateBonus.activateCTA"
)
Expand Down Expand Up @@ -123,7 +122,7 @@ export const ActivateBonusRequestComponent: React.FunctionComponent<
</>
)}

<ActivateBonusReminder text={reminder.text} link={reminder.link} />
<ActivateBonusReminder text={reminder} />
<EdgeBorderComponent />
</View>
</ScrollView>
Expand Down