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.

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

feat(Bonus Pagamenti Digitali): [#176191591] Open ranking details when tap on ranking preview #2652

Merged
merged 69 commits into from
Dec 29, 2020
Merged
Show file tree
Hide file tree
Changes from 53 commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
e5a3d61
[#176191528] add ranking placeholder
fabriziofff Dec 21, 2020
dff5eeb
[#176191528] add supercashback representation
fabriziofff Dec 21, 2020
2fd3b83
[#176191528] update textual summary
fabriziofff Dec 21, 2020
a68ee40
[#176191528] add supercashback messages
fabriziofff Dec 21, 2020
c0469dc
[#176191528] remove console
fabriziofff Dec 22, 2020
4efefba
[#176191528] Merge remote-tracking branch 'origin/master' into 176191…
fabriziofff Dec 22, 2020
dcede5d
Merge branch 'master' into 176191528-supercashback-graphical-componen…
fabriziofff Dec 22, 2020
f391362
[#176191528] refactoring
fabriziofff Dec 22, 2020
f9669f4
[#176191528] Merge remote-tracking branch 'origin/176191528-supercash…
fabriziofff Dec 22, 2020
48d5816
[#176191528] fix test
fabriziofff Dec 22, 2020
ba57d3f
[#176191528] add supercashback test
fabriziofff Dec 22, 2020
38d0a67
Merge branch 'master' into 176191528-supercashback-graphical-componen…
fabriziofff Dec 22, 2020
04cfd56
[#176191528] add missing test
fabriziofff Dec 22, 2020
6d8c704
[#176191528] Merge remote-tracking branch 'origin/176191528-supercash…
fabriziofff Dec 22, 2020
a92c62b
[#176191528] refactoring
fabriziofff Dec 22, 2020
3e8ba81
[#176191528] remove FunctionComponent
fabriziofff Dec 23, 2020
a62cef5
[#176191528] remove functionComponent
fabriziofff Dec 23, 2020
22060c5
[#176191528] Merge remote-tracking branch 'origin/master' into 176191…
fabriziofff Dec 23, 2020
199dbea
[#176272983] Merge branch '176191528-supercashback-graphical-componen…
fabriziofff Dec 23, 2020
bbe6bdc
[#176272983] test
fabriziofff Dec 23, 2020
fb9f886
[#176272983] revert
fabriziofff Dec 23, 2020
8687ae5
[#176272983] add ranking not ready item
fabriziofff Dec 23, 2020
5321403
[#176272983] add condition for ranking
fabriziofff Dec 23, 2020
5ce95b7
[#176272983] add bottomsheet
fabriziofff Dec 23, 2020
cbdf99d
[#176272983] fix test
fabriziofff Dec 23, 2020
46cc1ec
[#176272983] add test
fabriziofff Dec 23, 2020
9dfc3dd
[#176272983] renaming
fabriziofff Dec 23, 2020
952d953
[#176269197] add IbanInformationComponent to BpdClosedPeriod
fabriziofff Dec 23, 2020
c9b41c9
[#176269197] create common isGracePeriod
fabriziofff Dec 23, 2020
e23bbc4
[#176269197] add todo
fabriziofff Dec 23, 2020
e90c561
[#176269197] Merge branch '176272983-ranking-not-ready' into 17626919…
fabriziofff Dec 23, 2020
f1b7293
[#176269197] display IbanComponent only with some conditions
fabriziofff Dec 23, 2020
f3034e0
[#176269102] wip
fabriziofff Dec 23, 2020
113a71c
[#176269197] add spacer
fabriziofff Dec 23, 2020
47ed449
[#176269102] Merge branch '176269197-closed-period-change-iban-cta' i…
fabriziofff Dec 23, 2020
680730f
[#176269102] calculate end transfer day
fabriziofff Dec 23, 2020
4121702
[#176269102] add comment
fabriziofff Dec 23, 2020
28c224b
Merge branch 'master' into 176191528-supercashback-graphical-componen…
fabriziofff Dec 28, 2020
1b961af
[#176191528] fixes
fabriziofff Dec 28, 2020
e2b97cc
[#176191528] add test for formatIntegerNumber
fabriziofff Dec 28, 2020
af0f136
Merge branch 'master' into 176191528-supercashback-graphical-componen…
fabriziofff Dec 28, 2020
bacf2cb
Merge branch 'master' into 176191528-supercashback-graphical-componen…
Undermaken Dec 28, 2020
ff9b276
Merge branch 'master' into 176272983-ranking-not-ready
Undermaken Dec 28, 2020
d0ca04e
Merge branch 'master' into 176269197-closed-period-change-iban-cta
Undermaken Dec 28, 2020
993b375
Merge branch 'master' into 176191528-supercashback-graphical-componen…
Undermaken Dec 28, 2020
5783110
[#176191528] Merge branch 'master' into 176191528-supercashback-graph…
fabriziofff Dec 28, 2020
7ca129a
[#176272983] Merge branch '176191528-supercashback-graphical-componen…
fabriziofff Dec 28, 2020
82c858a
[#176269197] Merge branch '176272983-ranking-not-ready' into 17626919…
fabriziofff Dec 28, 2020
602bb1d
[#176269102] Merge branch '176269197-closed-period-change-iban-cta' i…
fabriziofff Dec 28, 2020
259d81a
[#176191591] Merge branch '176269102-add-information-about-the-money-…
fabriziofff Dec 28, 2020
a563a61
[#176191591] open SuperCashbackRankingBottomSheet when tap on SuperCa…
fabriziofff Dec 28, 2020
4c946b0
[#176191591] fix format integer & amount
fabriziofff Dec 28, 2020
461563f
[#176191591] fix typescript
fabriziofff Dec 28, 2020
0f39762
Merge branch 'master' into 176272983-ranking-not-ready
Undermaken Dec 29, 2020
350c583
[#176272983] refactoring
Undermaken Dec 29, 2020
0502437
[#176272983] Merge remote-tracking branch 'origin/master' into 176272…
fabriziofff Dec 29, 2020
5273223
[#176269197] Merge branch '176272983-ranking-not-ready' into 17626919…
fabriziofff Dec 29, 2020
fd0aded
[#176269102] Merge branch '176269197-closed-period-change-iban-cta' i…
fabriziofff Dec 29, 2020
4b5b006
[#176191591] Merge branch '176269102-add-information-about-the-money-…
fabriziofff Dec 29, 2020
df7d5dd
Update locales/it/index.yml
fabriziofff Dec 29, 2020
bdb7ba0
Update locales/en/index.yml
fabriziofff Dec 29, 2020
3c56202
Update locales/en/index.yml
fabriziofff Dec 29, 2020
9df5dae
[#176272983] Merge branch 'master' of github.com:pagopa/io-app into 1…
Undermaken Dec 29, 2020
8df4852
[#176269197] Merge branch '176272983-ranking-not-ready' of github.com…
Undermaken Dec 29, 2020
31e924f
[#176269197] Merge branch 'master' of github.com:pagopa/io-app into 1…
Undermaken Dec 29, 2020
16b18ac
Merge branch 'master' into 176269102-add-information-about-the-money-…
Undermaken Dec 29, 2020
36a367a
[#176269102] Merge branch '176269197-closed-period-change-iban-cta' o…
Undermaken Dec 29, 2020
fd0d0c3
[#176269102] Merge branch 'master' of github.com:pagopa/io-app into 1…
Undermaken Dec 29, 2020
1b2efe6
[#176191591] Merge branch '176269102-add-information-about-the-money-…
Undermaken Dec 29, 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
9 changes: 8 additions & 1 deletion locales/en/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1939,12 +1939,19 @@ bonus:
gracePeriodBody: "This cashback phase ended on {{date}}. We are still waiting for the latest transactions from the banks. Just bear with us: we'll keep you posted here!"
closedPeriodOKBody: "Congratulations {{name}}! \nYou are entitled to € {{amount}} of Cashback"
closedPeriodMaxAmount: "it's the highest refund possible!"
moneyTransfer: "By {{date}} you will receive the transfer on the IBAN you communicated."
fabriziofff marked this conversation as resolved.
Show resolved Hide resolved
inactivePeriodBody: "You will be able to start collecting valid transactions starting from {{date}}"
label:
one: "1 valid transaction"
other: "{{count}} valid transactions"
ranking:
title: "Your position"
notReady:
title: "When will you see the Super Cashback ranking?"
body: "The ranking is based on the **number of transactions** made with the payment methods on which you have Cashback enabled.\n\n
Currently, **all participants are in the same position**. As soon as we'll receive the transactions collected so far, your ranking will be displayed.\n\n
Once published, the ranking will **continue to change** depending on the number of transactions among all participants, until the end of the 6 months."

transaction:
label:
one: "1 transaction"
Expand Down Expand Up @@ -2033,7 +2040,7 @@ bonus:
rankTitle: "Super Cashback ranking"
howItWorks:
title: "How does it work?"
body: "The **{{citizens}} citizens** with the highest number of transactions **receive the Super Cashback, a prize of {{amount}}.**\n\n**The ranking changes every day.** The final one will be displayed on {{endDate}}."
body: "The **{{citizens}} citizens** with the highest number of transactions **receive the Super Cashback, a prize of {{amount}}.**\n\n**The ranking changes every day.** The final one will be displayed on {{endDate}}."
fabriziofff marked this conversation as resolved.
Show resolved Hide resolved
lastUpdate: Updated at {{hour}} on {{date}}
webView:
error:
Expand Down
8 changes: 7 additions & 1 deletion locales/it/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1970,12 +1970,18 @@ bonus:
gracePeriodBody: "Questo periodo del Cashback si è chiuso il {{date}}. Stiamo aspettando di ricevere dalle banche le ultime transazioni. Ancora un po’ di pazienza. Ti avviseremo qui!"
closedPeriodOKBody: "Complimenti {{name}}! \nHai diritto a € {{amount}} di Cashback"
closedPeriodMaxAmount: "è il massimo del rimborso possibile!"
moneyTransfer: "Entro il {{date}} riceverai il bonifico sull’IBAN che ci hai indicato."
inactivePeriodBody: "Potrai iniziare a collezionare transazioni valide a partire dal {{date}}"
label:
one: "1 transazione valida"
other: "{{count}} transazioni valide"
ranking:
title: "La tua posizione"
notReady:
title: "Quando vedrai la classifica Super Cashback?"
body: "La classifica si basa sul **numero di transazioni** eseguite con i metodi di pagamento su cui hai attivato il Cashback.\n\n
In questo momento **tutti i partecipanti sono nella stessa posizione**. Non appena riceveremo le transazioni effettuate i primi giorni di quest’anno, verrà mostrata la tua posizione in classifica.\n\n
Una volta pubblicata, la classifica **continuerà a cambiare** a seconda del numero di transazioni di tutti i partecipanti, fino alla fine dei 6 mesi."
transaction:
label:
one: "1 transazione"
Expand Down Expand Up @@ -2064,7 +2070,7 @@ bonus:
rankTitle: "Classifica Super Cashback"
howItWorks:
title: "Come funziona?"
body: "I **{{citizens}} cittadini** con il più alto numero di transazioni **ricevono il Super Cashback, un premio pari a {{amount}}.**\n\n**La classifica cambia ogni giorno.** Quella definitiva sarà visualizzata il {{endDate}}."
body: "I **{{citizens}} cittadini** con il più alto numero di transazioni **ricevono il Super Cashback, un premio pari a {{amount}}.**\n\n**La classifica cambia ogni giorno.** Quella definitiva sarà visualizzata il {{endDate}}."
fabriziofff marked this conversation as resolved.
Show resolved Hide resolved
lastUpdate: Aggiornato alle {{hour}} del {{date}}
webView:
error:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
import { View } from "native-base";
import * as React from "react";
import { connect } from "react-redux";
import { View } from "native-base";
import { GlobalState } from "../../../../../store/reducers/types";
import { bpdSelectedPeriodSelector } from "../../store/reducers/details/selectedPeriod";
import ItemSeparatorComponent from "../../../../../components/ItemSeparatorComponent";
import { H3 } from "../../../../../components/core/typography/H3";
import I18n from "../../../../../i18n";
import Markdown from "../../../../../components/ui/Markdown";
import { IOColors } from "../../../../../components/core/variables/IOColors";
import ItemSeparatorComponent from "../../../../../components/ItemSeparatorComponent";
import Markdown from "../../../../../components/ui/Markdown";
import I18n from "../../../../../i18n";
import { GlobalState } from "../../../../../store/reducers/types";
import { useIOBottomSheet } from "../../../../../utils/bottomSheet";
import { localeDateFormat } from "../../../../../utils/locale";
import {
formatIntegerNumber,
formatNumberAmount
} from "../../../../../utils/stringBuilder";
import {
BpdPeriodWithInfo,
isBpdRankingReady
} from "../../store/reducers/details/periods";
import { localeDateFormat } from "../../../../../utils/locale";
import { useIOBottomSheet } from "../../../../../utils/bottomSheet";
import { formatNumberWithNoDigits } from "../../../../../utils/stringBuilder";
import { bpdSelectedPeriodSelector } from "../../store/reducers/details/selectedPeriod";
import { FirstPositionItem } from "./FirstPositionItem";
import { LastPositionItem } from "./LastPositionItem";
import UserPositionItem from "./UserPositionItem";
import SuperCashbackHeader from "./SuperCashbackHeader";
import UserPositionItem from "./UserPositionItem";

type Props = ReturnType<typeof mapStateToProps>;

Expand Down Expand Up @@ -95,10 +98,8 @@ const SuperCashbackBottomSheet: React.FunctionComponent<Props> = (
{props.selectedPeriod && (
<Markdown cssStyle={CSS_STYLE}>
{I18n.t("bonus.bpd.details.superCashback.howItWorks.body", {
citizens: props.selectedPeriod.minPosition,
amount: formatNumberWithNoDigits(
props.selectedPeriod.superCashbackAmount
),
citizens: formatIntegerNumber(props.selectedPeriod.minPosition),
amount: formatNumberAmount(props.selectedPeriod.superCashbackAmount),
endDate: calculateEndDate(props.selectedPeriod)
})}
</Markdown>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { GlobalState } from "../../../../../../../store/reducers/types";
import { BpdPeriod } from "../../../../store/actions/periods";
import { BpdPeriodWithInfo } from "../../../../store/reducers/details/periods";
import { bpdSelectedPeriodSelector } from "../../../../store/reducers/details/selectedPeriod";
import SuperCashbackRankingSummary from "./SuperCashbackRankingSummary";
import SuperCashbackRankingSummary from "./ranking/SuperCashbackRankingSummary";
import { TextualSummary } from "./textualSummary/TextualSummary";
import TransactionsGraphicalSummary from "./TransactionsGraphicalSummary";

Expand Down

This file was deleted.

Loading