From 9ea154237dded87180659d0ab35e3956065963f1 Mon Sep 17 00:00:00 2001 From: LazyAfternoons Date: Fri, 1 Dec 2023 15:39:14 +0100 Subject: [PATCH] chore(IT Wallet): [SIW-605] Rename remaning screens with new schema (#5277) ## Short description This PR is a follow up to #5245 and renames the renaming screens, along with some fixes for some screens which don't follow the same scheme. The naming scheme convention follows the structure of the routes defined in `ItwRoutes.tsx`. While adhering to this convention, some screens underwent slight shortening for practicality. The `cie` folder of the PID issuing doesn't follow this schema because the screens would have a very long name and also because it's a very specific block of screen. ## How to test Static checks should be enough. --------- Co-authored-by: Mario Perrotta --- .../it-wallet/navigation/ItwParamsList.ts | 8 +-- .../navigation/ItwStackNavigator.tsx | 60 +++++++++---------- ...tsx => ItwIssuingCredentialAuthScreen.tsx} | 4 +- ... => ItwIssuingCredentialCatalogScreen.tsx} | 4 +- ...x => ItwIssuingCredentialChecksScreen.tsx} | 4 +- ... => ItwIssuingCredentialPreviewScreen.tsx} | 4 +- ...reen.tsx => ItwIssuingPidAddingScreen.tsx} | 4 +- ...en.tsx => ItwIssuingPidAuthInfoScreen.tsx} | 4 +- ...Screen.tsx => ItwIssuingPidAuthScreen.tsx} | 4 +- ...Screen.tsx => ItwIssuingPidInfoScreen.tsx} | 4 +- ...een.tsx => ItwIssuingPidRequestScreen.tsx} | 13 ++-- ... => ItwPrRemoteCredentialChecksScreen.tsx} | 4 +- ...sx => ItwPrRemoteCredentialDataScreen.tsx} | 4 +- ... => ItwPrRemoteCredentialResultScreen.tsx} | 4 +- ...een.tsx => ItwPrRemotePidChecksScreen.tsx} | 14 ++--- ...creen.tsx => ItwPrRemotePidDataScreen.tsx} | 4 +- ...een.tsx => ItwPrRemotePidResultScreen.tsx} | 4 +- 17 files changed, 75 insertions(+), 72 deletions(-) rename ts/features/it-wallet/screens/issuing/credential/{ItwCredentialAuthScreen.tsx => ItwIssuingCredentialAuthScreen.tsx} (98%) rename ts/features/it-wallet/screens/issuing/credential/{ItwCredentialCatalogScreen.tsx => ItwIssuingCredentialCatalogScreen.tsx} (98%) rename ts/features/it-wallet/screens/issuing/credential/{ItwCredentialChecksScreen.tsx => ItwIssuingCredentialChecksScreen.tsx} (98%) rename ts/features/it-wallet/screens/issuing/credential/{ItwCredentialPreviewScreen.tsx => ItwIssuingCredentialPreviewScreen.tsx} (98%) rename ts/features/it-wallet/screens/issuing/pid/{ItwPidAddingScreen.tsx => ItwIssuingPidAddingScreen.tsx} (97%) rename ts/features/it-wallet/screens/issuing/pid/{ItwPidAuthInfoScreen.tsx => ItwIssuingPidAuthInfoScreen.tsx} (98%) rename ts/features/it-wallet/screens/issuing/pid/{ItwPidAuthScreen.tsx => ItwIssuingPidAuthScreen.tsx} (98%) rename ts/features/it-wallet/screens/issuing/pid/{ItwPidInfoScreen.tsx => ItwIssuingPidInfoScreen.tsx} (97%) rename ts/features/it-wallet/screens/issuing/pid/{ItwPidRequestScreen.tsx => ItwIssuingPidRequestScreen.tsx} (92%) rename ts/features/it-wallet/screens/presentation/remote/credential/{ItwPrCredentialChecksScreen.tsx => ItwPrRemoteCredentialChecksScreen.tsx} (96%) rename ts/features/it-wallet/screens/presentation/remote/credential/{ItwPrCredentialDataScreen.tsx => ItwPrRemoteCredentialDataScreen.tsx} (98%) rename ts/features/it-wallet/screens/presentation/remote/credential/{ItwPrCredentialResultScreen.tsx => ItwPrRemoteCredentialResultScreen.tsx} (97%) rename ts/features/it-wallet/screens/presentation/remote/pid/{ItwPrPidChecksScreen.tsx => ItwPrRemotePidChecksScreen.tsx} (88%) rename ts/features/it-wallet/screens/presentation/remote/pid/{ItwPrPidDataScreen.tsx => ItwPrRemotePidDataScreen.tsx} (98%) rename ts/features/it-wallet/screens/presentation/remote/pid/{ItwPrPidResultScreen.tsx => ItwPrRemotePidResultScreen.tsx} (97%) diff --git a/ts/features/it-wallet/navigation/ItwParamsList.ts b/ts/features/it-wallet/navigation/ItwParamsList.ts index e26917245ff..6e51aa00421 100644 --- a/ts/features/it-wallet/navigation/ItwParamsList.ts +++ b/ts/features/it-wallet/navigation/ItwParamsList.ts @@ -1,9 +1,9 @@ import { ItwPrCredentialDetailsScreenNavigationParams } from "../screens/presentation/ItwPrCredentialDetails"; -import { ItwPidRequestScreenNavigationParams } from "../screens/issuing/pid/ItwPidRequestScreen"; +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 { ItwPrPidChecksScreenNavigationParams } from "../screens/presentation/remote/pid/ItwPrPidChecksScreen"; +import { ItwPrRemotePidChecksScreenNavigationParams } from "../screens/presentation/remote/pid/ItwPrRemotePidChecksScreen"; import { ITW_ROUTES } from "./ItwRoutes"; export type ItwParamsList = { @@ -11,7 +11,7 @@ export type ItwParamsList = { [ITW_ROUTES.ISSUING.PID.INFO]: undefined; [ITW_ROUTES.ISSUING.PID.AUTH]: undefined; [ITW_ROUTES.ISSUING.PID.AUTH_INFO]: undefined; - [ITW_ROUTES.ISSUING.PID.REQUEST]: ItwPidRequestScreenNavigationParams; + [ITW_ROUTES.ISSUING.PID.REQUEST]: ItwIssuingPidRequestScreenNavigationParams; [ITW_ROUTES.ISSUING.PID.PREVIEW]: undefined; [ITW_ROUTES.ISSUING.PID.ADDING]: undefined; @@ -35,7 +35,7 @@ export type ItwParamsList = { // PRESENTATION REMOTE PID [ITW_ROUTES.PRESENTATION.PID.DETAILS]: undefined; [ITW_ROUTES.PRESENTATION.PID.REMOTE - .CHECKS]: ItwPrPidChecksScreenNavigationParams; + .CHECKS]: ItwPrRemotePidChecksScreenNavigationParams; [ITW_ROUTES.PRESENTATION.PID.REMOTE.DATA]: undefined; [ITW_ROUTES.PRESENTATION.PID.REMOTE.RESULT]: undefined; diff --git a/ts/features/it-wallet/navigation/ItwStackNavigator.tsx b/ts/features/it-wallet/navigation/ItwStackNavigator.tsx index d0034ac740f..8b19bed7471 100644 --- a/ts/features/it-wallet/navigation/ItwStackNavigator.tsx +++ b/ts/features/it-wallet/navigation/ItwStackNavigator.tsx @@ -6,25 +6,25 @@ import ItwCieCardReaderScreen from "../screens/issuing/pid/cie/ItwCieCardReaderS 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 ItwPidInfoScreen from "../screens/issuing/pid/ItwPidInfoScreen"; -import ItwPidAuthInfoScreen from "../screens/issuing/pid/ItwPidAuthInfoScreen"; +import ItwIssuingPidInfoScreen from "../screens/issuing/pid/ItwIssuingPidInfoScreen"; +import ItwIssuingPidAuthInfoScreen from "../screens/issuing/pid/ItwIssuingPidAuthInfoScreen"; import ItwPidPreviewScreen from "../screens/issuing/pid/cie/ItwPidPreviewScreen"; -import ItwPidAddingScreen from "../screens/issuing/pid/ItwPidAddingScreen"; +import ItwIssuingPidAddingScreen from "../screens/issuing/pid/ItwIssuingPidAddingScreen"; import ItwPrPidDetails from "../screens/presentation/ItwPrPidDetails"; -import ItwPidRequestScreen from "../screens/issuing/pid/ItwPidRequestScreen"; -import ItwPrPidChecksScreen from "../screens/presentation/remote/pid/ItwPrPidChecksScreen"; -import ItwPrPidResultScreen from "../screens/presentation/remote/pid/ItwPrPidResultScreen"; -import ItwPidAuthScreen from "../screens/issuing/pid/ItwPidAuthScreen"; +import ItwIssuingPidRequestScreen from "../screens/issuing/pid/ItwIssuingPidRequestScreen"; +import ItwPrRemotePidChecksScreen from "../screens/presentation/remote/pid/ItwPrRemotePidChecksScreen"; +import ItwPrRemotePidResultScreen from "../screens/presentation/remote/pid/ItwPrRemotePidResultScreen"; +import ItwIssuingPidAuthScreen from "../screens/issuing/pid/ItwIssuingPidAuthScreen"; import ItwGenericNotAvailableScreen from "../screens/generic/ItwGenericNotAvailableScreen"; -import ItwCredentialPreviewScreen from "../screens/issuing/credential/ItwCredentialPreviewScreen"; -import ItwCredentialAuthScreen from "../screens/issuing/credential/ItwCredentialAuthScreen"; -import ItwPrCredentialChecksScreen from "../screens/presentation/remote/credential/ItwPrCredentialChecksScreen"; -import ItwPrCredentialDataScreen from "../screens/presentation/remote/credential/ItwPrCredentialDataScreen"; -import ItwPrCredentialResultScreen from "../screens/presentation/remote/credential/ItwPrCredentialResultScreen"; -import ItwCredentialsChecksScreen from "../screens/issuing/credential/ItwCredentialChecksScreen"; -import ItwCredentialCatalogScreen from "../screens/issuing/credential/ItwCredentialCatalogScreen"; +import ItwIssuingCredentialPreviewScreen from "../screens/issuing/credential/ItwIssuingCredentialPreviewScreen"; +import ItwIssuingCredentialAuthScreen from "../screens/issuing/credential/ItwIssuingCredentialAuthScreen"; +import ItwPrRemoteCredentialChecksScreen from "../screens/presentation/remote/credential/ItwPrRemoteCredentialChecksScreen"; +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 ItwPrCredentialDetailsScreen from "../screens/presentation/ItwPrCredentialDetails"; -import ItwPrPidDataScreen from "../screens/presentation/remote/pid/ItwPrPidDataScreen"; +import ItwPrRemotePidDataScreen from "../screens/presentation/remote/pid/ItwPrRemotePidDataScreen"; import ItwPrProximityQrCodeScreen from "../screens/presentation/ItwPrProximityQrCodeScreen"; import { ItwParamsList } from "./ItwParamsList"; import { ITW_ROUTES } from "./ItwRoutes"; @@ -61,19 +61,19 @@ export const ItwStackNavigator = () => ( {/* ISSUING PID */} ( /> {/* ISSUING CREDENTIAL */} {/* PRESENTATION PID */} @@ -109,15 +109,15 @@ export const ItwStackNavigator = () => ( /> {/* CREDENTIAL PRESENTATION */} @@ -127,15 +127,15 @@ export const ItwStackNavigator = () => ( /> {/* PRESENTATION PROXIMITY */} diff --git a/ts/features/it-wallet/screens/issuing/credential/ItwCredentialAuthScreen.tsx b/ts/features/it-wallet/screens/issuing/credential/ItwIssuingCredentialAuthScreen.tsx similarity index 98% rename from ts/features/it-wallet/screens/issuing/credential/ItwCredentialAuthScreen.tsx rename to ts/features/it-wallet/screens/issuing/credential/ItwIssuingCredentialAuthScreen.tsx index d816c3e682a..283f7ed2599 100644 --- a/ts/features/it-wallet/screens/issuing/credential/ItwCredentialAuthScreen.tsx +++ b/ts/features/it-wallet/screens/issuing/credential/ItwIssuingCredentialAuthScreen.tsx @@ -39,7 +39,7 @@ import { itwIssuanceChecksDataSelector } from "../../../store/reducers/new/itwIs * This screen displays the information about the credential that is going to be shared * with the issuer. */ -const ItwCredentialAuthScreen = () => { +const ItwIssuingCredentialAuthScreen = () => { const decodedPid = useIOSelector(itwDecodedPidValueSelector); const checks = useIOSelector(itwIssuanceChecksDataSelector); const navigation = useNavigation>(); @@ -211,4 +211,4 @@ const ItwCredentialAuthScreen = () => { ); }; -export default ItwCredentialAuthScreen; +export default ItwIssuingCredentialAuthScreen; diff --git a/ts/features/it-wallet/screens/issuing/credential/ItwCredentialCatalogScreen.tsx b/ts/features/it-wallet/screens/issuing/credential/ItwIssuingCredentialCatalogScreen.tsx similarity index 98% rename from ts/features/it-wallet/screens/issuing/credential/ItwCredentialCatalogScreen.tsx rename to ts/features/it-wallet/screens/issuing/credential/ItwIssuingCredentialCatalogScreen.tsx index 8fb00df527c..c625fc82760 100644 --- a/ts/features/it-wallet/screens/issuing/credential/ItwCredentialCatalogScreen.tsx +++ b/ts/features/it-wallet/screens/issuing/credential/ItwIssuingCredentialCatalogScreen.tsx @@ -31,7 +31,7 @@ const NONE_LOADING = -1; /** * Renders a preview screen which displays a visual representation and the claims contained in the PID. */ -const ItwCredentialCatalogScreen = () => { +const ItwIssuingCredentialCatalogScreen = () => { const dispatch = useIODispatch(); const navigation = useNavigation>(); const preliminaryChecks = useIOSelector(itwIssuanceChecksSelector); @@ -146,4 +146,4 @@ const ItwCredentialCatalogScreen = () => { ); }; -export default ItwCredentialCatalogScreen; +export default ItwIssuingCredentialCatalogScreen; diff --git a/ts/features/it-wallet/screens/issuing/credential/ItwCredentialChecksScreen.tsx b/ts/features/it-wallet/screens/issuing/credential/ItwIssuingCredentialChecksScreen.tsx similarity index 98% rename from ts/features/it-wallet/screens/issuing/credential/ItwCredentialChecksScreen.tsx rename to ts/features/it-wallet/screens/issuing/credential/ItwIssuingCredentialChecksScreen.tsx index 48ecaeba0d7..bde42f1ab53 100644 --- a/ts/features/it-wallet/screens/issuing/credential/ItwCredentialChecksScreen.tsx +++ b/ts/features/it-wallet/screens/issuing/credential/ItwIssuingCredentialChecksScreen.tsx @@ -31,7 +31,7 @@ import ROUTES from "../../../../../navigation/routes"; * Screen that displays the result of the credential issuance checks * by folding the preliminaryChecks pot. */ -const ItwCredentialsChecksScreen = () => { +const ItwIssuingCredentialsChecksScreen = () => { const toast = useIOToast(); const navigation = useNavigation>(); const preliminaryChecks = useIOSelector(itwIssuanceChecksSelector); @@ -147,4 +147,4 @@ const ItwCredentialsChecksScreen = () => { return ; }; -export default ItwCredentialsChecksScreen; +export default ItwIssuingCredentialsChecksScreen; diff --git a/ts/features/it-wallet/screens/issuing/credential/ItwCredentialPreviewScreen.tsx b/ts/features/it-wallet/screens/issuing/credential/ItwIssuingCredentialPreviewScreen.tsx similarity index 98% rename from ts/features/it-wallet/screens/issuing/credential/ItwCredentialPreviewScreen.tsx rename to ts/features/it-wallet/screens/issuing/credential/ItwIssuingCredentialPreviewScreen.tsx index 496b08bdb50..7c2347b36ca 100644 --- a/ts/features/it-wallet/screens/issuing/credential/ItwCredentialPreviewScreen.tsx +++ b/ts/features/it-wallet/screens/issuing/credential/ItwIssuingCredentialPreviewScreen.tsx @@ -43,7 +43,7 @@ import { ITW_ROUTES } from "../../../navigation/ItwRoutes"; /** * Renders a preview screen which displays a visual representation and the claims contained in the credential. */ -const ItwCredentialPreviewScreen = () => { +const ItwIssuingCredentialPreviewScreen = () => { const navigation = useNavigation>(); const issuanceResult = useIOSelector(itwIssuanceResultSelector); const bannerViewRef = React.createRef(); @@ -195,4 +195,4 @@ const ItwCredentialPreviewScreen = () => { return ; }; -export default ItwCredentialPreviewScreen; +export default ItwIssuingCredentialPreviewScreen; diff --git a/ts/features/it-wallet/screens/issuing/pid/ItwPidAddingScreen.tsx b/ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidAddingScreen.tsx similarity index 97% rename from ts/features/it-wallet/screens/issuing/pid/ItwPidAddingScreen.tsx rename to ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidAddingScreen.tsx index 216846a6072..67fa6d66a69 100644 --- a/ts/features/it-wallet/screens/issuing/pid/ItwPidAddingScreen.tsx +++ b/ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidAddingScreen.tsx @@ -20,7 +20,7 @@ import ItwKoView from "../../../components/ItwKoView"; /** * Renders an activation screen which displays a loading screen while the PID is being added and a success screen when the PID is added. */ -const ItwPidAddingScreen = () => { +const ItwIssuingPidAddingScreen = () => { const dispatch = useIODispatch(); const pid = useIOSelector(itwPidValueSelector); const navigation = useNavigation(); @@ -93,4 +93,4 @@ const ItwPidAddingScreen = () => { return ; }; -export default ItwPidAddingScreen; +export default ItwIssuingPidAddingScreen; diff --git a/ts/features/it-wallet/screens/issuing/pid/ItwPidAuthInfoScreen.tsx b/ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidAuthInfoScreen.tsx similarity index 98% rename from ts/features/it-wallet/screens/issuing/pid/ItwPidAuthInfoScreen.tsx rename to ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidAuthInfoScreen.tsx index 130b95bfc11..929bcd4b1bb 100644 --- a/ts/features/it-wallet/screens/issuing/pid/ItwPidAuthInfoScreen.tsx +++ b/ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidAuthInfoScreen.tsx @@ -32,7 +32,7 @@ import { /** * Renders the screen which displays the information about the authentication process to obtain a Wallet Instance. */ -const ItwPidAuthInfoScreen = () => { +const ItwIssuingPidAuthInfoScreen = () => { const navigation = useNavigation(); const dispatch = useIODispatch(); const wia = useIOSelector(itwWiaStateSelector); @@ -131,4 +131,4 @@ const ItwPidAuthInfoScreen = () => { return ; }; -export default ItwPidAuthInfoScreen; +export default ItwIssuingPidAuthInfoScreen; diff --git a/ts/features/it-wallet/screens/issuing/pid/ItwPidAuthScreen.tsx b/ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidAuthScreen.tsx similarity index 98% rename from ts/features/it-wallet/screens/issuing/pid/ItwPidAuthScreen.tsx rename to ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidAuthScreen.tsx index ef49569b0c5..4afdf82e7d8 100644 --- a/ts/features/it-wallet/screens/issuing/pid/ItwPidAuthScreen.tsx +++ b/ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidAuthScreen.tsx @@ -30,7 +30,7 @@ import { useItwInfoBottomSheet } from "../../../hooks/useItwInfoBottomSheet"; * Renders the screen which display a list of features (or trusty providers) * to activate the wallet. */ -const ItwPidAuthScreen = () => { +const ItwIssuingPidAuthScreen = () => { const navigation = useNavigation(); const { present, bottomSheet } = useItwInfoBottomSheet({ @@ -204,4 +204,4 @@ const ItwPidAuthScreen = () => { ); }; -export default ItwPidAuthScreen; +export default ItwIssuingPidAuthScreen; diff --git a/ts/features/it-wallet/screens/issuing/pid/ItwPidInfoScreen.tsx b/ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidInfoScreen.tsx similarity index 97% rename from ts/features/it-wallet/screens/issuing/pid/ItwPidInfoScreen.tsx rename to ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidInfoScreen.tsx index c10a388d708..58a3f98ab22 100644 --- a/ts/features/it-wallet/screens/issuing/pid/ItwPidInfoScreen.tsx +++ b/ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidInfoScreen.tsx @@ -19,7 +19,7 @@ import itwCardImage from "../../../assets/img/issuing/itw_card.png"; import { isAndroid } from "../../../../../utils/platform"; import ItwFooterVerticalButtons from "../../../components/ItwFooterVerticalButtons"; -const ItwPidInfoScreen = () => { +const ItwIssuingPidInfoScreen = () => { const dispatch = useIODispatch(); const navigation = useNavigation(); @@ -98,4 +98,4 @@ const ItwPidInfoScreen = () => { ); }; -export default ItwPidInfoScreen; +export default ItwIssuingPidInfoScreen; diff --git a/ts/features/it-wallet/screens/issuing/pid/ItwPidRequestScreen.tsx b/ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidRequestScreen.tsx similarity index 92% rename from ts/features/it-wallet/screens/issuing/pid/ItwPidRequestScreen.tsx rename to ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidRequestScreen.tsx index 06f53e253d3..02d69744d61 100644 --- a/ts/features/it-wallet/screens/issuing/pid/ItwPidRequestScreen.tsx +++ b/ts/features/it-wallet/screens/issuing/pid/ItwIssuingPidRequestScreen.tsx @@ -24,20 +24,23 @@ import { } from "../../../utils/itwErrorsUtils"; /** - * ItwPidRequestScreen's navigation params. + * ItwIssuingPidRequestScreen's navigation params. * The pidData consists of the data needed to request a PID. */ -export type ItwPidRequestScreenNavigationParams = { +export type ItwIssuingPidRequestScreenNavigationParams = { pidData: PidData; }; /** * Renders a preview screen which requests a PID. */ -const ItwPidRequestScreen = () => { +const ItwIssuingPidRequestScreen = () => { const route = useRoute< - Route<"ITW_ACTIVATION_PID_REQUEST", ItwPidRequestScreenNavigationParams> + Route< + "ITW_ACTIVATION_PID_REQUEST", + ItwIssuingPidRequestScreenNavigationParams + > >(); const navigation = useNavigation>(); const dispatch = useIODispatch(); @@ -110,4 +113,4 @@ const ItwPidRequestScreen = () => { ); }; -export default ItwPidRequestScreen; +export default ItwIssuingPidRequestScreen; diff --git a/ts/features/it-wallet/screens/presentation/remote/credential/ItwPrCredentialChecksScreen.tsx b/ts/features/it-wallet/screens/presentation/remote/credential/ItwPrRemoteCredentialChecksScreen.tsx similarity index 96% rename from ts/features/it-wallet/screens/presentation/remote/credential/ItwPrCredentialChecksScreen.tsx rename to ts/features/it-wallet/screens/presentation/remote/credential/ItwPrRemoteCredentialChecksScreen.tsx index a25296fc1bc..b2c824345f8 100644 --- a/ts/features/it-wallet/screens/presentation/remote/credential/ItwPrCredentialChecksScreen.tsx +++ b/ts/features/it-wallet/screens/presentation/remote/credential/ItwPrRemoteCredentialChecksScreen.tsx @@ -26,7 +26,7 @@ import { getItwGenericMappedError } from "../../../../utils/itwErrorsUtils"; * It shows an error screen if the checks fail. * The view is rendered based on the state of the checks pot. */ -const ItwPrCredentialChecksScreen = () => { +const ItwPrRemoteCredentialChecksScreen = () => { const dispatch = useIODispatch(); const checksPot = useIOSelector(itwPresentationChecksSelector); const navigation = @@ -87,4 +87,4 @@ const ItwPrCredentialChecksScreen = () => { return ; }; -export default ItwPrCredentialChecksScreen; +export default ItwPrRemoteCredentialChecksScreen; diff --git a/ts/features/it-wallet/screens/presentation/remote/credential/ItwPrCredentialDataScreen.tsx b/ts/features/it-wallet/screens/presentation/remote/credential/ItwPrRemoteCredentialDataScreen.tsx similarity index 98% rename from ts/features/it-wallet/screens/presentation/remote/credential/ItwPrCredentialDataScreen.tsx rename to ts/features/it-wallet/screens/presentation/remote/credential/ItwPrRemoteCredentialDataScreen.tsx index 36ed8f2f0b9..9f59e3a699c 100644 --- a/ts/features/it-wallet/screens/presentation/remote/credential/ItwPrCredentialDataScreen.tsx +++ b/ts/features/it-wallet/screens/presentation/remote/credential/ItwPrRemoteCredentialDataScreen.tsx @@ -45,7 +45,7 @@ type ContentViewParams = { * This screen displays the information about the credential that is going to be shared * with the issuer. */ -const ItwPrCredentialDataScreen = () => { +const ItwPrRemoteCredentialDataScreen = () => { const decodedPid = useIOSelector(itwDecodedPidValueSelector); const navigation = useNavigation>(); const rpMock = getRpMock(); @@ -246,4 +246,4 @@ const styles = StyleSheet.create({ } }); -export default ItwPrCredentialDataScreen; +export default ItwPrRemoteCredentialDataScreen; diff --git a/ts/features/it-wallet/screens/presentation/remote/credential/ItwPrCredentialResultScreen.tsx b/ts/features/it-wallet/screens/presentation/remote/credential/ItwPrRemoteCredentialResultScreen.tsx similarity index 97% rename from ts/features/it-wallet/screens/presentation/remote/credential/ItwPrCredentialResultScreen.tsx rename to ts/features/it-wallet/screens/presentation/remote/credential/ItwPrRemoteCredentialResultScreen.tsx index a96d7a3cfd8..6b95ad52d74 100644 --- a/ts/features/it-wallet/screens/presentation/remote/credential/ItwPrCredentialResultScreen.tsx +++ b/ts/features/it-wallet/screens/presentation/remote/credential/ItwPrRemoteCredentialResultScreen.tsx @@ -25,7 +25,7 @@ import { getItwGenericMappedError } from "../../../../utils/itwErrorsUtils"; * It shows an error screen if the checks fail. * The view is rendered based on the state of the checks pot. */ -const ItwPrCredentialResultScreen = () => { +const ItwPrRemoteCredentialResultScreen = () => { const dispatch = useIODispatch(); const resultPot = useIOSelector(itwPresentationResultSelector); const navigation = @@ -95,4 +95,4 @@ const ItwPrCredentialResultScreen = () => { return ; }; -export default ItwPrCredentialResultScreen; +export default ItwPrRemoteCredentialResultScreen; diff --git a/ts/features/it-wallet/screens/presentation/remote/pid/ItwPrPidChecksScreen.tsx b/ts/features/it-wallet/screens/presentation/remote/pid/ItwPrRemotePidChecksScreen.tsx similarity index 88% rename from ts/features/it-wallet/screens/presentation/remote/pid/ItwPrPidChecksScreen.tsx rename to ts/features/it-wallet/screens/presentation/remote/pid/ItwPrRemotePidChecksScreen.tsx index 08a6697b2ed..d8eddaf98b6 100644 --- a/ts/features/it-wallet/screens/presentation/remote/pid/ItwPrPidChecksScreen.tsx +++ b/ts/features/it-wallet/screens/presentation/remote/pid/ItwPrRemotePidChecksScreen.tsx @@ -21,21 +21,21 @@ import { IOStackNavigationProp } from "../../../../../../navigation/params/AppPa import ItwContinueView from "../../../../components/ItwContinueView"; /** - * ItwPrPidChecksScreenNavigationParams's navigation params. + * ItwPrRemotePidChecksScreenNavigationParams's navigation params. * The authReqUrl is the url to use to start the RP flow. */ -export type ItwPrPidChecksScreenNavigationParams = RpData; +export type ItwPrRemotePidChecksScreenNavigationParams = RpData; /** - * Type of the route props for the ItwPidRequestScreen. + * Type of the route props for the ItwIssuingPidRequestScreen. */ -type ItwPrPidChecksScreenRouteProps = RouteProp< +type ItwPrRemotePidChecksScreenRouteProps = RouteProp< ItwParamsList, "ITW_PRESENTATION_PID_REMOTE_CHECKS" >; -const ItwPrPidChecksScreen = () => { - const route = useRoute(); +const ItwPrRemotePidChecksScreen = () => { + const route = useRoute(); const dispatch = useIODispatch(); const navigation = useNavigation>(); const initStatus = useIOSelector(itwRpInitializationSelector); @@ -105,4 +105,4 @@ const ItwPrPidChecksScreen = () => { return ; }; -export default ItwPrPidChecksScreen; +export default ItwPrRemotePidChecksScreen; diff --git a/ts/features/it-wallet/screens/presentation/remote/pid/ItwPrPidDataScreen.tsx b/ts/features/it-wallet/screens/presentation/remote/pid/ItwPrRemotePidDataScreen.tsx similarity index 98% rename from ts/features/it-wallet/screens/presentation/remote/pid/ItwPrPidDataScreen.tsx rename to ts/features/it-wallet/screens/presentation/remote/pid/ItwPrRemotePidDataScreen.tsx index 47306ac9359..fdca6e00050 100644 --- a/ts/features/it-wallet/screens/presentation/remote/pid/ItwPrPidDataScreen.tsx +++ b/ts/features/it-wallet/screens/presentation/remote/pid/ItwPrRemotePidDataScreen.tsx @@ -38,7 +38,7 @@ import { getItwGenericMappedError } from "../../../../utils/itwErrorsUtils"; import ROUTES from "../../../../../../navigation/routes"; import { ForceScrollDownView } from "../../../../../../components/ForceScrollDownView"; -const ItwPrPidDataScreen = () => { +const ItwPrRemotePidDataScreen = () => { const decodedPid = useIOSelector(itwDecodedPidValueSelector); const navigation = useNavigation>(); const { present, bottomSheet } = useItwInfoBottomSheet({ @@ -213,7 +213,7 @@ const ItwPrPidDataScreen = () => { ); }; -export default ItwPrPidDataScreen; +export default ItwPrRemotePidDataScreen; const styles = StyleSheet.create({ secondHeader: { diff --git a/ts/features/it-wallet/screens/presentation/remote/pid/ItwPrPidResultScreen.tsx b/ts/features/it-wallet/screens/presentation/remote/pid/ItwPrRemotePidResultScreen.tsx similarity index 97% rename from ts/features/it-wallet/screens/presentation/remote/pid/ItwPrPidResultScreen.tsx rename to ts/features/it-wallet/screens/presentation/remote/pid/ItwPrRemotePidResultScreen.tsx index 2131373afc9..65b0d12074b 100644 --- a/ts/features/it-wallet/screens/presentation/remote/pid/ItwPrPidResultScreen.tsx +++ b/ts/features/it-wallet/screens/presentation/remote/pid/ItwPrRemotePidResultScreen.tsx @@ -19,7 +19,7 @@ import ROUTES from "../../../../../../navigation/routes"; import ItwKoView from "../../../../components/ItwKoView"; import { getItwGenericMappedError } from "../../../../utils/itwErrorsUtils"; -const ItwPrPidResultScreen = () => { +const ItwPrRemotePidResultScreen = () => { const dispatch = useIODispatch(); const presentationResult = useIOSelector(itwRpPresentationSelector); const rpEntity = useIOSelector(itwRpInitializationEntityValueSelector); @@ -111,4 +111,4 @@ const ItwPrPidResultScreen = () => { return ; }; -export default ItwPrPidResultScreen; +export default ItwPrRemotePidResultScreen;