chore(IT Wallet): [SIW-789] Refactor folders and files structure (#5384)

## Short description Depends on #5373 This PR focuses on enhancing the organization and coherence of the project's folder and file structure. No changes to the logic have been made whatsoever. While a detailed breakdown of each modification isn't provided due to the high number of changes. They can be reviewed in the `Files changed` section or by pulling the branch locally to inspect the updated folder structure and file names. It also adds a state migration needed due to the changes which basically resets it. ## How to test Check the new structure and names statically then test again each flow. Everything should work just as before.
pagopa · Jan 11, 2024 · 98a5f29 · 98a5f29
1 parent 7f98216
commit 98a5f29
Show file tree

Hide file tree

Showing 86 changed files with 1,586 additions and 1,764 deletions.
diff --git a/ts/features/barcode/screens/BarcodeScanScreen.tsx b/ts/features/barcode/screens/BarcodeScanScreen.tsx
@@ -149,7 +149,7 @@ const BarcodeScanScreen = () => {
         };
         NavigationService.dispatchNavigationAction(
           CommonActions.navigate(ITW_ROUTES.MAIN, {
-            screen: ITW_ROUTES.PRESENTATION.PID.REMOTE.CHECKS,
+            screen: ITW_ROUTES.PRESENTATION.PID.REMOTE.INIT,
             params
           })
         );

diff --git a/ts/features/it-wallet/components/ItwClaimsWrapper.tsx b/ts/features/it-wallet/components/ItwClaimsWrapper.tsx
@@ -4,7 +4,7 @@ import { H6, IOColors } from "@pagopa/io-app-design-system";
 import {
   CredentialCatalogDisplay,
   getImageFromCredentialType
-} from "../utils/mocks";
+} from "../utils/itwMocksUtils";
 
 /**
  * Props of the component.

diff --git a/ts/features/it-wallet/components/ItwCredentialCard.tsx b/ts/features/it-wallet/components/ItwCredentialCard.tsx
@@ -10,8 +10,8 @@ import customVariables from "../../../theme/variables";
 import {
   CredentialCatalogDisplay,
   getImageFromCredentialType
-} from "../utils/mocks";
-import { ParsedCredential } from "../utils/types";
+} from "../utils/itwMocksUtils";
+import { ParsedCredential } from "../utils/itwTypesUtils";
 
 /**
  * Common props for the component.

diff --git a/ts/features/it-wallet/components/ItwCredentialClaimsList.tsx b/ts/features/it-wallet/components/ItwCredentialClaimsList.tsx
@@ -5,9 +5,9 @@ import { SdJwt } from "@pagopa/io-react-native-wallet";
 import { useNavigation } from "@react-navigation/native";
 import I18n from "../../../i18n";
 import { useItwInfoBottomSheet } from "../hooks/useItwInfoBottomSheet";
-import { StoredCredential } from "../utils/types";
+import { StoredCredential } from "../utils/itwTypesUtils";
 import { parseClaims, sortClaims } from "../utils/itwClaimsUtils";
-import { CredentialType, mapAssuranceLevel } from "../utils/mocks";
+import { CredentialType, mapAssuranceLevel } from "../utils/itwMocksUtils";
 import { IOStackNavigationProp } from "../../../navigation/params/AppParamsList";
 import { ItwParamsList } from "../navigation/ItwParamsList";
 import ItwCredentialClaim from "./ItwCredentialClaim";

diff --git a/ts/features/it-wallet/components/cie/CieNfcOverlay.tsx b/ts/features/it-wallet/components/cie/CieNfcOverlay.tsx
@@ -13,18 +13,18 @@ import { ScreenContentHeader } from "../../../../components/screens/ScreenConten
 import { ITW_ROUTES } from "../../navigation/ItwRoutes";
 import { IOStackNavigationRouteProps } from "../../../../navigation/params/AppParamsList";
 import { ItwParamsList } from "../../navigation/ItwParamsList";
-import { openNFCSettings } from "../../utils/cie";
+import { itwOpenNFCSettings } from "../../utils/itwCieUtils";
 
 type NavigationProps = IOStackNavigationRouteProps<
   ItwParamsList,
-  "ITW_ISSUING_PID_CIE_CARD_READER_SCREEN"
+  "ITW_ISSUANCE_PID_CIE_CARD_READER_SCREEN"
 >;
 
 type Props = ReduxProps & NavigationProps;
 
 export default class CieNfcOverlay extends React.PureComponent<Props> {
   private handleOnPressActivateNFC = async () => {
-    await openNFCSettings();
+    await itwOpenNFCSettings();
   };
 
   // FIX ME: the same alert is displayed during all the onboarding
@@ -42,7 +42,7 @@ export default class CieNfcOverlay extends React.PureComponent<Props> {
           style: "default",
           onPress: () =>
             this.props.navigation.navigate(ITW_ROUTES.MAIN, {
-              screen: ITW_ROUTES.ISSUING.PID.AUTH_INFO
+              screen: ITW_ROUTES.ISSUANCE.PID.AUTH_INFO
             })
         }
       ]

diff --git a/ts/features/it-wallet/navigation/ItwParamsList.ts b/ts/features/it-wallet/navigation/ItwParamsList.ts
@@ -1,48 +1,49 @@
 import { ItwPrCredentialDetailsScreenNavigationParams } from "../screens/presentation/ItwPrCredentialDetails";
-import { ItwIssuingPidRequestScreenNavigationParams } from "../screens/issuing/pid/ItwIssuingPidRequestScreen";
-import { ItwCieCardReaderScreenNavigationParams } from "../screens/issuing/pid/cie/ItwCieCardReaderScreen";
-import { ItwCieConsentDataUsageScreenNavigationParams } from "../screens/issuing/pid/cie/ItwCieConsentDataUsageScreen";
-import { ItwCieWrongPinScreenNavigationParams } from "../screens/issuing/pid/cie/ItwCieWrongPinScreen";
+import { ItwIssuancePidRequestScreenNavigationParams } from "../screens/issuance/pid/ItwIssuancePidRequestScreen";
+import { ItwCieCardReaderScreenNavigationParams } from "../screens/issuance/pid/cie/ItwCieCardReaderScreen";
+import { ItwCieConsentDataUsageScreenNavigationParams } from "../screens/issuance/pid/cie/ItwCieConsentDataUsageScreen";
+import { ItwCieWrongPinScreenNavigationParams } from "../screens/issuance/pid/cie/ItwCieWrongPinScreen";
 import { ItwPrRemotePidChecksScreenNavigationParams } from "../screens/presentation/remote/pid/ItwPrRemotePidChecksScreen";
 import { ITW_ROUTES } from "./ItwRoutes";
 
 export type ItwParamsList = {
-  // ISSUING PID
-  [ITW_ROUTES.ISSUING.PID.INFO]: undefined;
-  [ITW_ROUTES.ISSUING.PID.AUTH]: undefined;
-  [ITW_ROUTES.ISSUING.PID.AUTH_INFO]: undefined;
-  [ITW_ROUTES.ISSUING.PID.REQUEST]: ItwIssuingPidRequestScreenNavigationParams;
-  [ITW_ROUTES.ISSUING.PID.PREVIEW]: undefined;
-  [ITW_ROUTES.ISSUING.PID.ADDING]: undefined;
+  // ISSUANCE PID
+  [ITW_ROUTES.ISSUANCE.PID.INFO]: undefined;
+  [ITW_ROUTES.ISSUANCE.PID.AUTH]: undefined;
+  [ITW_ROUTES.ISSUANCE.PID.AUTH_INFO]: undefined;
+  [ITW_ROUTES.ISSUANCE.PID
+    .REQUEST]: ItwIssuancePidRequestScreenNavigationParams;
+  [ITW_ROUTES.ISSUANCE.PID.PREVIEW]: undefined;
+  [ITW_ROUTES.ISSUANCE.PID.STORE]: undefined;
 
-  // ISSUING PID CIE
-  [ITW_ROUTES.ISSUING.PID.CIE.EXPIRED_SCREEN]: undefined;
-  [ITW_ROUTES.ISSUING.PID.CIE.PIN_SCREEN]: undefined;
-  [ITW_ROUTES.ISSUING.PID.CIE
+  // ISSUANCE PID CIE
+  [ITW_ROUTES.ISSUANCE.PID.CIE.EXPIRED_SCREEN]: undefined;
+  [ITW_ROUTES.ISSUANCE.PID.CIE.PIN_SCREEN]: undefined;
+  [ITW_ROUTES.ISSUANCE.PID.CIE
     .CARD_READER_SCREEN]: ItwCieCardReaderScreenNavigationParams;
-  [ITW_ROUTES.ISSUING.PID.CIE
+  [ITW_ROUTES.ISSUANCE.PID.CIE
     .CONSENT_DATA_USAGE]: ItwCieConsentDataUsageScreenNavigationParams;
-  [ITW_ROUTES.ISSUING.PID.CIE
+  [ITW_ROUTES.ISSUANCE.PID.CIE
     .WRONG_PIN_SCREEN]: ItwCieWrongPinScreenNavigationParams;
-  [ITW_ROUTES.ISSUING.PID.CIE.PIN_TEMP_LOCKED_SCREEN]: undefined;
+  [ITW_ROUTES.ISSUANCE.PID.CIE.PIN_TEMP_LOCKED_SCREEN]: undefined;
 
-  // ISSUING CREDENTIALS
-  [ITW_ROUTES.ISSUING.CREDENTIAL.CATALOG]: undefined;
-  [ITW_ROUTES.ISSUING.CREDENTIAL.CHECKS]: undefined;
-  [ITW_ROUTES.ISSUING.CREDENTIAL.AUTH]: undefined;
-  [ITW_ROUTES.ISSUING.CREDENTIAL.PREVIEW]: undefined;
+  // ISSUANCE CREDENTIALS
+  [ITW_ROUTES.ISSUANCE.CREDENTIAL.CATALOG]: undefined;
+  [ITW_ROUTES.ISSUANCE.CREDENTIAL.CHECKS]: undefined;
+  [ITW_ROUTES.ISSUANCE.CREDENTIAL.AUTH]: undefined;
+  [ITW_ROUTES.ISSUANCE.CREDENTIAL.PREVIEW]: undefined;
 
   // PRESENTATION REMOTE PID
   [ITW_ROUTES.PRESENTATION.PID.DETAILS]: undefined;
   [ITW_ROUTES.PRESENTATION.PID.REMOTE
-    .CHECKS]: ItwPrRemotePidChecksScreenNavigationParams;
+    .INIT]: ItwPrRemotePidChecksScreenNavigationParams;
   [ITW_ROUTES.PRESENTATION.PID.REMOTE.DATA]: undefined;
   [ITW_ROUTES.PRESENTATION.PID.REMOTE.RESULT]: undefined;
 
   // PRESENTATION REMOTE CREDENTIAL
   [ITW_ROUTES.PRESENTATION.CREDENTIAL
     .DETAILS]: ItwPrCredentialDetailsScreenNavigationParams;
-  [ITW_ROUTES.PRESENTATION.CREDENTIAL.REMOTE.CHECKS]: undefined;
+  [ITW_ROUTES.PRESENTATION.CREDENTIAL.REMOTE.INIT]: undefined;
   [ITW_ROUTES.PRESENTATION.CREDENTIAL.REMOTE.DATA]: undefined;
   [ITW_ROUTES.PRESENTATION.CREDENTIAL.REMOTE.RESULT]: undefined;
 

diff --git a/ts/features/it-wallet/navigation/ItwRoutes.ts b/ts/features/it-wallet/navigation/ItwRoutes.ts
@@ -1,42 +1,42 @@
 export const ITW_ROUTES = {
   MAIN: "ITW_MAIN" as const,
-  ISSUING: {
+  ISSUANCE: {
     PID: {
       CIE: {
-        EXPIRED_SCREEN: "ITW_ISSUING_PID_CIE_EXPIRED_SCREEN",
-        PIN_SCREEN: "ITW_ISSUING_PID_CIE_PIN_SCREEN",
-        CARD_READER_SCREEN: "ITW_ISSUING_PID_CIE_CARD_READER_SCREEN",
-        CONSENT_DATA_USAGE: "ITW_ISSUING_PID_CIE_CONSENT_DATA_USAGE",
-        WRONG_PIN_SCREEN: "ITW_ISSUING_PID_CIE_WRONG_PIN_SCREEN",
-        PIN_TEMP_LOCKED_SCREEN: "ITW_ISSUING_PID_CIE_PIN_TEMP_LOCKED_SCREEN"
+        EXPIRED_SCREEN: "ITW_ISSUANCE_PID_CIE_EXPIRED_SCREEN",
+        PIN_SCREEN: "ITW_ISSUANCE_PID_CIE_PIN_SCREEN",
+        CARD_READER_SCREEN: "ITW_ISSUANCE_PID_CIE_CARD_READER_SCREEN",
+        CONSENT_DATA_USAGE: "ITW_ISSUANCE_PID_CIE_CONSENT_DATA_USAGE",
+        WRONG_PIN_SCREEN: "ITW_ISSUANCE_PID_CIE_WRONG_PIN_SCREEN",
+        PIN_TEMP_LOCKED_SCREEN: "ITW_ISSUANCE_PID_CIE_PIN_TEMP_LOCKED_SCREEN"
       } as const,
-      INFO: "ITW_ISSUING_PID_INFO",
-      AUTH: "ITW_ISSUING_PID_AUTH",
-      AUTH_INFO: "ITW_ISSUING_PID_AUTH_INFO",
-      REQUEST: "ITW_ISSUING_PID_REQUEST",
-      PREVIEW: "ITW_ISSUING_PID_PREVIEW",
-      ADDING: "ITW_ISSUING_PID_ADDING"
+      INFO: "ITW_ISSUANCE_PID_INFO",
+      AUTH: "ITW_ISSUANCE_PID_AUTH",
+      AUTH_INFO: "ITW_ISSUANCE_PID_AUTH_INFO",
+      REQUEST: "ITW_ISSUANCE_PID_REQUEST",
+      PREVIEW: "ITW_ISSUANCE_PID_PREVIEW",
+      STORE: "ITW_ISSUANCE_PID_STORE"
     } as const,
     CREDENTIAL: {
-      CATALOG: "ITW_ISSUING_CREDENTIAL_CATALOG",
-      CHECKS: "ITW_ISSUING_CREDENTIAL_CHECKS",
-      AUTH: "ITW_ISSUING_CREDENTIAL_AUTH",
-      PREVIEW: "ITW_ISSUING_CREDENTIAL_PREVIEW"
+      CATALOG: "ITW_ISSUANCE_CREDENTIAL_CATALOG",
+      CHECKS: "ITW_ISSUANCE_CREDENTIAL_CHECKS",
+      AUTH: "ITW_ISSUANCE_CREDENTIAL_AUTH",
+      PREVIEW: "ITW_ISSUANCE_CREDENTIAL_PREVIEW"
     } as const
   } as const,
   PRESENTATION: {
     PID: {
       DETAILS: "ITW_PRESENTATION_PID_DETAILS",
       REMOTE: {
-        CHECKS: "ITW_PRESENTATION_PID_REMOTE_CHECKS",
+        INIT: "ITW_PRESENTATION_PID_REMOTE_INIT",
         DATA: "ITW_PRESENTATION_PID_REMOTE_DATA",
         RESULT: "ITW_PRESENTATION_PID_REMOTE_RESULT"
       } as const
     } as const,
     CREDENTIAL: {
       DETAILS: "ITW_PRESENTATION_CREDENTIAL_DETAILS",
       REMOTE: {
-        CHECKS: "ITW_PRESENTATION_CREDENTIAL_CHECKS",
+        INIT: "ITW_PRESENTATION_CREDENTIAL_INIT",
         DATA: "ITW_PRESENTATION_CREDENTIAL_DATA",
         RESULT: "ITW_PRESETATION_CREDENTIAL_RESULT"
       } as const

diff --git a/ts/features/it-wallet/navigation/ItwStackNavigator.tsx b/ts/features/it-wallet/navigation/ItwStackNavigator.tsx
@@ -1,31 +1,31 @@
 import * as React from "react";
 import { createStackNavigator } from "@react-navigation/stack";
 import { isGestureEnabled } from "../../../utils/navigation";
-import ItwCiePinScreen from "../screens/issuing/pid/cie/ItwCiePinScreen";
-import ItwCieCardReaderScreen from "../screens/issuing/pid/cie/ItwCieCardReaderScreen";
-import ItwCieConsentDataUsageScreen from "../screens/issuing/pid/cie/ItwCieConsentDataUsageScreen";
-import ItwCieExpiredOrInvalidScreen from "../screens/issuing/pid/cie/ItwCieExpiredOrInvalidScreen";
-import ItwCieWrongPinScreen from "../screens/issuing/pid/cie/ItwCieWrongPinScreen";
-import ItwIssuingPidInfoScreen from "../screens/issuing/pid/ItwIssuingPidInfoScreen";
-import ItwIssuingPidAuthInfoScreen from "../screens/issuing/pid/ItwIssuingPidAuthInfoScreen";
-import ItwPidPreviewScreen from "../screens/issuing/pid/ItwPidPreviewScreen";
-import ItwIssuingPidAddingScreen from "../screens/issuing/pid/ItwIssuingPidAddingScreen";
+import ItwCiePinScreen from "../screens/issuance/pid/cie/ItwCiePinScreen";
+import ItwCieCardReaderScreen from "../screens/issuance/pid/cie/ItwCieCardReaderScreen";
+import ItwCieConsentDataUsageScreen from "../screens/issuance/pid/cie/ItwCieConsentDataUsageScreen";
+import ItwCieExpiredOrInvalidScreen from "../screens/issuance/pid/cie/ItwCieExpiredOrInvalidScreen";
+import ItwCieWrongPinScreen from "../screens/issuance/pid/cie/ItwCieWrongPinScreen";
+import ItwIssuancePidInfoScreen from "../screens/issuance/pid/ItwIssuancePidInfoScreen";
+import ItwIssuingPidAuthInfoScreen from "../screens/issuance/pid/ItwIssuancePidAuthInfoScreen";
+import ItwIssuancePidPreviewScreen from "../screens/issuance/pid/ItwIssuancePidPreviewScreen";
+import ItwIssuingPidStoreScreen from "../screens/issuance/pid/ItwIssuancePidStoreScreen";
 import ItwPrPidDetails from "../screens/presentation/ItwPrPidDetails";
-import ItwIssuingPidRequestScreen from "../screens/issuing/pid/ItwIssuingPidRequestScreen";
+import ItwIssuancePidRequestScreen from "../screens/issuance/pid/ItwIssuancePidRequestScreen";
 import ItwPrRemotePidChecksScreen from "../screens/presentation/remote/pid/ItwPrRemotePidChecksScreen";
 import ItwPrRemotePidResultScreen from "../screens/presentation/remote/pid/ItwPrRemotePidResultScreen";
-import ItwIssuingPidAuthScreen from "../screens/issuing/pid/ItwIssuingPidAuthScreen";
+import ItwIssuancePidAuthScreen from "../screens/issuance/pid/ItwIssuancePidAuthScreen";
 import ItwGenericNotAvailableScreen from "../screens/generic/ItwGenericNotAvailableScreen";
-import ItwIssuingCredentialPreviewScreen from "../screens/issuing/credential/ItwIssuingCredentialPreviewScreen";
-import ItwIssuingCredentialAuthScreen from "../screens/issuing/credential/ItwIssuingCredentialAuthScreen";
-import ItwPrRemoteCredentialChecksScreen from "../screens/presentation/remote/credential/ItwPrRemoteCredentialChecksScreen";
+import ItwIssuanceCredentialPreviewScreen from "../screens/issuance/credential/ItwIssuanceCredentialPreviewScreen";
+import ItwIssuanceCredentialAuthScreen from "../screens/issuance/credential/ItwIssuanceCredentialAuthScreen";
 import ItwPrRemoteCredentialDataScreen from "../screens/presentation/remote/credential/ItwPrRemoteCredentialDataScreen";
 import ItwPrRemoteCredentialResultScreen from "../screens/presentation/remote/credential/ItwPrRemoteCredentialResultScreen";
-import ItwIssuingCredentialsChecksScreen from "../screens/issuing/credential/ItwIssuingCredentialChecksScreen";
-import ItwIssuingCredentialCatalogScreen from "../screens/issuing/credential/ItwIssuingCredentialCatalogScreen";
+import ItwIssuanceCredentialChecksScreen from "../screens/issuance/credential/ItwIssuanceCredentialChecksScreen";
+import ItwIssuanceCredentialCatalogScreen from "../screens/issuance/credential/ItwIssuanceCredentialCatalogScreen";
 import ItwPrCredentialDetailsScreen from "../screens/presentation/ItwPrCredentialDetails";
 import ItwPrRemotePidDataScreen from "../screens/presentation/remote/pid/ItwPrRemotePidDataScreen";
 import ItwPrProximityQrCodeScreen from "../screens/presentation/ItwPrProximityQrCodeScreen";
+import ItwPrRemoteCredentialInitScreen from "../screens/presentation/remote/credential/ItwPrRemoteCredentialChecksScreen";
 import { ItwParamsList } from "./ItwParamsList";
 import { ITW_ROUTES } from "./ItwRoutes";
 
@@ -36,70 +36,70 @@ export const ItwStackNavigator = () => (
     headerMode={"none"}
     screenOptions={{ gestureEnabled: isGestureEnabled }}
   >
-    {/* ISSUING PID CIE */}
+    {/* ISSUANCE PID CIE */}
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.PID.CIE.EXPIRED_SCREEN}
+      name={ITW_ROUTES.ISSUANCE.PID.CIE.EXPIRED_SCREEN}
       component={ItwCieExpiredOrInvalidScreen}
     />
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.PID.CIE.PIN_SCREEN}
+      name={ITW_ROUTES.ISSUANCE.PID.CIE.PIN_SCREEN}
       component={ItwCiePinScreen}
     />
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.PID.CIE.CARD_READER_SCREEN}
+      name={ITW_ROUTES.ISSUANCE.PID.CIE.CARD_READER_SCREEN}
       component={ItwCieCardReaderScreen}
     />
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.PID.CIE.CONSENT_DATA_USAGE}
+      name={ITW_ROUTES.ISSUANCE.PID.CIE.CONSENT_DATA_USAGE}
       component={ItwCieConsentDataUsageScreen}
     />
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.PID.CIE.WRONG_PIN_SCREEN}
+      name={ITW_ROUTES.ISSUANCE.PID.CIE.WRONG_PIN_SCREEN}
       component={ItwCieWrongPinScreen}
     />
 
