Update steps title value and fixing logout dialog

src/screens/regularPassport/steps/Step1VerifyNik/Step1VerifyNikSubStep1.tsx

@@ -4,13 +4,13 @@ import {Button} from 'react-native-paper';
 import styles from '../styles';
 import Colors from '../../../../../assets/styles/Colors';
 
-type Step1PersonalInfoSubStep1Props = {
+type Step1VerifyNikSubStep1Props = {
   setSubStep: (val: number) => void;
 };
 
-const Step1PersonalInfoSubStep1 = ({
+const Step1VerifyNikSubStep1 = ({
   setSubStep,
-}: Step1PersonalInfoSubStep1Props) => {
+}: Step1VerifyNikSubStep1Props) => {
   return (
     <ScrollView>
       <View style={styles.subStepContainer}>
@@ -51,4 +51,4 @@ const Step1PersonalInfoSubStep1 = ({
   );
 };
 
-export default Step1PersonalInfoSubStep1;
+export default Step1VerifyNikSubStep1;

src/screens/regularPassport/steps/Step1VerifyNik/Step1VerifyNikSubStep2.tsx

@@ -4,13 +4,13 @@ import {Button} from 'react-native-paper';
 import styles from '../styles';
 import Colors from '../../../../../assets/styles/Colors';
 
-type Step1PersonalInfoSubStep2Props = {
+type Step1VerifyNikSubStep2Props = {
   setSubStep: (val: number) => void;
 };
 
-const Step1PersonalInfoSubStep2 = ({
+const Step1VerifyNikSubStep2 = ({
   setSubStep,
-}: Step1PersonalInfoSubStep2Props) => {
+}: Step1VerifyNikSubStep2Props) => {
   return (
     <ScrollView>
       <View style={styles.subStepContainer}>
@@ -45,4 +45,4 @@ const Step1PersonalInfoSubStep2 = ({
   );
 };
 
-export default Step1PersonalInfoSubStep2;
+export default Step1VerifyNikSubStep2;

src/screens/regularPassport/steps/Step1VerifyNik/Step1VerifyNikSubStep3.tsx

@@ -7,15 +7,15 @@ import genderData from '../../../../data/DropdownData/GenderData';
 import civilStatusData from '../../../../data/DropdownData/CivilStatusData';
 import Colors from '../../../../../assets/styles/Colors';
 
-type Step1PersonalInfoSubStep3Props = {
+type Step1VerifyNikSubStep3Props = {
   setStep: (val: number) => void;
   setSubStep: (val: number) => void;
 };
 
-const Step1PersonalInfoSubStep3 = ({
+const Step1VerifyNikSubStep3 = ({
   setStep,
   setSubStep,
-}: Step1PersonalInfoSubStep3Props) => {
+}: Step1VerifyNikSubStep3Props) => {
   return (
     <ScrollView>
       <View style={styles.subStepContainer}>
@@ -86,4 +86,4 @@ const Step1PersonalInfoSubStep3 = ({
   );
 };
 
-export default Step1PersonalInfoSubStep3;
+export default Step1VerifyNikSubStep3;

src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep1.tsx

@@ -5,7 +5,7 @@ import styles from '../styles';
 import RadioButtonOptionComponent from '../../../../components/RadioButtonOption';
 import hasHadPassportBeforeOptions from '../../../../data/Options/HasHadPassportBeforeOptions';
 
-type Step2SupportingDocsSubStep1Props = {
+type Step2PassportApplicationQuestionnaireSubStep1Props = {
   setStep: (step: number) => void;
   setSubStep: (subStep: number) => void;
   selectedPassportOption: string;
@@ -13,13 +13,13 @@ type Step2SupportingDocsSubStep1Props = {
   showDontHaveYetDialog: () => void;
 };
 
-const Step2SupportingDocsSubStep1 = ({
+const Step2PassportApplicationQuestionnaireSubStep1 = ({
   setStep,
   setSubStep,
   selectedPassportOption,
   setSelectedPassportOption,
   showDontHaveYetDialog,
-}: Step2SupportingDocsSubStep1Props) => {
+}: Step2PassportApplicationQuestionnaireSubStep1Props) => {
   return (
     <View style={styles.subStepContainer}>
       <Pressable
@@ -59,4 +59,4 @@ const Step2SupportingDocsSubStep1 = ({
   );
 };
 
-export default Step2SupportingDocsSubStep1;
+export default Step2PassportApplicationQuestionnaireSubStep1;

src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep10.tsx

@@ -7,13 +7,13 @@ import TextInputComponent from '../../../../components/TextInput';
 import Colors from '../../../../../assets/styles/Colors';
 import familyRelationshipData from '../../../../data/DropdownData/FamilyRelationshipData';
 
-type Step2SupportingDocsSubStep10Props = {
+type Step2PassportApplicationQuestionnaireSubStep10Props = {
   setSubStep: (step: number) => void;
 };
 
-const Step2SupportingDocsSubStep10 = ({
+const Step2PassportApplicationQuestionnaireSubStep10 = ({
   setSubStep,
-}: Step2SupportingDocsSubStep10Props) => {
+}: Step2PassportApplicationQuestionnaireSubStep10Props) => {
   return (
     <ScrollView>
       <View style={styles.subStepContainer}>
@@ -69,4 +69,4 @@ const Step2SupportingDocsSubStep10 = ({
   );
 };
 
-export default Step2SupportingDocsSubStep10;
+export default Step2PassportApplicationQuestionnaireSubStep10;

src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep11.tsx

@@ -10,19 +10,19 @@ import familyRelationshipData from '../../../../data/DropdownData/FamilyRelation
 import RadioButtonOptionComponent from '../../../../components/RadioButtonOption';
 import Colors from '../../../../../assets/styles/Colors';
 
-type Step2SupportingDocsSubStep11Props = {
+type Step2PassportApplicationQuestionnaireSubStep11Props = {
   setStep: (step: number) => void;
   setSubStep: (subStep: number) => void;
   selectedOption: string;
   setSelectedOption: (value: string) => void;
 };
 
-const Step2SupportingDocsSubStep11 = ({
+const Step2PassportApplicationQuestionnaireSubStep11 = ({
   setStep,
   setSubStep,
   selectedOption,
   setSelectedOption,
-}: Step2SupportingDocsSubStep11Props) => {
+}: Step2PassportApplicationQuestionnaireSubStep11Props) => {
   return (
     <ScrollView>
       <View style={styles.subStepContainer}>
@@ -97,4 +97,4 @@ const Step2SupportingDocsSubStep11 = ({
   );
 };
 
-export default Step2SupportingDocsSubStep11;
+export default Step2PassportApplicationQuestionnaireSubStep11;

src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep2.tsx

@@ -7,7 +7,7 @@ import Colors from '../../../../../assets/styles/Colors';
 import RadioButtonOptionComponent from '../../../../components/RadioButtonOption';
 import styles from '../styles';
 
-type Step2SupportingDocsSubStep2Props = {
+type Step2PassportApplicationQuestionnaireSubStep2Props = {
   setSubStep: (step: number) => void;
   selectedOption: string;
   setSelectedOption: (value: string) => void;
@@ -15,13 +15,13 @@ type Step2SupportingDocsSubStep2Props = {
   showLostOrDamagedPassportDialog: () => void;
 };
 
-const Step2SupportingDocsSubStep2 = ({
+const Step2PassportApplicationQuestionnaireSubStep2 = ({
   setSubStep,
   selectedOption,
   setSelectedOption,
   showPassportInfoDialog,
   showLostOrDamagedPassportDialog,
-}: Step2SupportingDocsSubStep2Props) => {
+}: Step2PassportApplicationQuestionnaireSubStep2Props) => {
   return (
     <ScrollView>
       <View style={styles.subStepContainer}>
@@ -94,4 +94,4 @@ const Step2SupportingDocsSubStep2 = ({
   );
 };
 
-export default Step2SupportingDocsSubStep2;
+export default Step2PassportApplicationQuestionnaireSubStep2;

src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep3.tsx

@@ -5,13 +5,13 @@ import {Button} from 'react-native-paper';
 import styles from '../styles';
 import Colors from '../../../../../assets/styles/Colors';
 
-type Step2SupportingDocsSubStep3Props = {
+type Step2PassportApplicationQuestionnaireSubStep3Props = {
   setSubStep: (step: number) => void;
 };
 
-const Step2SupportingDocsSubStep3 = ({
+const Step2PassportApplicationQuestionnaireSubStep3 = ({
   setSubStep,
-}: Step2SupportingDocsSubStep3Props) => {
+}: Step2PassportApplicationQuestionnaireSubStep3Props) => {
   return (
     <ScrollView>
       <View style={styles.subStepContainer}>
@@ -73,4 +73,4 @@ const Step2SupportingDocsSubStep3 = ({
   );
 };
 
-export default Step2SupportingDocsSubStep3;
+export default Step2PassportApplicationQuestionnaireSubStep3;

src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep4.tsx

@@ -5,13 +5,13 @@ import {Button} from 'react-native-paper';
 import styles from '../styles';
 import Colors from '../../../../../assets/styles/Colors';
 
-type Step2SupportingDocsSubStep4Props = {
+type Step2PassportApplicationQuestionnaireSubStep4Props = {
   setSubStep: (step: number) => void;
 };
 
-const Step2SupportingDocsSubStep4 = ({
+const Step2PassportApplicationQuestionnaireSubStep4 = ({
   setSubStep,
-}: Step2SupportingDocsSubStep4Props) => {
+}: Step2PassportApplicationQuestionnaireSubStep4Props) => {
   return (
     <ScrollView>
       <View style={styles.subStepContainer}>
@@ -61,4 +61,4 @@ const Step2SupportingDocsSubStep4 = ({
   );
 };
 
-export default Step2SupportingDocsSubStep4;
+export default Step2PassportApplicationQuestionnaireSubStep4;

src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep5.tsx

@@ -6,13 +6,13 @@ import styles from '../styles';
 import TextInputComponent from '../../../../components/TextInput';
 import Colors from '../../../../../assets/styles/Colors';
 
-type Step2SupportingDocsSubStep5Props = {
+type Step2PassportApplicationQuestionnaireSubStep5Props = {
   setSubStep: (step: number) => void;
 };
 
-const Step2SupportingDocsSubStep5 = ({
+const Step2PassportApplicationQuestionnaireSubStep5 = ({
   setSubStep,
-}: Step2SupportingDocsSubStep5Props) => {
+}: Step2PassportApplicationQuestionnaireSubStep5Props) => {
   return (
     <ScrollView>
       <View style={styles.subStepContainer}>
@@ -61,4 +61,4 @@ const Step2SupportingDocsSubStep5 = ({
   );
 };
 
-export default Step2SupportingDocsSubStep5;
+export default Step2PassportApplicationQuestionnaireSubStep5;

src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep6.tsx

@@ -7,17 +7,17 @@ import styles from '../styles';
 import RadioButtonOptionComponent from '../../../../components/RadioButtonOption';
 import Colors from '../../../../../assets/styles/Colors';
 
-type Step2SupportingDocsSubStep6Props = {
+type Step2PassportApplicationQuestionnaireSubStep6Props = {
   setSubStep: (step: number) => void;
   selectedOption: string;
   setSelectedOption: (val: string) => void;
 };
 
-const Step2SupportingDocsSubStep6 = ({
+const Step2PassportApplicationQuestionnaireSubStep6 = ({
   setSubStep,
   selectedOption,
   setSelectedOption,
-}: Step2SupportingDocsSubStep6Props) => {
+}: Step2PassportApplicationQuestionnaireSubStep6Props) => {
   return (
     <ScrollView>
       <View style={styles.subStepContainer}>
@@ -61,4 +61,4 @@ const Step2SupportingDocsSubStep6 = ({
   );
 };
 
-export default Step2SupportingDocsSubStep6;
+export default Step2PassportApplicationQuestionnaireSubStep6;

src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep7.tsx

@@ -9,17 +9,17 @@ import destinationCountryOptions from '../../../../data/Options/DestinationCount
 import Colors from '../../../../../assets/styles/Colors';
 import countryData from '../../../../data/DropdownData/CountryData';
 
-type Step2SupportingDocsSubStep7Props = {
+type Step2PassportApplicationQuestionnaireSubStep7Props = {
   setSubStep: (step: number) => void;
   selectedOption: string;
   setSelectedOption: (val: string) => void;
 };
 
-const Step2SupportingDocsSubStep7 = ({
+const Step2PassportApplicationQuestionnaireSubStep7 = ({
   setSubStep,
   selectedOption,
   setSelectedOption,
-}: Step2SupportingDocsSubStep7Props) => {
+}: Step2PassportApplicationQuestionnaireSubStep7Props) => {
   return (
     <ScrollView>
       <View style={styles.subStepContainer}>
@@ -66,4 +66,4 @@ const Step2SupportingDocsSubStep7 = ({
   );
 };
 
-export default Step2SupportingDocsSubStep7;
+export default Step2PassportApplicationQuestionnaireSubStep7;

src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep8.tsx

@@ -6,13 +6,13 @@ import styles from '../styles';
 import TextInputComponent from '../../../../components/TextInput';
 import Colors from '../../../../../assets/styles/Colors';
 
-type Step2SupportingDocsSubStep8Props = {
+type Step2PassportApplicationQuestionnaireSubStep8Props = {
   setSubStep: (step: number) => void;
 };
 
-const Step2SupportingDocsSubStep8 = ({
+const Step2PassportApplicationQuestionnaireSubStep8 = ({
   setSubStep,
-}: Step2SupportingDocsSubStep8Props) => {
+}: Step2PassportApplicationQuestionnaireSubStep8Props) => {
   return (
     <ScrollView>
       <View style={styles.subStepContainer}>
@@ -50,4 +50,4 @@ const Step2SupportingDocsSubStep8 = ({
   );
 };
 
-export default Step2SupportingDocsSubStep8;
+export default Step2PassportApplicationQuestionnaireSubStep8;

src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep9.tsx

@@ -7,17 +7,17 @@ import durationAbroadOptions from '../../../../data/Options/DurationAbroadOption
 import RadioButtonOptionComponent from '../../../../components/RadioButtonOption';
 import Colors from '../../../../../assets/styles/Colors';
 
-type Step2SupportingDocsSubStep9Props = {
+type Step2PassportApplicationQuestionnaireSubStep9Props = {
   setSubStep: (step: number) => void;
   selectedOption: string;
   setSelectedOption: (value: string) => void;
 };
 
-const Step2SupportingDocsSubStep9 = ({
+const Step2PassportApplicationQuestionnaireSubStep9 = ({
   setSubStep,
   selectedOption,
   setSelectedOption,
-}: Step2SupportingDocsSubStep9Props) => {
+}: Step2PassportApplicationQuestionnaireSubStep9Props) => {
   return (
     <ScrollView>
       <View style={styles.subStepContainer}>
@@ -61,4 +61,4 @@ const Step2SupportingDocsSubStep9 = ({
   );
 };
 
-export default Step2SupportingDocsSubStep9;
+export default Step2PassportApplicationQuestionnaireSubStep9;

src/screens/regularPassport/steps/Step3UploadDocuments/Step3UploadDocuments.tsx

@@ -19,7 +19,7 @@ interface DocumentUploadSectionProps {
   showDialogCivilStatusDocumentsInfo?: () => void;
 }
 
-interface Step3PaymentProps {
+interface Step3UploadDocumentsProps {
   setStep: (step: number) => void;
   setSubStep: (subStep: number) => void;
   selectedPassportOption: string;
@@ -132,7 +132,7 @@ const DocumentUploadSection = (props: DocumentUploadSectionProps) => {
   );
 };
 
-const Step3Payment = (props: Step3PaymentProps) => {
+const Step3UploadDocuments = (props: Step3UploadDocumentsProps) => {
   const {
     setStep,
     setSubStep,
@@ -263,4 +263,4 @@ const Step3Payment = (props: Step3PaymentProps) => {
   );
 };
 
-export default Step3Payment;
+export default Step3UploadDocuments;

src/screens/regularPassport/steps/Step4ApplicantAdditionalData/Step4ApplicantAdditionalDataSubStep1.tsx

@@ -10,15 +10,15 @@ import districtData from '../../../../data/DropdownData/DistrictData';
 import cityData from '../../../../data/DropdownData/CityData';
 import provinceData from '../../../../data/DropdownData/ProvinceData';
 
-type Step4DataConfirmationSubStep1Props = {
+type Step4ApplicantAdditionalDataSubStep1Props = {
   setStep: (step: number) => void;
   setSubStep: (subStep: number) => void;
   checkedOption: boolean;
   setCheckedOption: React.Dispatch<React.SetStateAction<boolean>>;
 };
 
-const Step4DataConfirmationSubStep1: React.FC<
-  Step4DataConfirmationSubStep1Props
+const Step4ApplicantAdditionalDataSubStep1: React.FC<
+  Step4ApplicantAdditionalDataSubStep1Props
 > = ({setStep, setSubStep, checkedOption, setCheckedOption}) => {
   return (
     <ScrollView>
@@ -162,4 +162,4 @@ const Step4DataConfirmationSubStep1: React.FC<
   );
 };
 
-export default Step4DataConfirmationSubStep1;
+export default Step4ApplicantAdditionalDataSubStep1;

src/screens/regularPassport/steps/Step4ApplicantAdditionalData/Step4ApplicantAdditionalDataSubStep2.tsx

@@ -13,7 +13,7 @@ import {
   getData,
 } from '../../../../helper/asyncStorageHelper';
 
-const Step4DataConfirmationSubStep2 = ({
+const Step4ApplicantAdditionalDataSubStep2 = ({
   setStep,
   setSubStep,
 }: {
@@ -205,4 +205,4 @@ const Step4DataConfirmationSubStep2 = ({
   );
 };
 
-export default Step4DataConfirmationSubStep2;
+export default Step4ApplicantAdditionalDataSubStep2;

src/screens/regularPassport/steps/Step5ApplicationTypeAndApplicantData/Step5ApplicationTypeAndApplicantData.tsx

@@ -7,14 +7,14 @@ import styles from '../styles';
 import {getData} from '../../../../helper/asyncStorageHelper';
 import {PassportAppointment} from '../../../../navigation/type';
 
-type Step5VerificationProps = {
+type Step5ApplicationTypeAndApplicantDataProps = {
   setStep: (step: number) => void;
   setSubStep: (subStep: number) => void;
   passportAppointmentData: any[];
   showEditDataSheet: () => void;
 };
 
-const Step5Content = (props: Step5VerificationProps) => {
+const Step5Content = (props: Step5ApplicationTypeAndApplicantDataProps) => {
   const {setStep, setSubStep, passportAppointmentData, showEditDataSheet} =
     props;
 

src/screens/regularPassport/steps/Step6ApplicationTypeAndApplicantData/Step6ApplicationTypeAndApplicantData.tsx

@@ -8,14 +8,14 @@ import FontFamily from '../../../../../assets/styles/FontFamily';
 import arrivalDateGuidelinesData from '../../../../data/Steps/ArrivalDateGuidelinesData';
 import passportTypeData from '../../../../data/DropdownData/PassportTypeData';
 
-type Step6ProcessingProps = {
+type Step6ApplicationTypeAndApplicantDataProps = {
   showFinalizationConfirmationDialog: () => void;
   showPassportTypeInfoDialog: () => void;
   showSearchLocationSheet: () => void;
   showSelectDateSheet: () => void;
 };
 
-const Step6Processing = (props: Step6ProcessingProps) => {
+const Step6ApplicationTypeAndApplicantData = (props: Step6ApplicationTypeAndApplicantDataProps) => {
   const {
     showFinalizationConfirmationDialog,
     showPassportTypeInfoDialog,
@@ -106,4 +106,4 @@ const Step6Processing = (props: Step6ProcessingProps) => {
   );
 };
 
-export default Step6Processing;
+export default Step6ApplicationTypeAndApplicantData;

src/screens/regularPassport/steps/Step7ApplicationFeeDetails/Step7ApplicationFeeDetails.tsx

@@ -9,12 +9,12 @@ import termsAndConditionsData from '../../../../data/Steps/TermsAndContionsData'
 import {PassportAppointment} from '../../../../navigation/type';
 import {getData} from '../../../../helper/asyncStorageHelper';
 
-type Step7CompletionProps = {
+type Step7ApplicationFeeDetailsProps = {
   showSubmitSuccessDialog: () => void;
   setLastCompletedSteps: () => void;
 };
 
-const Step7Completion = (props: Step7CompletionProps) => {
+const Step7ApplicationFeeDetails = (props: Step7ApplicationFeeDetailsProps) => {
   const {showSubmitSuccessDialog, setLastCompletedSteps} = props;
   const [lastAppointment, setLastAppointment] = useState<PassportAppointment>();
 
@@ -226,4 +226,4 @@ const Step7Completion = (props: Step7CompletionProps) => {
   );
 };
 
-export default Step7Completion;
+export default Step7ApplicationFeeDetails;