diff --git a/locales/en/index.yml b/locales/en/index.yml
index 3aa184d6ec6..b29f7dcd351 100644
--- a/locales/en/index.yml
+++ b/locales/en/index.yml
@@ -667,7 +667,7 @@ authentication:
wizards:
cie_id_wizard:
title: Do you have the CieID app?
- description: "If you have the CieID app on your device, enter the code you have set for the CieID app or use your face or fingerprint.\n\nTo enter the IO app without physically using the Electronic Identity Card,you must first enable Level 1 and Level 2 access in the CieID application."
+ description: "If you have the CieID app on your device, enter the code you have set for the CieID app or use your face or fingerprint.\n\nTo enter the IO app without physically using the Electronic Identity Card, you must first enable Level 1 and Level 2 access in the CieID application."
actions:
primary:
label: Yes, log in with CieID
diff --git a/package.json b/package.json
index ea80529caf7..6f22e26e5fc 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
"dependencies": {
"@babel/plugin-transform-regenerator": "^7.18.6",
"@gorhom/bottom-sheet": "^4.1.5",
- "@pagopa/io-app-design-system": "3.1.0",
+ "@pagopa/io-app-design-system": "4.0.1",
"@pagopa/io-pagopa-commons": "^3.1.0",
"@pagopa/io-react-native-cieid": "^0.3.5",
"@pagopa/io-react-native-crypto": "^0.3.0",
diff --git a/ts/components/AppVersion.tsx b/ts/components/AppVersion.tsx
index 12a191500a1..08e433c9d41 100644
--- a/ts/components/AppVersion.tsx
+++ b/ts/components/AppVersion.tsx
@@ -5,7 +5,7 @@ import {
StyleSheet,
View
} from "react-native";
-import { LabelSmall } from "@pagopa/io-app-design-system";
+import { BodySmall } from "@pagopa/io-app-design-system";
import I18n from "../i18n";
import { WithTestID } from "../types/WithTestID";
import { getAppVersion } from "../utils/appVersion";
@@ -33,9 +33,9 @@ const AppVersion = ({ onPress, testID }: AppVersion) => {
accessibilityLabel={appVersionText}
>
-
+
{appVersionText}
-
+
);
diff --git a/ts/components/BonusCard/BonusCard.tsx b/ts/components/BonusCard/BonusCard.tsx
index d9dca3816b6..22f73c3da71 100644
--- a/ts/components/BonusCard/BonusCard.tsx
+++ b/ts/components/BonusCard/BonusCard.tsx
@@ -3,7 +3,7 @@ import {
H2,
HSpacer,
IOColors,
- LabelSmall,
+ BodySmall,
VSpacer
} from "@pagopa/io-app-design-system";
import React from "react";
@@ -72,12 +72,12 @@ const BonusCardContent = (props: BonusCard) => {
{name}
-
{organizationName}
-
+
{status}
diff --git a/ts/components/BonusCard/__tests__/BonusCard.test.tsx b/ts/components/BonusCard/__tests__/BonusCard.test.tsx
index e424c5c7eb6..1b0010f27aa 100644
--- a/ts/components/BonusCard/__tests__/BonusCard.test.tsx
+++ b/ts/components/BonusCard/__tests__/BonusCard.test.tsx
@@ -1,15 +1,15 @@
+import { LabelMini } from "@pagopa/io-app-design-system";
import { render } from "@testing-library/react-native";
import React from "react";
import { Provider } from "react-redux";
import configureMockStore from "redux-mock-store";
-import { Chip } from "@pagopa/io-app-design-system";
+import I18n from "../../../i18n";
import { applicationChangeState } from "../../../store/actions/application";
import { appReducer } from "../../../store/reducers";
import { GlobalState } from "../../../store/reducers/types";
+import { format } from "../../../utils/dates";
import { BonusCard } from "../BonusCard";
import { BonusCardCounter } from "../BonusCardCounter";
-import I18n from "../../../i18n";
-import { format } from "../../../utils/dates";
jest.mock("react-native-safe-area-context", () => {
const useSafeAreaInsets = () => ({ top: 0 });
@@ -60,11 +60,11 @@ describe("Test BonusCard", () => {
name: T_NAME,
organizationName: T_ORG_NAME,
status: (
-
+
{I18n.t("bonusCard.validUntil", {
endDate: format(T_END_DATE, "DD/MM/YY")
})}
-
+
),
counters: [T_COUNTER_WITH_PROGRESS, T_COUNTER]
});
diff --git a/ts/components/IOMarkdown/renderRules.tsx b/ts/components/IOMarkdown/renderRules.tsx
index e41da7dcacc..090db9e1c8a 100644
--- a/ts/components/IOMarkdown/renderRules.tsx
+++ b/ts/components/IOMarkdown/renderRules.tsx
@@ -13,7 +13,6 @@ import {
IOPictogramsBleed,
IOStyles,
IOToast,
- Label,
Nullable,
VSpacer
} from "@pagopa/io-app-design-system";
@@ -160,7 +159,7 @@ export const DEFAULT_RULES: IOMarkdownRenderRules = {
*/
Strong(strong: TxtStrongNode, render: Renderer) {
return (
-
+
{strong.children.map(render)}
);
@@ -186,9 +185,14 @@ export const DEFAULT_RULES: IOMarkdownRenderRules = {
};
return (
-
+
);
},
/**
diff --git a/ts/components/__tests__/__snapshots__/IOMarkdown.test.tsx.snap b/ts/components/__tests__/__snapshots__/IOMarkdown.test.tsx.snap
index 466ed862c8a..09fa05dd049 100644
--- a/ts/components/__tests__/__snapshots__/IOMarkdown.test.tsx.snap
+++ b/ts/components/__tests__/__snapshots__/IOMarkdown.test.tsx.snap
@@ -78,7 +78,7 @@ exports[`IOMarkdown Should match snapshot 1`] = `
@@ -694,6 +694,7 @@ exports[`IOMarkdown Should match snapshot 1`] = `
-
+
{JSON.stringify(truncateObjectStrings(data), null, 2)}
-
+
);
}, [data, expandable, expanded]);
@@ -82,9 +88,9 @@ export const DebugPrettyPrint = withDebugEnabled(
return (
-
+
{title}
-
+
- useTypographyFactory({
- ...props,
- defaultWeight: "Medium",
- defaultColor: "bluegrey",
- font: "DMMono",
- fontStyle: { fontSize: 12, lineHeight: 18 }
- });
-
const styles = StyleSheet.create({
container: {
borderRadius: 4,
diff --git a/ts/components/screens/__tests__/__snapshots__/LoadingScreenContent.test.tsx.snap b/ts/components/screens/__tests__/__snapshots__/LoadingScreenContent.test.tsx.snap
index e9a281adf22..9213e3c353a 100644
--- a/ts/components/screens/__tests__/__snapshots__/LoadingScreenContent.test.tsx.snap
+++ b/ts/components/screens/__tests__/__snapshots__/LoadingScreenContent.test.tsx.snap
@@ -366,7 +366,7 @@ exports[`LoadingScreenContent should match the snapshot with title, a child, hea
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 24,
+ "gap": 24,
}
}
>
@@ -964,7 +964,7 @@ exports[`LoadingScreenContent should match the snapshot with title, a child, hea
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 24,
+ "gap": 24,
}
}
>
@@ -1562,7 +1562,7 @@ exports[`LoadingScreenContent should match the snapshot with title, no children,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 24,
+ "gap": 24,
}
}
>
@@ -2157,7 +2157,7 @@ exports[`LoadingScreenContent should match the snapshot with title, no children,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 24,
+ "gap": 24,
}
}
>
diff --git a/ts/components/screens/__tests__/__snapshots__/OperationResultScreenContent.test.tsx.snap b/ts/components/screens/__tests__/__snapshots__/OperationResultScreenContent.test.tsx.snap
index d1a598a2797..b7e20305557 100644
--- a/ts/components/screens/__tests__/__snapshots__/OperationResultScreenContent.test.tsx.snap
+++ b/ts/components/screens/__tests__/__snapshots__/OperationResultScreenContent.test.tsx.snap
@@ -542,7 +542,7 @@ exports[`OperationResultScreenContent should match the snapshot with default pro
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -658,7 +658,7 @@ exports[`OperationResultScreenContent should match the snapshot with default pro
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
diff --git a/ts/components/ui/BannerErrorState.tsx b/ts/components/ui/BannerErrorState.tsx
index 47a715b9c18..a403603dc43 100644
--- a/ts/components/ui/BannerErrorState.tsx
+++ b/ts/components/ui/BannerErrorState.tsx
@@ -1,4 +1,5 @@
import {
+ Body,
ButtonLink,
Icon,
IOBannerBigSpacing,
@@ -8,7 +9,6 @@ import {
IOScaleValues,
IOSpringValues,
IOStyles,
- Label,
VSpacer,
WithTestID
} from "@pagopa/io-app-design-system";
@@ -135,9 +135,7 @@ export const BannerErrorState = ({
)}
{label && (
<>
-
+ {label}
{actionText && }
>
)}
diff --git a/ts/components/ui/IOScrollViewWithLargeHeader.tsx b/ts/components/ui/IOScrollViewWithLargeHeader.tsx
index ab9437beca7..7439b7f5fc6 100644
--- a/ts/components/ui/IOScrollViewWithLargeHeader.tsx
+++ b/ts/components/ui/IOScrollViewWithLargeHeader.tsx
@@ -6,7 +6,7 @@ import {
H2,
HeaderSecondLevel,
IOStyles,
- LabelSmall,
+ BodySmall,
VSpacer,
useIOTheme
} from "@pagopa/io-app-design-system";
@@ -119,9 +119,9 @@ export const IOScrollViewWithLargeHeader = forwardRef(
onLayout={getTitleHeight}
>
{title.section && (
-
+
{title.section}
-
+
)}
@@ -507,7 +507,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 8,
+ "gap": 8,
}
}
>
@@ -651,7 +651,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
@@ -898,7 +898,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -1295,7 +1295,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 16,
+ "gap": 16,
}
}
>
@@ -1434,7 +1434,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 8,
+ "gap": 8,
}
}
>
@@ -1578,7 +1578,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
@@ -1825,7 +1825,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -1932,7 +1932,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
[
@@ -2050,7 +2050,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
@@ -2447,7 +2447,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 16,
+ "gap": 16,
}
}
>
@@ -2586,7 +2586,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 8,
+ "gap": 8,
}
}
>
@@ -2730,7 +2730,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
@@ -2977,7 +2977,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -3091,7 +3091,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
@@ -3488,7 +3488,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 16,
+ "gap": 16,
}
}
>
@@ -3627,7 +3627,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 8,
+ "gap": 8,
}
}
>
@@ -3912,7 +3912,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -4309,7 +4309,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 16,
+ "gap": 16,
}
}
>
@@ -4448,7 +4448,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 8,
+ "gap": 8,
}
}
>
@@ -4733,7 +4733,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -4840,7 +4840,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
[
@@ -4958,7 +4958,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
@@ -5355,7 +5355,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 16,
+ "gap": 16,
}
}
>
@@ -5494,7 +5494,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 8,
+ "gap": 8,
}
}
>
@@ -5779,7 +5779,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -5893,7 +5893,7 @@ exports[`IOScrollViewCentredContent should match snapshot, with description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
@@ -6290,7 +6290,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 16,
+ "gap": 16,
}
}
>
@@ -6429,7 +6429,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 8,
+ "gap": 8,
}
}
>
@@ -6550,7 +6550,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
@@ -6797,7 +6797,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -7194,7 +7194,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 16,
+ "gap": 16,
}
}
>
@@ -7333,7 +7333,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 8,
+ "gap": 8,
}
}
>
@@ -7454,7 +7454,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
@@ -7701,7 +7701,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -7808,7 +7808,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
[
@@ -7926,7 +7926,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
@@ -8323,7 +8323,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 16,
+ "gap": 16,
}
}
>
@@ -8462,7 +8462,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 8,
+ "gap": 8,
}
}
>
@@ -8583,7 +8583,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
@@ -8830,7 +8830,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -8944,7 +8944,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
@@ -9341,7 +9341,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 16,
+ "gap": 16,
}
}
>
@@ -9480,7 +9480,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 8,
+ "gap": 8,
}
}
>
@@ -9742,7 +9742,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -10139,7 +10139,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 16,
+ "gap": 16,
}
}
>
@@ -10278,7 +10278,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 8,
+ "gap": 8,
}
}
>
@@ -10540,7 +10540,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -10647,7 +10647,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
[
@@ -10765,7 +10765,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
@@ -11162,7 +11162,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 16,
+ "gap": 16,
}
}
>
@@ -11301,7 +11301,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"alignItems": "center",
"display": "flex",
"flexDirection": "column",
- "rowGap": 8,
+ "gap": 8,
}
}
>
@@ -11563,7 +11563,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -11677,7 +11677,7 @@ exports[`IOScrollViewCentredContent should match snapshot, without description,
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
diff --git a/ts/components/ui/__test__/__snapshots__/IOScrollViewWithListItems.test.tsx.snap b/ts/components/ui/__test__/__snapshots__/IOScrollViewWithListItems.test.tsx.snap
index 33d89ce8219..0026edc4bae 100644
--- a/ts/components/ui/__test__/__snapshots__/IOScrollViewWithListItems.test.tsx.snap
+++ b/ts/components/ui/__test__/__snapshots__/IOScrollViewWithListItems.test.tsx.snap
@@ -865,7 +865,7 @@ exports[`IOScrollViewWithListItems Rendering renders correctly with default prop
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -1501,7 +1501,7 @@ exports[`IOScrollViewWithListItems Rendering renders correctly without optional
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -2443,7 +2443,7 @@ exports[`IOScrollViewWithListItems Rendering renders subtitle as array correctly
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
diff --git a/ts/features/barcode/components/CameraPermissionView.tsx b/ts/features/barcode/components/CameraPermissionView.tsx
index 6dffe2ccc50..22bf89b5a95 100644
--- a/ts/features/barcode/components/CameraPermissionView.tsx
+++ b/ts/features/barcode/components/CameraPermissionView.tsx
@@ -7,7 +7,7 @@ import {
Pictogram,
IOPictograms,
H6,
- LabelSmall
+ BodySmall
} from "@pagopa/io-app-design-system";
type Props = {
@@ -25,9 +25,9 @@ const CameraPermissionView = (props: Props) => (
{props.title}
-
+
{props.body}
-
+
{
{I18n.t("bonus.cgn.name")}
{isExpired && expiredTag}
-
+
{I18n.t("bonus.cgn.departmentName")}
-
-
+
+
{expireDate &&
I18n.t("bonusCard.validUntil", {
endDate: format(expireDate, "MM/YY")
})}
-
+
{!isExpired && cngLogoComponent}
{withEycaLogo && eycaLogoComponent}
diff --git a/ts/features/bonus/cgn/components/CgnCardStatus.tsx b/ts/features/bonus/cgn/components/CgnCardStatus.tsx
index 9cbfe743cad..cff1a453752 100644
--- a/ts/features/bonus/cgn/components/CgnCardStatus.tsx
+++ b/ts/features/bonus/cgn/components/CgnCardStatus.tsx
@@ -1,11 +1,11 @@
+import { LabelMini, Tag } from "@pagopa/io-app-design-system";
import React from "react";
-import { Tag, Chip } from "@pagopa/io-app-design-system";
+import { Card } from "../../../../../definitions/cgn/Card";
import { CardActivated } from "../../../../../definitions/cgn/CardActivated";
-import I18n from "../../../../i18n";
-import { CardRevoked } from "../../../../../definitions/cgn/CardRevoked";
import { CardExpired } from "../../../../../definitions/cgn/CardExpired";
+import { CardRevoked } from "../../../../../definitions/cgn/CardRevoked";
+import I18n from "../../../../i18n";
import { formatDateAsShortFormat } from "../../../../utils/dates";
-import { Card } from "../../../../../definitions/cgn/Card";
export function CgnCardStatus({ card }: { card: Card }) {
return (
@@ -25,11 +25,15 @@ export function CgnCardStatus({ card }: { card: Card }) {
/>
)}
{CardActivated.is(card) && (
-
+
{I18n.t("bonus.cgn.detail.status.date.valid_until", {
date: formatDateAsShortFormat(card.expiration_date)
})}
-
+
)}
);
diff --git a/ts/features/bonus/cgn/components/merchants/CgnModuleDiscount.tsx b/ts/features/bonus/cgn/components/merchants/CgnModuleDiscount.tsx
index e3b5b2e504f..e2069ebd1fd 100644
--- a/ts/features/bonus/cgn/components/merchants/CgnModuleDiscount.tsx
+++ b/ts/features/bonus/cgn/components/merchants/CgnModuleDiscount.tsx
@@ -59,10 +59,10 @@ export const CategoryTag = ({ category }: CategoryTagProps) => {
diff --git a/ts/features/bonus/cgn/components/merchants/discount/CgnDiscountExpireProgressBar.tsx b/ts/features/bonus/cgn/components/merchants/discount/CgnDiscountExpireProgressBar.tsx
index 1e5808d4126..4b76548d257 100644
--- a/ts/features/bonus/cgn/components/merchants/discount/CgnDiscountExpireProgressBar.tsx
+++ b/ts/features/bonus/cgn/components/merchants/discount/CgnDiscountExpireProgressBar.tsx
@@ -1,4 +1,4 @@
-import { LabelSmall, VSpacer } from "@pagopa/io-app-design-system";
+import { BodySmall, VSpacer } from "@pagopa/io-app-design-system";
import { format } from "date-fns";
import * as React from "react";
import { StyleSheet, View } from "react-native";
@@ -39,12 +39,12 @@ export const CgnDiscountExpireProgressBar = ({
-
+
{I18n.t("idpay.barCode.resultScreen.success.expiresIn")}
-
-
+
+
{formattedSecondsToExpiration}
-
+
);
diff --git a/ts/features/bonus/cgn/screens/discount/___tests___/__snapshots__/CGNDiscountExpiredScreen.test.tsx.snap b/ts/features/bonus/cgn/screens/discount/___tests___/__snapshots__/CGNDiscountExpiredScreen.test.tsx.snap
index 01edd3f3a26..a96b5ec7bbd 100644
--- a/ts/features/bonus/cgn/screens/discount/___tests___/__snapshots__/CGNDiscountExpiredScreen.test.tsx.snap
+++ b/ts/features/bonus/cgn/screens/discount/___tests___/__snapshots__/CGNDiscountExpiredScreen.test.tsx.snap
@@ -698,7 +698,7 @@ exports[`CGNDiscountExpiredScreen should render correctly 1`] = `
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
diff --git a/ts/features/bonus/cgn/screens/discount/___tests___/__snapshots__/CgnDiscountCodeScreen.test.tsx.snap b/ts/features/bonus/cgn/screens/discount/___tests___/__snapshots__/CgnDiscountCodeScreen.test.tsx.snap
index a09134d4bc4..31ea5743252 100644
--- a/ts/features/bonus/cgn/screens/discount/___tests___/__snapshots__/CgnDiscountCodeScreen.test.tsx.snap
+++ b/ts/features/bonus/cgn/screens/discount/___tests___/__snapshots__/CgnDiscountCodeScreen.test.tsx.snap
@@ -679,7 +679,7 @@ exports[`CgnDiscountCodeScreen should render correctly 1`] = `
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": 20,
},
{
@@ -796,7 +796,7 @@ exports[`CgnDiscountCodeScreen should render correctly 1`] = `
"fontFamily": "Titillium Sans Pro",
"fontSize": 16,
"fontStyle": "normal",
- "fontWeight": "700",
+ "fontWeight": "600",
"lineHeight": undefined,
},
{
diff --git a/ts/features/bonus/common/components/BonusInformationComponent.tsx b/ts/features/bonus/common/components/BonusInformationComponent.tsx
index 8502729db12..db42d0d16bb 100644
--- a/ts/features/bonus/common/components/BonusInformationComponent.tsx
+++ b/ts/features/bonus/common/components/BonusInformationComponent.tsx
@@ -1,9 +1,3 @@
-import * as AR from "fp-ts/lib/Array";
-import { constNull, pipe } from "fp-ts/lib/function";
-import * as O from "fp-ts/lib/Option";
-import * as React from "react";
-import { ComponentProps } from "react";
-import { Image } from "react-native";
import {
Body,
ButtonSolidProps,
@@ -13,11 +7,15 @@ import {
IOSpacer,
IOSpacingScale,
IOVisualCostants,
- Label,
VSpacer,
buttonSolidHeight
} from "@pagopa/io-app-design-system";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
+import * as AR from "fp-ts/lib/Array";
+import { constNull, pipe } from "fp-ts/lib/function";
+import * as O from "fp-ts/lib/Option";
+import * as React from "react";
+import { ComponentProps } from "react";
+import { Image } from "react-native";
import Animated, {
Easing,
useAnimatedScrollHandler,
@@ -25,16 +23,17 @@ import Animated, {
useSharedValue,
withTiming
} from "react-native-reanimated";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
import { BonusAvailable } from "../../../../../definitions/content/BonusAvailable";
import { BonusAvailableContent } from "../../../../../definitions/content/BonusAvailableContent";
+import { IOScrollViewWithLargeHeader } from "../../../../components/ui/IOScrollViewWithLargeHeader";
import { LightModalContext } from "../../../../components/ui/LightModal";
+import { Markdown } from "../../../../components/ui/Markdown/Markdown";
+import { useHeaderSecondLevel } from "../../../../hooks/useHeaderSecondLevel";
import I18n from "../../../../i18n";
import customVariables from "../../../../theme/variables";
-import { getRemoteLocale } from "../../../messages/utils/messages";
import { maybeNotNullyString } from "../../../../utils/strings";
-import { Markdown } from "../../../../components/ui/Markdown/Markdown";
-import { IOScrollViewWithLargeHeader } from "../../../../components/ui/IOScrollViewWithLargeHeader";
-import { useHeaderSecondLevel } from "../../../../hooks/useHeaderSecondLevel";
+import { getRemoteLocale } from "../../../messages/utils/messages";
import TosBonusComponent from "./TosBonusComponent";
type OwnProps = {
@@ -93,14 +92,14 @@ const getTosFooter = (
{I18n.t("bonus.bonusVacanze.advice")}
-
+