-    {/* ISSUING PID */}
+    {/* ISSUANCE PID */}
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.PID.INFO}
-      component={ItwIssuingPidInfoScreen}
+      name={ITW_ROUTES.ISSUANCE.PID.INFO}
+      component={ItwIssuancePidInfoScreen}
     />
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.PID.AUTH}
-      component={ItwIssuingPidAuthScreen}
+      name={ITW_ROUTES.ISSUANCE.PID.AUTH}
+      component={ItwIssuancePidAuthScreen}
     />
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.PID.AUTH_INFO}
+      name={ITW_ROUTES.ISSUANCE.PID.AUTH_INFO}
       component={ItwIssuingPidAuthInfoScreen}
     />
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.PID.REQUEST}
-      component={ItwIssuingPidRequestScreen}
+      name={ITW_ROUTES.ISSUANCE.PID.REQUEST}
+      component={ItwIssuancePidRequestScreen}
     />
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.PID.PREVIEW}
-      component={ItwPidPreviewScreen}
+      name={ITW_ROUTES.ISSUANCE.PID.PREVIEW}
+      component={ItwIssuancePidPreviewScreen}
     />
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.PID.ADDING}
-      component={ItwIssuingPidAddingScreen}
+      name={ITW_ROUTES.ISSUANCE.PID.STORE}
+      component={ItwIssuingPidStoreScreen}
     />
 
