diff --git a/ts/features/itwallet/identification/screens/ItwIdentificationModeSelectionScreen.tsx b/ts/features/itwallet/identification/screens/ItwIdentificationModeSelectionScreen.tsx
index bda0496cdf2..22dfd7b9e3f 100644
--- a/ts/features/itwallet/identification/screens/ItwIdentificationModeSelectionScreen.tsx
+++ b/ts/features/itwallet/identification/screens/ItwIdentificationModeSelectionScreen.tsx
@@ -5,7 +5,7 @@ import {
   VStack
 } from "@pagopa/io-app-design-system";
 import React, { useCallback, useMemo } from "react";
-import { useFocusEffect } from "@react-navigation/native";
+import { Route, useFocusEffect, useRoute } from "@react-navigation/native";
 import I18n from "../../../../i18n";
 import { useIOSelector } from "../../../../store/hooks";
 import { cieFlowForDevServerEnabled } from "../../../cieLogin/utils";
@@ -17,7 +17,6 @@ import {
 import { itwDisabledIdentificationMethodsSelector } from "../../../../store/reducers/backendStatus/remoteConfig";
 import { IOScrollViewWithLargeHeader } from "../../../../components/ui/IOScrollViewWithLargeHeader";
 import { isCIEAuthenticationSupportedSelector } from "../../machine/eid/selectors";
-import { Route, useRoute } from "@react-navigation/native";
 import { ITW_ROUTES } from "../../navigation/routes";
 
 export type ItwIdentificationModeSelectionScreenNavigationParams =
diff --git a/ts/features/itwallet/machine/eid/__tests__/machine.test.ts b/ts/features/itwallet/machine/eid/__tests__/machine.test.ts
index 6eb452c5ce8..bf790811943 100644
--- a/ts/features/itwallet/machine/eid/__tests__/machine.test.ts
+++ b/ts/features/itwallet/machine/eid/__tests__/machine.test.ts
@@ -989,7 +989,7 @@ describe("itwEidIssuanceMachine", () => {
   });
 
   it("Should obtain an eID (SPID), reissuing mode", async () => {
-    //The wallet instance and attestation already exist
+    // The wallet instance and attestation already exist
     const initialContext = {
       ...InitialContext,
       integrityKeyTag: T_INTEGRITY_KEY,
@@ -999,6 +999,7 @@ describe("itwEidIssuanceMachine", () => {
     const actor = createActor(mockedMachine);
     actor.start();
 
+    // eslint-disable-next-line functional/immutable-data
     actor.getSnapshot().context = initialContext;
 
     await waitFor(() => expect(onInit).toHaveBeenCalledTimes(1));
@@ -1091,6 +1092,7 @@ describe("itwEidIssuanceMachine", () => {
 
     // EID obtained
 
+    // eslint-disable-next-line sonarjs/no-identical-functions
     await waitFor(() =>
       expect(actor.getSnapshot().value).toStrictEqual({
         Issuance: "DisplayingPreview"
diff --git a/ts/features/itwallet/navigation/ItwStackNavigator.tsx b/ts/features/itwallet/navigation/ItwStackNavigator.tsx
index 6d1404208d1..75fd1f84237 100644
--- a/ts/features/itwallet/navigation/ItwStackNavigator.tsx
+++ b/ts/features/itwallet/navigation/ItwStackNavigator.tsx
@@ -40,9 +40,9 @@ import ItwCieIdLoginScreen from "../identification/screens/cieId/ItwCieIdLoginSc
 import { ItwPresentationCredentialFiscalCodeModal } from "../presentation/screens/ItwPresentationCredentialFiscalCodeModal";
 import { ItwCredentialTrustmarkScreen } from "../trustmark/screens/ItwCredentialTrustmarkScreen";
 import { ItwAlreadyActiveScreen } from "../discovery/screens/ItwAlreadyActiveScreen";
+import { ItwPresentationEidVerificationExpiredScreen } from "../presentation/screens/ItwPresentationEidVerificationExpiredScreen";
 import { ItwParamsList } from "./ItwParamsList";
 import { ITW_ROUTES } from "./routes";
-import { ItwPresentationEidVerificationExpiredScreen } from "../presentation/screens/ItwPresentationEidVerificationExpiredScreen";
 
 const Stack = createStackNavigator<ItwParamsList>();
 
diff --git a/ts/features/itwallet/onboarding/screens/WalletCardOnboardingScreen.tsx b/ts/features/itwallet/onboarding/screens/WalletCardOnboardingScreen.tsx
index b7b9d7bf1c8..0a0eed54394 100644
--- a/ts/features/itwallet/onboarding/screens/WalletCardOnboardingScreen.tsx
+++ b/ts/features/itwallet/onboarding/screens/WalletCardOnboardingScreen.tsx
@@ -118,7 +118,7 @@ const ItwCredentialOnboardingSection = () => {
         });
       }
     },
-    [machineRef]
+    [machineRef, isWalletValid, navigation]
   );
 
   return (
diff --git a/ts/features/itwallet/presentation/screens/ItwPresentationEidVerificationExpiredScreen.tsx b/ts/features/itwallet/presentation/screens/ItwPresentationEidVerificationExpiredScreen.tsx
index 0f636d75c59..37b9e73ef33 100644
--- a/ts/features/itwallet/presentation/screens/ItwPresentationEidVerificationExpiredScreen.tsx
+++ b/ts/features/itwallet/presentation/screens/ItwPresentationEidVerificationExpiredScreen.tsx
@@ -1,9 +1,9 @@
 import React, { useMemo } from "react";
+import { BodyProps } from "@pagopa/io-app-design-system";
 import { OperationResultScreenContent } from "../../../../components/screens/OperationResultScreenContent";
 import I18n from "../../../../i18n";
 import { useIONavigation } from "../../../../navigation/params/AppParamsList";
 import { useHeaderSecondLevel } from "../../../../hooks/useHeaderSecondLevel";
-import { BodyProps } from "@pagopa/io-app-design-system";
 import { ITW_ROUTES } from "../../navigation/routes";
 
 export const ItwPresentationEidVerificationExpiredScreen = () => {