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(Carta Giovani Nazionale): [#177163732] Introduces EYCA information and discounts bottom sheet #2870

Merged
merged 245 commits into from
Mar 22, 2021
Merged
Show file tree
Hide file tree
Changes from 244 commits
Commits
Show all changes
245 commits
Select commit Hold shift + click to select a range
1c8eb6a
[#176443044] Adds some skaffolding for CGN store, reducer and navigation
CrisTofani Jan 12, 2021
7141006
[#176443044] Minor fixes
CrisTofani Jan 12, 2021
dc9a92c
Update ts/features/bonus/cgn/screens/onboarding/CgnInformationScreen.tsx
CrisTofani Jan 12, 2021
4753823
Update ts/features/bonus/cgn/navigation/routes.ts
CrisTofani Jan 12, 2021
5b94b87
Update ts/features/bonus/cgn/navigation/actions.ts
CrisTofani Jan 13, 2021
a3b17b4
Update ts/features/bonus/cgn/navigation/actions.ts
CrisTofani Jan 14, 2021
13dbd74
Update ts/features/bonus/cgn/navigation/actions.ts
CrisTofani Jan 14, 2021
a7011c6
Update ts/features/bonus/cgn/navigation/actions.ts
CrisTofani Jan 14, 2021
f661e64
Merge branch 'master' into 176443044-store-directories-skeleton-cgn
CrisTofani Jan 14, 2021
e4cdac6
Merge branch 'master' into 176443044-store-directories-skeleton-cgn
fabriziofff Jan 14, 2021
492b356
Merge branch 'master' into 176443044-store-directories-skeleton-cgn
CrisTofani Jan 15, 2021
bc0e2f2
[#176443044] Adds a locale for activate CTA
CrisTofani Jan 15, 2021
d34f7be
[#176443163] New bonuses available visibility and start cgn flow logic
CrisTofani Jan 15, 2021
87cbffb
[#176443163] missing files
CrisTofani Jan 15, 2021
7170f23
[#176443163] Reverts package.json file
CrisTofani Jan 15, 2021
c3da6a8
Merge branch 'master' into 176443163-handle-cgn-bonus-information
CrisTofani Jan 15, 2021
4495850
[#176443163] Adds tests with mocked config file
CrisTofani Jan 18, 2021
6dbe941
Merge branch 'master' into 176443163-handle-cgn-bonus-information
CrisTofani Jan 19, 2021
92a3c0e
[#176443367] WIP on CGN Activation saga
CrisTofani Jan 18, 2021
9346ae9
[#176443367] removes unused action
CrisTofani Jan 18, 2021
b5e3371
[#176443367] fixes wrong renaming
CrisTofani Jan 19, 2021
2a4c768
[#176443367] WIP on base activation handler saga
CrisTofani Jan 20, 2021
5472593
[#176443367] fixes test execution
CrisTofani Jan 21, 2021
d00ed54
Merge branch 'master' into 176443367-cgn-activation-saga-handler
CrisTofani Jan 21, 2021
590c5ec
Merge branch 'master' into 176443367-cgn-activation-saga-handler
CrisTofani Jan 21, 2021
760af86
[#176443367] Activation saga structure
CrisTofani Jan 21, 2021
f696c42
Merge branch 'master' into 176443367-cgn-activation-saga-handler
CrisTofani Jan 22, 2021
7116f2e
[#176443215] Request activation apis and completed saga
CrisTofani Jan 25, 2021
d3052b3
[#176443215] minor fixes
CrisTofani Jan 25, 2021
8b8ae17
[#176443367] Merge remote-tracking branch 'origin/master'
CrisTofani Jan 25, 2021
65cce81
[#176443367] fixes merge
CrisTofani Jan 25, 2021
26e22b5
[#176443367] Reverts bad refactoring of onboarding word
CrisTofani Jan 25, 2021
c84f774
[#176443367] Reverts bad refactoring of onboarding word
CrisTofani Jan 25, 2021
fe80d58
[#176443215] Merge branch '176443367-cgn-activation-saga-handler'
CrisTofani Jan 26, 2021
cf5b341
[#176443215] After merge fixes
CrisTofani Jan 26, 2021
6040d2b
[#176443215] Refactoring activation and orchestration saga
CrisTofani Jan 26, 2021
da387c5
Merge branch 'master' into 176443367-cgn-activation-saga-handler
debiff Jan 28, 2021
10c4e70
[#176443367] Removes unused saga file
CrisTofani Jan 29, 2021
051e34a
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Jan 29, 2021
17c5495
Merge branch 'master' into 176443367-cgn-activation-saga-handler
CrisTofani Jan 29, 2021
6401bcc
Merge branch 'master' into 176443367-cgn-activation-saga-handler
CrisTofani Jan 29, 2021
98e4a19
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Jan 29, 2021
fdecc5e
[#176443215] adds some tests on handleActivationSaga
CrisTofani Jan 29, 2021
50a4cf4
[#176443215] fixes tests
CrisTofani Jan 29, 2021
aafb1c5
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Jan 29, 2021
fcfbc45
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Feb 1, 2021
078aed6
Merge branch 'master' into 176443367-cgn-activation-saga-handler
CrisTofani Feb 1, 2021
ec9c392
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Feb 2, 2021
f033af9
Merge branch 'master' into 176443367-cgn-activation-saga-handler
CrisTofani Feb 2, 2021
8014a88
[#176443367] Fixes reducer comments
CrisTofani Feb 2, 2021
4fd22ed
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Feb 2, 2021
b76d24b
[#176715047] Implements CGN get information saga, action and reducer
CrisTofani Feb 2, 2021
c4e1322
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Feb 3, 2021
b85a857
Merge branch 'master' into 176443367-cgn-activation-saga-handler
CrisTofani Feb 3, 2021
07cf235
Merge branch 'master' into 176443367-cgn-activation-saga-handler
debiff Feb 5, 2021
b507d38
[#176443367] Merge branch 'master' into 176443367-cgn-activation-saga…
debiff Feb 5, 2021
33fb493
[#176443215] Merge branch '176443367-cgn-activation-saga-handler' int…
debiff Feb 5, 2021
ac75d37
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Feb 5, 2021
bc1881b
[#176715047] Merge from origin/176443215-request-cgn-activation
CrisTofani Feb 5, 2021
0ab4df7
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Feb 5, 2021
8046fe3
Merge branch 'master' into 176715047-request-cgn-status
CrisTofani Feb 5, 2021
a8a9e5d
Merge branch 'master' into 176715047-request-cgn-status
CrisTofani Feb 8, 2021
282f0d7
[#176715047] Adds isCgnActive selector on Card Carousel
CrisTofani Feb 8, 2021
7c5edb6
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Feb 8, 2021
d92c6f7
Merge branch 'master' into 176443215-request-cgn-activation
Undermaken Feb 8, 2021
407a33e
[#176443367] Merge branch 'master' of github.com:pagopa/io-app into 1…
Undermaken Feb 8, 2021
939b34f
[#176443215] Merge branch '176443367-cgn-activation-saga-handler' of …
Undermaken Feb 8, 2021
b7bfd00
Update package.json
CrisTofani Feb 8, 2021
1497741
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Feb 8, 2021
6aca29b
Update ts/features/bonus/cgn/store/actions/activation.ts
CrisTofani Feb 8, 2021
ac8cb5a
Update ts/features/bonus/cgn/store/reducers/activation.ts
CrisTofani Feb 8, 2021
0b16a22
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Feb 8, 2021
861e2a2
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Feb 9, 2021
319641f
[#176443215] Adds comments on activations handlers
CrisTofani Feb 9, 2021
a98ce30
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Feb 9, 2021
ffcb365
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Feb 9, 2021
3d34b5a
[#176443215] Introduces the workunit for cgn activation flow
CrisTofani Feb 9, 2021
47e7f84
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Feb 9, 2021
ee5aeba
Merge branch 'master' into 176715047-request-cgn-status
CrisTofani Feb 9, 2021
f9f7043
Merge branch 'master' into 176443215-request-cgn-activation
CrisTofani Feb 9, 2021
b0d8450
[#176715047] fixes package.json
CrisTofani Feb 9, 2021
c5febd9
[#176443215] typo on api url
CrisTofani Feb 9, 2021
b20a89f
[#176443215] add getError to ensure the Error type
Undermaken Feb 9, 2021
c698518
[#176443215] Adds mixpanel track in case of error
CrisTofani Feb 9, 2021
a45d868
[#176443215] Merge from master
CrisTofani Feb 10, 2021
869805a
[#176715047] Merge from 176443215-request-cgn-activation
CrisTofani Feb 10, 2021
73264b5
Merge branch 'master' into 176715047-request-cgn-status
CrisTofani Feb 11, 2021
c63b40a
[#176443215] Merge branch 'master' of github.com:pagopa/io-app into 1…
Undermaken Feb 11, 2021
0d06f61
[#176715047] Merge branch '176443215-request-cgn-activation' of githu…
Undermaken Feb 11, 2021
075303c
[#176870737] New CGN Activation status polling api
CrisTofani Feb 11, 2021
fff3a92
[#176870737] Changes state type definition and used client
CrisTofani Feb 11, 2021
5c77855
[#176715047] Removes check on CGN detail type
CrisTofani Feb 11, 2021
55c4b8c
[#176715047] isCgnActive selector to return true if detail is some
CrisTofani Feb 11, 2021
0c924fd
Merge branch 'master' into 176870737-activation-status-polling-api
CrisTofani Feb 11, 2021
b5948d0
Merge branch 'master' into 176715047-request-cgn-status
CrisTofani Feb 11, 2021
344849a
[#176715047] Fixes bonus loading state
CrisTofani Feb 11, 2021
c209428
[#176715047] Adds NetworkError on cgn saga and action
CrisTofani Feb 11, 2021
402ec93
[#176715047] fixes
CrisTofani Feb 11, 2021
a9ed676
[#176715047] type fixing
CrisTofani Feb 11, 2021
4f50a28
Merge branch 'master' into 176715047-request-cgn-status
CrisTofani Feb 12, 2021
51c43f3
Merge branch 'master' into 176715047-request-cgn-status
CrisTofani Feb 12, 2021
666c352
Merge branch 'master' into 176715047-request-cgn-status
CrisTofani Feb 12, 2021
3bbf97b
Merge branch 'master' into 176715047-request-cgn-status
CrisTofani Feb 15, 2021
60dc2fe
Merge branch 'master' into 176715047-request-cgn-status
CrisTofani Feb 16, 2021
c1acd44
Merge branch 'master' into 176715047-request-cgn-status
CrisTofani Feb 16, 2021
8c9c0cf
[#176715047] Fixes CGN Specs fron backend
CrisTofani Feb 16, 2021
f43e272
[#176870737] Merge from 176715047-request-cgn-status
CrisTofani Feb 16, 2021
7143020
Merge branch 'master' into 176870737-activation-status-polling-api
CrisTofani Feb 16, 2021
1778137
Merge branch 'master' into 176870737-activation-status-polling-api
CrisTofani Feb 18, 2021
eecc1ba
Merge branch 'master' into 176870737-activation-status-polling-api
CrisTofani Feb 18, 2021
b6e3fd4
Merge branch 'master' into 176870737-activation-status-polling-api
CrisTofani Feb 19, 2021
82d467b
Merge branch 'master' into 176870737-activation-status-polling-api
CrisTofani Feb 23, 2021
6814ef4
Merge branch 'master' into 176870737-activation-status-polling-api
CrisTofani Feb 24, 2021
7d387c7
[#176870737] Fixes reducer after merge
CrisTofani Feb 24, 2021
399be41
Merge branch 'master' into 176870737-activation-status-polling-api
CrisTofani Feb 24, 2021
8f77fb1
[#177063526] WIP on Cgn Eyca Store scaffold
CrisTofani Feb 24, 2021
91c3034
Merge branch 'master' into 176870737-activation-status-polling-api
fabriziofff Feb 25, 2021
9d53eb1
Merge branch 'master' into 176870737-activation-status-polling-api
CrisTofani Feb 26, 2021
027c021
Merge branch 'master' into 177063526-action-reducer-eyca-activation
CrisTofani Feb 26, 2021
09e76b4
Update ts/features/bonus/cgn/saga/networking/activation/getBonusActiv…
CrisTofani Mar 1, 2021
1412f99
[#176870737] Merge from master
CrisTofani Mar 1, 2021
b8067e3
[#177063526] merge from 176870737-activation-status-polling-api
CrisTofani Mar 1, 2021
22a239e
[#177062520] Implements API clients and get details saga
CrisTofani Mar 1, 2021
288e569
[#177062520] Comments new saga
CrisTofani Mar 1, 2021
caded58
[#177062520] Activation EYCA Saga and link to CGN Detail screen
CrisTofani Mar 1, 2021
1be7db2
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 2, 2021
88395cc
Merge branch 'master' into 177063526-action-reducer-eyca-activation
CrisTofani Mar 2, 2021
d0b6eae
[#177063605] Eyca details component
CrisTofani Mar 2, 2021
a92c6ed
[#177063605] Completed Eyca Status details
CrisTofani Mar 4, 2021
52c99f5
[#177063605] Completed Eyca details and status component
CrisTofani Mar 4, 2021
5a997a1
Merge branch 'master' into 177063605-eyca-status-component
CrisTofani Mar 4, 2021
5127905
[#177063605] Adds eyca web url
CrisTofani Mar 4, 2021
a5cd93f
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 4, 2021
ff9b60e
Merge branch 'master' into 177063526-action-reducer-eyca-activation
CrisTofani Mar 4, 2021
c59721a
[#177163732] Implements EYCA informations bottom sheet
CrisTofani Mar 4, 2021
2760d35
[#177163732] Adds the press with gesture handler for buttons in a bs
CrisTofani Mar 4, 2021
9d02932
Merge branch 'master' into 177063526-action-reducer-eyca-activation
CrisTofani Mar 4, 2021
ac8aec1
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 4, 2021
7ae3604
Merge branch 'master' into 177063605-eyca-status-component
CrisTofani Mar 4, 2021
4d3b046
Merge branch 'master' into 177163732-eyca-info-bottom-sheet
CrisTofani Mar 4, 2021
eac7f70
Merge branch 'master' into 177063605-eyca-status-component
CrisTofani Mar 5, 2021
81e0943
Fixes typo
CrisTofani Mar 5, 2021
8fde98e
Update index.ts
CrisTofani Mar 5, 2021
d7ccd24
Merge branch 'master' into 177163732-eyca-info-bottom-sheet
CrisTofani Mar 5, 2021
7610fc3
[#176870737] Merge branch 'master' of github.com:pagopa/io-app into 1…
Undermaken Mar 5, 2021
3905496
[#177063526] Merge branch '176870737-activation-status-polling-api' o…
Undermaken Mar 5, 2021
ae23c7b
[#177226606] wip
Undermaken Mar 5, 2021
6ef3c96
[#177226606] wip
Undermaken Mar 8, 2021
8b32e3e
[#177226606] refactoring
Undermaken Mar 8, 2021
eb88c33
[#177226606] edit comments
Undermaken Mar 8, 2021
7da69dc
Merge branch 'master' into 177226606-local-services-as-webview
Undermaken Mar 8, 2021
edd29d8
[#177226606] update comments
Undermaken Mar 8, 2021
8c9cd96
Merge branch 'master' into 177226606-local-services-as-webview
Undermaken Mar 8, 2021
b1f994a
[#177226606] update
Undermaken Mar 8, 2021
9f494d9
[#177226606] url as config param
Undermaken Mar 8, 2021
c7b3b99
Update ts/features/bonus/cgn/store/actions/eyca/activation.ts
CrisTofani Mar 8, 2021
51d2af1
Merge branch 'master' into 177063526-action-reducer-eyca-activation
CrisTofani Mar 8, 2021
ed8d089
[#177063526] Adds comment
CrisTofani Mar 8, 2021
cd6862d
[#177226606] handling webview error
Undermaken Mar 9, 2021
118e1e7
Merge branch 'master' into 177063605-eyca-status-component
CrisTofani Mar 9, 2021
e50838e
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 9, 2021
e911935
Merge branch 'master' into 177063526-action-reducer-eyca-activation
CrisTofani Mar 9, 2021
8f62407
[#176870737] Merge branch 'master' of github.com:pagopa/io-app into 1…
Undermaken Mar 9, 2021
dd24e78
[#177063526] Merge branch '176870737-activation-status-polling-api' o…
Undermaken Mar 9, 2021
ed264bb
[#177063526] Merge branch '177226606-local-services-as-webview' of gi…
Undermaken Mar 9, 2021
bd18507
[#177063526] Fixes on selector
CrisTofani Mar 9, 2021
48255ae
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 9, 2021
9a3b0b9
Merge branch 'master' into 177063605-eyca-status-component
CrisTofani Mar 9, 2021
02305ac
Merge branch 'master' into 177163732-eyca-info-bottom-sheet
CrisTofani Mar 9, 2021
9c5bc6d
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 10, 2021
5ee2aaf
Merge branch 'master' into 177163732-eyca-info-bottom-sheet
CrisTofani Mar 10, 2021
6450af5
Merge branch 'master' into 177063605-eyca-status-component
CrisTofani Mar 10, 2021
3220a26
[#177063605] Fixes on activation action file
CrisTofani Mar 10, 2021
1717bd9
Merge branch 'master' into 177163732-eyca-info-bottom-sheet
CrisTofani Mar 10, 2021
aacd4d0
Merge branch 'master' into 177163732-eyca-info-bottom-sheet
CrisTofani Mar 10, 2021
3dc0962
Merge branch 'master' into 177063605-eyca-status-component
CrisTofani Mar 10, 2021
4958209
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 10, 2021
f399b90
Merge branch 'master' into 177063605-eyca-status-component
CrisTofani Mar 11, 2021
2feefa5
Merge branch 'master' into 177163732-eyca-info-bottom-sheet
CrisTofani Mar 11, 2021
b444c01
Merge branch 'master' into 177163732-eyca-info-bottom-sheet
CrisTofani Mar 12, 2021
5a82a3d
Merge branch 'master' into 177063605-eyca-status-component
CrisTofani Mar 12, 2021
362896b
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 12, 2021
728e445
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 12, 2021
319f15f
[#177063526] Merge branch '177063526-action-reducer-eyca-activation' …
Undermaken Mar 15, 2021
c62788f
[#177063526] Merge branch 'master' of github.com:pagopa/io-app into 1…
Undermaken Mar 15, 2021
0454cf7
[#177062520] Merge branch '177063526-action-reducer-eyca-activation' …
Undermaken Mar 15, 2021
5724491
[#177062520] update
Undermaken Mar 15, 2021
1355c33
[#177062520] fix merge
Undermaken Mar 15, 2021
1cb2675
[#177062520] wip
Undermaken Mar 15, 2021
f37fef7
[#177062520] wip
Undermaken Mar 16, 2021
02a28cd
[#177062520] fix
Undermaken Mar 16, 2021
7854976
[#177062520] test
Undermaken Mar 16, 2021
c7146e3
[#177062520] improve
Undermaken Mar 16, 2021
d75640f
[#177062520] wip
Undermaken Mar 16, 2021
74b3390
[#177062520] revert
Undermaken Mar 16, 2021
e23cf96
[#177062520] add tests
Undermaken Mar 16, 2021
2886316
[#177062520] restore
Undermaken Mar 16, 2021
ce3fbc6
[#177062520] update
Undermaken Mar 16, 2021
0af6b95
[#177062520] add comments
Undermaken Mar 16, 2021
acb882e
[#177062520] comment
Undermaken Mar 16, 2021
954276b
Merge branch 'master' into 177062520-get-eyca-status-api
Undermaken Mar 16, 2021
53b8824
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 17, 2021
d45673c
[#177063605] Merge from 177062520-get-eyca-status-api
CrisTofani Mar 17, 2021
6172812
[#177063605] Wip after merge
CrisTofani Mar 17, 2021
aced240
[#177063526] Merge branch 'master' of github.com:pagopa/io-app into 1…
Undermaken Mar 17, 2021
a1a0621
[#177062520] Merge branch '177063526-action-reducer-eyca-activation' …
Undermaken Mar 17, 2021
3dfa573
[#177062520] Merge branch 'master' of github.com:pagopa/io-app into 1…
Undermaken Mar 17, 2021
f6f2f50
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 18, 2021
0cc297a
[#177063605] Refinement on EYCA component
CrisTofani Mar 18, 2021
14d6687
Merge branch 'master' into 177063605-eyca-status-component
CrisTofani Mar 18, 2021
8682447
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 18, 2021
5d2c190
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 18, 2021
cf78fa9
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 18, 2021
f72631a
[#177063605] Fixes EYCA status component not showing when eligible
CrisTofani Mar 18, 2021
21c0f6e
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 18, 2021
2c3fceb
Merge branch 'master' into 177063605-eyca-status-component
CrisTofani Mar 18, 2021
493866e
Fixes after merge
CrisTofani Mar 18, 2021
9998695
Merge branch 'master' into 177062520-get-eyca-status-api
CrisTofani Mar 18, 2021
a9f7218
[#177163732] Merge from 177063605-eyca-status-component
CrisTofani Mar 18, 2021
957f749
Fixes error component declaration
CrisTofani Mar 18, 2021
5579364
[#177063605] MErge from master
CrisTofani Mar 18, 2021
c3c802b
[#177163732] MErge from master
CrisTofani Mar 18, 2021
1c9ab12
Merge branch 'master' into 177163732-eyca-info-bottom-sheet
CrisTofani Mar 18, 2021
bb65f54
Merge branch 'master' into 177063605-eyca-status-component
CrisTofani Mar 18, 2021
eeaffc2
[#177063605] Merge from master branch
CrisTofani Mar 19, 2021
861a9be
[#177063605] Fixes
CrisTofani Mar 19, 2021
091e7b3
[#177062520] Merge branch 'master' of github.com:pagopa/io-app into 1…
Undermaken Mar 19, 2021
9e40d1d
[#177163732] Merge from master
CrisTofani Mar 19, 2021
b89eec4
[#177063605] Merge branch '177062520-get-eyca-status-api' of github.c…
Undermaken Mar 19, 2021
eac9034
[#177063605] Merge from master
CrisTofani Mar 19, 2021
965f04e
[#177063605] Merge
CrisTofani Mar 19, 2021
059777b
[#177063605] Edits from review
CrisTofani Mar 19, 2021
cb52dd7
Merge branch 'master' into 177063605-eyca-status-component
CrisTofani Mar 19, 2021
4994006
[#177063605] Fixes to activation status saga
CrisTofani Mar 19, 2021
a80c3dc
Merge branch 'master' into 177063605-eyca-status-component
CrisTofani Mar 19, 2021
136060a
Update ts/features/bonus/cgn/components/detail/eyca/EycaPendingCompon…
Undermaken Mar 19, 2021
e775f40
Update ts/features/bonus/cgn/components/detail/eyca/EycaStatusDetails…
Undermaken Mar 19, 2021
036c20f
Update ts/features/bonus/cgn/saga/networking/eyca/activation/getEycaA…
Undermaken Mar 19, 2021
4f73d1d
Update ts/features/bonus/cgn/store/reducers/eyca/details.ts
Undermaken Mar 19, 2021
e8dc66e
[#177063605] Merge branch 'master' of github.com:pagopa/io-app into 1…
Undermaken Mar 22, 2021
0333d95
[#177163732] Merge branch '177063605-eyca-status-component' of github…
Undermaken Mar 22, 2021
816dfa3
[#177163732] fix merge loses
Undermaken Mar 22, 2021
30cfe1d
[#177163732] fix merge loses
Undermaken Mar 22, 2021
82a053d
[#177163732] show button only when MD is loaded
Undermaken Mar 22, 2021
86ed765
[#177163732] Minor fix on spacing
CrisTofani Mar 22, 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
3 changes: 3 additions & 0 deletions locales/en/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2264,6 +2264,7 @@ bonus:
eyca:
copy: Copy EYCA's card number
pending: Find out more on EYCA
bottomSheet: Check EYCA discounts
tos:
link: Information on the processing of personal data
information:
Expand All @@ -2278,6 +2279,8 @@ bonus:
eycaCircuit: EYCA circuit
eycaPending: "We're linking your Carta Giovani Nazionale to a EYCA Number."
eycaError: "We had some issues with EYCA's systems."
eycaBottomSheetTitle: "EYCA card number"
eycaDescription: "Until the Until you turn 31, **your National Youth Card is a member of the EYCA circuit** (European Youth Card Association).\n\nBy entering your EYCA card number on e-commerce or showing your card at participating merchants, you will be able to get discounts and benefits on cultural activities, shopping, transportation, dining and lodging in the 38 European countries participating in the circuit."
eycaNumber: Card number
badge:
active: Active
Expand Down
3 changes: 3 additions & 0 deletions locales/it/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2294,6 +2294,7 @@ bonus:
eyca:
copy: Copia numero carta EYCA
pending: Scopri di più su EYCA
bottomSheet: Vedi gli sconti EYCA
tos:
link: Informativa sul trattamento dei dati personali
information:
Expand All @@ -2309,6 +2310,8 @@ bonus:
eycaNumber: Numero carta
eycaPending: "Stiamo associando la tua Carta Giovani Nazionale a un Numero EYCA."
eycaError: "Abbiamo riscontrato problemi con i sistemi EYCA."
eycaBottomSheetTitle: "Numero di carta EYCA"
eycaDescription: "Fino al compimento dei 31 anni, **la tua Carta Giovani Nazionale aderisce al circuito EYCA** (European Youth Card Association).\n\nInserendo il numero di carta EYCA sugli e-commerce o mostrando la carta presso gli esercenti aderenti, potrai ottenere sconti e agevolazioni su attività culturali, negozi, trasporti, ristorazione e alloggio anche nei 38 paesi europei aderenti al circuito."
badge:
active: Attiva
revoked: Annullata
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,40 +22,50 @@ import { CardPending } from "../../../../../../../definitions/cgn/CardPending";
import EycaStatusDetailsComponent from "./EycaStatusDetailsComponent";
import EycaPendingComponent from "./EycaPendingComponent";
import EycaErrorComponent from "./EycaErrorComponent";
import { useEycaInformationBottomSheet } from "./EycaInformationComponent";

type Props = ReturnType<typeof mapStateToProps> &
ReturnType<typeof mapDispatchToProps>;

// This component is used to handle the rendering conditions of the three possible EYCA states for the user
// ERROR => EycaErrorComponent
// FOUND and PENDING => First we check the BE orchestrator status than shows EycaPendingComponent if card is pending and
// orchestrator is not in an error state, unless we will show EycaErrorComponent
// FOUND and detailed => EycaStatusDetailsComponent
const EycaDetailComponent = (props: Props) => {
const { present } = useEycaInformationBottomSheet();

const openEycaBottomSheet = async () => {
await present();
};

useEffect(() => {
if (CardPending.is(props.eyca)) {
props.getEycaActivationStatus();
}
}, [props.eyca]);

const errorComponent = (
<EycaErrorComponent onRetry={props.requestEycaActivation} />
<EycaErrorComponent
onRetry={props.requestEycaActivation}
openBottomSheet={openEycaBottomSheet}
/>
);

const renderComponentEycaStatus = (eyca: EycaCard): React.ReactNode => {
switch (eyca.status) {
case "ACTIVATED":
case "REVOKED":
case "EXPIRED":
return <EycaStatusDetailsComponent eycaCard={eyca} />;
return (
<EycaStatusDetailsComponent
eycaCard={eyca}
openBottomSheet={openEycaBottomSheet}
/>
);
case "PENDING":
return fromNullable(props.eycaActivationStatus).fold(
errorComponent,
as =>
as === "ERROR" || as === "NOT_FOUND" ? (
errorComponent
) : (
<EycaPendingComponent />
<EycaPendingComponent openBottomSheet={openEycaBottomSheet} />
)
);
default:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { InfoBox } from "../../../../../../components/box/InfoBox";

type Props = {
onRetry: () => void;
openBottomSheet: () => void;
};

const styles = StyleSheet.create({
Expand All @@ -31,7 +32,12 @@ const EycaErrorComponent = (props: Props) => (
<>
<View style={[styles.rowBlock, styles.spaced]}>
<H4>{I18n.t("bonus.cgn.detail.status.eycaCircuit")}</H4>
<IconFont name={"io-info"} size={TITLE_ICON_SIZE} color={IOColors.blue} />
<IconFont
name={"io-info"}
size={TITLE_ICON_SIZE}
color={IOColors.blue}
onPress={props.openBottomSheet}
/>
</View>
<View spacer />
<InfoBox iconName={"io-error"} alignedCentral iconSize={INFOBOX_ICON_SIZE}>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import * as React from "react";
import { View } from "native-base";
import Markdown from "../../../../../../components/ui/Markdown";
import I18n from "../../../../../../i18n";
import { useIOBottomSheet } from "../../../../../../utils/bottomSheet";
import { openWebUrl } from "../../../../../../utils/url";
import ButtonDefaultOpacity from "../../../../../../components/ButtonDefaultOpacity";
import { Label } from "../../../../../../components/core/typography/Label";

const EYCA_DISCOUNTS_URL = "https://www.eyca.org/discounts/it";

/**
* this component shows information about EYCA card. It is included within a bottom sheet
* @constructor
*/
const EycaInformationComponent: React.FunctionComponent = () => {
const [isMarkdownloaded, setMarkdownloaded] = React.useState(false);
return (
<View>
<View spacer />
<View style={{ flex: 1 }}>
<Markdown avoidTextSelection onLoadEnd={() => setMarkdownloaded(true)}>
{I18n.t("bonus.cgn.detail.status.eycaDescription")}
</Markdown>
<View spacer large />
{isMarkdownloaded && (
<ButtonDefaultOpacity
style={{ width: "100%" }}
bordered
onPress={() => openWebUrl(EYCA_DISCOUNTS_URL)}
onPressWithGestureHandler
>
<Label color={"blue"}>
{I18n.t("bonus.cgn.detail.cta.eyca.bottomSheet")}
</Label>
</ButtonDefaultOpacity>
)}
</View>
</View>
);
};

export const useEycaInformationBottomSheet = () =>
useIOBottomSheet(
<EycaInformationComponent />,
I18n.t("bonus.cgn.detail.status.eycaBottomSheetTitle"),
420
);
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ import { Label } from "../../../../../../components/core/typography/Label";
import { InfoBox } from "../../../../../../components/box/InfoBox";
import { openWebUrl } from "../../../../../../utils/url";

type Props = {
openBottomSheet: () => void;
};

const styles = StyleSheet.create({
rowBlock: {
flexDirection: "row"
Expand All @@ -23,11 +27,16 @@ const ICON_SIZE = 24;
const EYCA_URL = "https://www.eyca.org";

// Component that informs the user that the EYCA card requested is still in progress
const EycaStatusDetailsComponent = () => (
const EycaStatusDetailsComponent = (props: Props) => (
<>
<View style={[styles.rowBlock, styles.spaced]}>
<H4>{I18n.t("bonus.cgn.detail.status.eycaCircuit")}</H4>
<IconFont name={"io-info"} size={ICON_SIZE} color={IOColors.blue} />
<IconFont
name={"io-info"}
size={ICON_SIZE}
color={IOColors.blue}
onPress={props.openBottomSheet}
/>
</View>
<View spacer />
<InfoBox iconName={"io-info"} alignedCentral iconSize={32}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { clipboardSetStringWithFeedback } from "../../../../../../utils/clipboar

type Props = {
eycaCard: EycaCardActivated | EycaCardExpired | EycaCardRevoked;
openBottomSheet: () => void;
};

const styles = StyleSheet.create({
Expand Down Expand Up @@ -94,7 +95,12 @@ const EycaStatusDetailsComponent = (props: Props) => {
<View style={styles.rowBlock}>
<H4>{I18n.t("bonus.cgn.detail.status.eyca")}</H4>
<View hspacer small />
<IconFont name={"io-info"} size={ICON_SIZE} color={IOColors.blue} />
<IconFont
name={"io-info"}
size={ICON_SIZE}
color={IOColors.blue}
onPress={props.openBottomSheet}
/>
</View>
{badgeByStatus()}
</View>
Expand Down
39 changes: 20 additions & 19 deletions ts/features/bonus/cgn/screens/CgnDetailScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,12 @@ import {
import CgnCardComponent from "../components/detail/CgnCardComponent";
import { useActionOnFocus } from "../../../../utils/hooks/useOnFocus";
import { cgnDetails } from "../store/actions/details";
import LoadingSpinnerOverlay from "../../../../components/LoadingSpinnerOverlay";
import {
isEycaDetailsLoading,
isEycaEligible
} from "../store/reducers/eyca/details";
import LoadingSpinnerOverlay from "../../../../components/LoadingSpinnerOverlay";


type Props = ReturnType<typeof mapStateToProps> &
ReturnType<typeof mapDispatchToProps>;
Expand Down Expand Up @@ -102,28 +103,28 @@ const CgnDetailScreen = (props: Props): React.ReactElement => {
// ACTIVATED - EXPIRED - REVOKED
<CgnStatusDetail cgnDetail={props.cgnDetails} />
)}
{(props.isEycaLoading || props.isEycaEligible) && (
{(props.isEycaLoading || props.isEycaEligible) && (
<>
<ItemSeparatorComponent noPadded />
<View spacer />
<EycaDetailComponent />
</>
)}
</View>
</ScrollView>
<FooterWithButtons
type={"TwoButtonsInlineHalf"}
leftButton={cancelButtonProps(
props.navigateToMerchants,
I18n.t("bonus.cgn.detail.cta.buyers")
)}
rightButton={confirmButtonProps(
props.navigateToOtp,
I18n.t("bonus.cgn.detail.cta.otp")
)}
/>
</SafeAreaView>
</BaseScreenComponent>
</View>
</ScrollView>
<FooterWithButtons
type={"TwoButtonsInlineHalf"}
leftButton={cancelButtonProps(
props.navigateToMerchants,
I18n.t("bonus.cgn.detail.cta.buyers")
)}
rightButton={confirmButtonProps(
props.navigateToOtp,
I18n.t("bonus.cgn.detail.cta.otp")
)}
/>
</SafeAreaView>
</BaseScreenComponent>
</LoadingSpinnerOverlay>
);
};
Expand All @@ -137,10 +138,10 @@ const mapStateToProps = (state: GlobalState) => ({
});

const mapDispatchToProps = (dispatch: Dispatch) => ({
loadCgnDetails: () => dispatch(cgnDetails.request()),
loadEycaDetails: () => dispatch(cgnEycaStatus.request()),
loadCgnDetails: () => dispatch(cgnDetails.request()),
navigateToMerchants: () => dispatch(navigateToCgnMerchantsList()),
navigateToOtp: () => dispatch(navigateToCgnDetailsOtp())
navigateToOtp: () => dispatch(navigateToCgnDetailsOtp()),
});

export default connect(mapStateToProps, mapDispatchToProps)(CgnDetailScreen);