-    {/* ISSUING CREDENTIAL */}
+    {/* ISSUANCE CREDENTIAL */}
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.CREDENTIAL.CATALOG}
-      component={ItwIssuingCredentialCatalogScreen}
+      name={ITW_ROUTES.ISSUANCE.CREDENTIAL.CATALOG}
+      component={ItwIssuanceCredentialCatalogScreen}
     />
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.CREDENTIAL.CHECKS}
-      component={ItwIssuingCredentialsChecksScreen}
+      name={ITW_ROUTES.ISSUANCE.CREDENTIAL.CHECKS}
+      component={ItwIssuanceCredentialChecksScreen}
     />
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.CREDENTIAL.AUTH}
-      component={ItwIssuingCredentialAuthScreen}
+      name={ITW_ROUTES.ISSUANCE.CREDENTIAL.AUTH}
+      component={ItwIssuanceCredentialAuthScreen}
     />
     <Stack.Screen
-      name={ITW_ROUTES.ISSUING.CREDENTIAL.PREVIEW}
-      component={ItwIssuingCredentialPreviewScreen}
+      name={ITW_ROUTES.ISSUANCE.CREDENTIAL.PREVIEW}
+      component={ItwIssuanceCredentialPreviewScreen}
     />
 
     {/* PRESENTATION PID */}
@@ -108,7 +108,7 @@ export const ItwStackNavigator = () => (
       component={ItwPrPidDetails}
     />
     <Stack.Screen
-      name={ITW_ROUTES.PRESENTATION.PID.REMOTE.CHECKS}
+      name={ITW_ROUTES.PRESENTATION.PID.REMOTE.INIT}
       component={ItwPrRemotePidChecksScreen}
     />
     <Stack.Screen
@@ -126,8 +126,8 @@ export const ItwStackNavigator = () => (
       component={ItwPrCredentialDetailsScreen}
     />
     <Stack.Screen
-      name={ITW_ROUTES.PRESENTATION.CREDENTIAL.REMOTE.CHECKS}
-      component={ItwPrRemoteCredentialChecksScreen}
+      name={ITW_ROUTES.PRESENTATION.CREDENTIAL.REMOTE.INIT}
+      component={ItwPrRemoteCredentialInitScreen}
     />
     <Stack.Screen
       name={ITW_ROUTES.PRESENTATION.CREDENTIAL.REMOTE.DATA}