Merge branch 'master' into IOBP-489-fe-rimozione-riferimenti-a-bonus-…

…cashback-da-flussi-in-app
pagopa · Jan 23, 2024 · 8ff4e51 · 8ff4e51
2 parents 3f15caa + 9fc529f
commit 8ff4e51
Show file tree

Hide file tree

Showing 5 changed files with 173 additions and 168 deletions.
diff --git a/ts/config.ts b/ts/config.ts
@@ -116,7 +116,7 @@ export const remindersOptInEnabled = Config.REMINDERS_OPT_IN_ENABLED === "YES";
 export const isNewCduFlow = Config.CDU_NEW_FLOW === "YES";
 
 // version of ToS
-export const tosVersion: NonNegativeNumber = 4.7 as NonNegativeNumber;
+export const tosVersion: NonNegativeNumber = 4.8 as NonNegativeNumber;
 
 export const fetchTimeout = pipe(
   parseInt(Config.FETCH_TIMEOUT_MS, 10),

diff --git a/ts/features/walletV3/details/screens/WalletDetailsScreen.tsx b/ts/features/walletV3/details/screens/WalletDetailsScreen.tsx
@@ -21,6 +21,7 @@ import {
 } from "../store";
 import { walletDetailsGetInstrument } from "../store/actions";
 import { UIWalletInfoDetails } from "../types/UIWalletInfoDetails";
+import { getDateFromExpiryDate } from "../../../../utils/dates";
 
 export type WalletDetailsScreenNavigationParams = Readonly<{
   walletId: string;
@@ -46,7 +47,7 @@ const generateCardComponent = (details: UIWalletInfoDetails) => {
     <PaymentCardBig
       testID="CreditCardComponent"
       cardType="CREDIT"
-      expirationDate={details.expiryDate}
+      expirationDate={getDateFromExpiryDate(details.expiryDate)}
       holderName={details.holder || ""}
       hpan={details.maskedPan || ""}
       cardIcon={details.brand?.toLowerCase() as IOLogoPaymentExtType}

diff --git a/ts/navigation/AuthenticationNavigator.tsx b/ts/navigation/AuthenticationNavigator.tsx
@@ -10,7 +10,7 @@ import CiePinScreen from "../screens/authentication/cie/CiePinScreen";
 import CieWrongCiePinScreen from "../screens/authentication/cie/CieWrongCiePinScreen";
 import IdpLoginScreen from "../screens/authentication/IdpLoginScreen";
 import IdpSelectionScreen from "../screens/authentication/IdpSelectionScreen";
-import LandingScreen from "../screens/authentication/LandingScreen";
+import { LandingScreen } from "../screens/authentication/LandingScreen";
 import TestAuthenticationScreen from "../screens/authentication/TestAuthenticationScreen";
 import MarkdownScreen from "../screens/development/MarkdownScreen";
 import { AuthSessionPage } from "../screens/authentication/idpAuthSessionHandler";