2110512052/M-Paspor-Redesign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update steps title value and fixing logout dialog

Browse Source
This commit is contained in:
Mochammad Adhi Buchori
2025-04-26 21:28:03 +07:00
parent ac6dae7d17
commit 06b8f2ab80
22 changed files with 170 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/components/dialog/DialogLogout.tsx
View File

@ -17,9 +17,13 @@ const DialogLogout = (props: DialogLogoutProps) => {
<Portal>
<Dialog visible={visible} style={styles.container}>
<Dialog.Title style={styles.title}>
Apakah Anda yakin akan menutup akun?
Apakah Anda ingin keluar dari akun?
</Dialog.Title>
<View style={styles.content}>
<Text style={styles.desc}>
Anda akan keluar dari akun M-Paspor yang sekarang dan akan diarahkan
menuju halaman login.
</Text>
<Button
style={styles.buttonContained}
mode="contained"
@ -28,16 +32,16 @@ const DialogLogout = (props: DialogLogoutProps) => {
hideDialog();
onNavigate();
}}>
Ya, lanjut tutup akun
Ya, Lanjut Keluar Akun
</Button>
<Button
style={styles.buttonOutlined}
mode="outlined"
textColor={Colors.indicatorRed.color}
textColor={Colors.primary30.color}
onPress={() => {
hideDialog();
}}>
Tidak, jangan tutup akun
Tidak, Jangan Keluar
</Button>
</View>
</Dialog>
@ -56,7 +60,14 @@ const styles = StyleSheet.create({
},
title: {
fontSize: 22,
color: Colors.indicatorRed.color,
color: Colors.secondary30.color,
},
desc: {
fontSize: 14,
...FontFamily.notoSansRegular,
includeFontPadding: false,
lineHeight: 22,
color: Colors.primary30.color,
},
content: {
marginHorizontal: 24,
@ -71,9 +82,9 @@ const styles = StyleSheet.create({
color: Colors.primary30.color,
},
buttonContained: {
backgroundColor: Colors.indicatorRed.color,
backgroundColor: Colors.primary30.color,
},
buttonOutlined: {
borderColor: Colors.indicatorRed.color,
borderColor: Colors.primary30.color,
},
});

130
src/screens/regularPassport/index.tsx
View File

@ -13,29 +13,29 @@ import DialogApplicationPassport from '../../components/dialog/DialogApplication
import DialogDontHaveYetPassport from '../../components/dialog/DialogDontHaveYetPassport';
import DialogLostOrDamagedPassport from '../../components/dialog/DialogLostOrDamagedPassport';
import passportAppointmentData from '../../data/History/PassportAppointmentData';
import Step7Completion from './steps/Step7Completion/Step7Completion';
import Step6Processing from './steps/Step6Processing/Step6Processing';
import Step5Verification from './steps/Step5Verification/Step5Verification';
import Step3Payment from './steps/Step3Payment/Step3Payment';
import Step7ApplicationFeeDetails from './steps/Step7ApplicationFeeDetails/Step7ApplicationFeeDetails';
import Step6ApplicationTypeAndApplicantData from './steps/Step6ApplicationTypeAndApplicantData/Step6ApplicationTypeAndApplicantData';
import Step5ApplicationTypeAndApplicantData from './steps/Step5ApplicationTypeAndApplicantData/Step5ApplicationTypeAndApplicantData';
import Step3UploadDocuments from './steps/Step3UploadDocuments/Step3UploadDocuments';
// Options Data
import passportForOptions from '../../data/Options/PassportForOptions';
import Step4DataConfirmationSubStep2 from './steps/Step4DataConfirmation/Step4DataConfirmationSubStep2';
import Step4DataConfirmationSubStep1 from './steps/Step4DataConfirmation/Step4DataConfirmationSubStep1';
import Step1PersonalInfoSubStep1 from './steps/Step1PersonalInfo/Step1PersonalInfoSubStep1';
import Step1PersonalInfoSubStep2 from './steps/Step1PersonalInfo/Step1PersonalInfoSubStep2';
import Step1PersonalInfoSubStep3 from './steps/Step1PersonalInfo/Step1PersonalInfoSubStep3';
import Step2SupportingDocsSubStep1 from './steps/Step2SupportingDocs/Step2SupportingDocsSubStep1';
import Step2SupportingDocsSubStep2 from './steps/Step2SupportingDocs/Step2SupportingDocsSubStep2';
import Step2SupportingDocsSubStep3 from './steps/Step2SupportingDocs/Step2SupportingDocsSubStep3';
import Step2SupportingDocsSubStep4 from './steps/Step2SupportingDocs/Step2SupportingDocsSubStep4';
import Step2SupportingDocsSubStep5 from './steps/Step2SupportingDocs/Step2SupportingDocsSubStep5';
import Step2SupportingDocsSubStep6 from './steps/Step2SupportingDocs/Step2SupportingDocsSubStep6';
import Step2SupportingDocsSubStep7 from './steps/Step2SupportingDocs/Step2SupportingDocsSubStep7';
import Step2SupportingDocsSubStep8 from './steps/Step2SupportingDocs/Step2SupportingDocsSubStep8';
import Step2SupportingDocsSubStep9 from './steps/Step2SupportingDocs/Step2SupportingDocsSubStep9';
import Step2SupportingDocsSubStep10 from './steps/Step2SupportingDocs/Step2SupportingDocsSubStep10';
import Step2SupportingDocsSubStep11 from './steps/Step2SupportingDocs/Step2SupportingDocsSubStep11';
import Step4ApplicantAdditionalDataSubStep2 from './steps/Step4ApplicantAdditionalData/Step4ApplicantAdditionalDataSubStep2';
import Step4ApplicantAdditionalDataSubStep1 from './steps/Step4ApplicantAdditionalData/Step4ApplicantAdditionalDataSubStep1';
import Step1VerifyNikSubStep1 from './steps/Step1VerifyNik/Step1VerifyNikSubStep1';
import Step1VerifyNikSubStep2 from './steps/Step1VerifyNik/Step1VerifyNikSubStep2';
import Step1VerifyNikSubStep3 from './steps/Step1VerifyNik/Step1VerifyNikSubStep3';
import Step2PassportApplicationQuestionnaireSubStep1 from './steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep1';
import Step2PassportApplicationQuestionnaireSubStep2 from './steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep2';
import Step2PassportApplicationQuestionnaireSubStep3 from './steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep3';
import Step2PassportApplicationQuestionnaireSubStep4 from './steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep4';
import Step2PassportApplicationQuestionnaireSubStep5 from './steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep5';
import Step2PassportApplicationQuestionnaireSubStep6 from './steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep6';
import Step2PassportApplicationQuestionnaireSubStep7 from './steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep7';
import Step2PassportApplicationQuestionnaireSubStep8 from './steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep8';
import Step2PassportApplicationQuestionnaireSubStep9 from './steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep9';
import Step2PassportApplicationQuestionnaireSubStep10 from './steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep10';
import Step2PassportApplicationQuestionnaireSubStep11 from './steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep11';
import DialogCivilStatusDocumentsInfo from '../../components/dialog/DialogCivilStatusDocumentsInfo';
import DialogSubmitSuccess from '../../components/dialog/DialogSubmitSuccess';
import DialogFinalizationConfirmation from '../../components/dialog/DialogFinalizationConfirmation';
@ -104,15 +104,12 @@ const RenderApplicationStepsContent = (
if (step === 1) {
switch (subStep) {
case 1:
return <Step1PersonalInfoSubStep1 setSubStep={setSubStep} />;
return <Step1VerifyNikSubStep1 setSubStep={setSubStep} />;
case 2:
return <Step1PersonalInfoSubStep2 setSubStep={setSubStep} />;
return <Step1VerifyNikSubStep2 setSubStep={setSubStep} />;
case 3:
return (
<Step1PersonalInfoSubStep3
setStep={setStep}
setSubStep={setSubStep}
/>
<Step1VerifyNikSubStep3 setStep={setStep} setSubStep={setSubStep} />
);
default:
return null;
@ -123,7 +120,7 @@ const RenderApplicationStepsContent = (
switch (subStep) {
case 1:
return (
<Step2SupportingDocsSubStep1
<Step2PassportApplicationQuestionnaireSubStep1
setStep={setStep}
setSubStep={setSubStep}
selectedPassportOption={selectedPassportOption}
@ -133,7 +130,7 @@ const RenderApplicationStepsContent = (
);
case 2:
return (
<Step2SupportingDocsSubStep2
<Step2PassportApplicationQuestionnaireSubStep2
setSubStep={setSubStep}
selectedOption={selectedOption}
setSelectedOption={setSelectedOption}
@ -142,14 +139,26 @@ const RenderApplicationStepsContent = (
/>
);
case 3:
return <Step2SupportingDocsSubStep3 setSubStep={setSubStep} />;
return (
<Step2PassportApplicationQuestionnaireSubStep3
setSubStep={setSubStep}
/>
);
case 4:
return <Step2SupportingDocsSubStep4 setSubStep={setSubStep} />;
return (
<Step2PassportApplicationQuestionnaireSubStep4
setSubStep={setSubStep}
/>
);
case 5:
return <Step2SupportingDocsSubStep5 setSubStep={setSubStep} />;
return (
<Step2PassportApplicationQuestionnaireSubStep5
setSubStep={setSubStep}
/>
);
case 6:
return (
<Step2SupportingDocsSubStep6
<Step2PassportApplicationQuestionnaireSubStep6
setSubStep={setSubStep}
selectedOption={selectedOption}
setSelectedOption={setSelectedOption}
@ -157,27 +166,35 @@ const RenderApplicationStepsContent = (
);
case 7:
return (
<Step2SupportingDocsSubStep7
<Step2PassportApplicationQuestionnaireSubStep7
setSubStep={setSubStep}
selectedOption={selectedOption}
setSelectedOption={setSelectedOption}
/>
);
case 8:
return <Step2SupportingDocsSubStep8 setSubStep={setSubStep} />;
return (
<Step2PassportApplicationQuestionnaireSubStep8
setSubStep={setSubStep}
/>
);
case 9:
return (
<Step2SupportingDocsSubStep9
<Step2PassportApplicationQuestionnaireSubStep9
setSubStep={setSubStep}
selectedOption={selectedOption}
setSelectedOption={setSelectedOption}
/>
);
case 10:
return <Step2SupportingDocsSubStep10 setSubStep={setSubStep} />;
return (
<Step2PassportApplicationQuestionnaireSubStep10
setSubStep={setSubStep}
/>
);
case 11:
return (
<Step2SupportingDocsSubStep11
<Step2PassportApplicationQuestionnaireSubStep11
setStep={setStep}
setSubStep={setSubStep}
selectedOption={selectedOption}
@ -193,7 +210,7 @@ const RenderApplicationStepsContent = (
switch (subStep) {
case 1:
return (
<Step4DataConfirmationSubStep1
<Step4ApplicantAdditionalDataSubStep1
setStep={setStep}
setSubStep={setSubStep}
checkedOption={checkedOption}
@ -202,7 +219,7 @@ const RenderApplicationStepsContent = (
);
case 2:
return (
<Step4DataConfirmationSubStep2
<Step4ApplicantAdditionalDataSubStep2
setStep={setStep}
setSubStep={setSubStep}
/>
@ -212,7 +229,7 @@ const RenderApplicationStepsContent = (
switch (step) {
case 3:
return (
<Step3Payment
<Step3UploadDocuments
setStep={setStep}
setSubStep={setSubStep}
selectedPassportOption={selectedPassportOption}
@ -223,7 +240,7 @@ const RenderApplicationStepsContent = (
);
case 5:
return (
<Step5Verification
<Step5ApplicationTypeAndApplicantData
setStep={setStep}
setSubStep={setSubStep}
passportAppointmentData={passportAppointmentData}
@ -232,7 +249,7 @@ const RenderApplicationStepsContent = (
);
case 6:
return (
<Step6Processing
<Step6ApplicationTypeAndApplicantData
showFinalizationConfirmationDialog={
showFinalizationConfirmationDialog
}
@ -243,7 +260,7 @@ const RenderApplicationStepsContent = (
);
case 7:
return (
<Step7Completion
<Step7ApplicationFeeDetails
showSubmitSuccessDialog={showSubmitSuccessDialog}
setLastCompletedSteps={setLastCompletedSteps}
/>
@ -386,13 +403,24 @@ function RegularPassportScreen() {
const hideSelectDateSheet = () => setVisibleSelectDateSheet(false);
const stepTitles: {[key: number]: string} = {
1: 'Informasi Pribadi',
2: 'Dokumen Pendukung',
3: 'Pembayaran',
4: 'Konfirmasi Data',
5: 'Verifikasi',
6: 'Pemrosesan',
7: 'Selesai',
1: 'Verifikasi NIK',
2: 'Kuesioner Permohonan Paspor (PERDIM)',
3: 'Unggah Dokumen',
4: 'Data Tambahan Pemohon',
5: 'Jenis Permohonan dan Data Pemohon',
6: 'Jenis Permohonan dan Data Pemohon',
7: 'Rincian Biaya Permohonan',
};
const getStepTitle = (step: number, subStep: number) => {
if (step === 4) {
if (subStep === 1) {
return 'Data Tambahan Pemohon (1/2)';
} else if (subStep === 2) {
return 'Data Tambahan Pemohon (2/2)';
}
}
return stepTitles[step];
};
// Back handler for showing/hiding steps content
@ -434,7 +462,7 @@ function RegularPassportScreen() {
const renderApplicationStepsContent = showApplicationStepsContent ? (
<>
<View style={styles.applicationStepsContainer}>
<Text style={styles.stepTitle}>{stepTitles[step]}</Text>
<Text style={styles.stepTitle}>{getStepTitle(step, subStep)}</Text>
<StepIndicator
currentStep={step}
totalSteps={7}

8
src/screens/regularPassport/steps/Step1PersonalInfo/Step1PersonalInfoSubStep1.tsx → src/screens/regularPassport/steps/Step1VerifyNik/Step1VerifyNikSubStep1.tsx
View File

@ -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;

8
src/screens/regularPassport/steps/Step1PersonalInfo/Step1PersonalInfoSubStep2.tsx → src/screens/regularPassport/steps/Step1VerifyNik/Step1VerifyNikSubStep2.tsx
View File

@ -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;

8
src/screens/regularPassport/steps/Step1PersonalInfo/Step1PersonalInfoSubStep3.tsx → src/screens/regularPassport/steps/Step1VerifyNik/Step1VerifyNikSubStep3.tsx
View File

@ -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;

8
src/screens/regularPassport/steps/Step2SupportingDocs/Step2SupportingDocsSubStep1.tsx → src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep1.tsx
View File

@ -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;

8
src/screens/regularPassport/steps/Step2SupportingDocs/Step2SupportingDocsSubStep10.tsx → src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep10.tsx
View File

@ -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;

8
src/screens/regularPassport/steps/Step2SupportingDocs/Step2SupportingDocsSubStep11.tsx → src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep11.tsx
View File

@ -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;

8
src/screens/regularPassport/steps/Step2SupportingDocs/Step2SupportingDocsSubStep2.tsx → src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep2.tsx
View File

@ -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;

8
src/screens/regularPassport/steps/Step2SupportingDocs/Step2SupportingDocsSubStep3.tsx → src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep3.tsx
View File

@ -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;

8
src/screens/regularPassport/steps/Step2SupportingDocs/Step2SupportingDocsSubStep4.tsx → src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep4.tsx
View File

@ -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;

8
src/screens/regularPassport/steps/Step2SupportingDocs/Step2SupportingDocsSubStep5.tsx → src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep5.tsx
View File

@ -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;

8
src/screens/regularPassport/steps/Step2SupportingDocs/Step2SupportingDocsSubStep6.tsx → src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep6.tsx
View File

@ -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;

8
src/screens/regularPassport/steps/Step2SupportingDocs/Step2SupportingDocsSubStep7.tsx → src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep7.tsx
View File

@ -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;

8
src/screens/regularPassport/steps/Step2SupportingDocs/Step2SupportingDocsSubStep8.tsx → src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep8.tsx
View File

@ -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;

8
src/screens/regularPassport/steps/Step2SupportingDocs/Step2SupportingDocsSubStep9.tsx → src/screens/regularPassport/steps/Step2PassportApplicationQuestionnaire/Step2PassportApplicationQuestionnaireSubStep9.tsx
View File

@ -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;

6
src/screens/regularPassport/steps/Step3Payment/Step3Payment.tsx → src/screens/regularPassport/steps/Step3UploadDocuments/Step3UploadDocuments.tsx
View File

@ -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;

8
src/screens/regularPassport/steps/Step4DataConfirmation/Step4DataConfirmationSubStep1.tsx → src/screens/regularPassport/steps/Step4ApplicantAdditionalData/Step4ApplicantAdditionalDataSubStep1.tsx
View File

@ -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;

4
src/screens/regularPassport/steps/Step4DataConfirmation/Step4DataConfirmationSubStep2.tsx → src/screens/regularPassport/steps/Step4ApplicantAdditionalData/Step4ApplicantAdditionalDataSubStep2.tsx
View File

@ -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;

4
src/screens/regularPassport/steps/Step5Verification/Step5Verification.tsx → src/screens/regularPassport/steps/Step5ApplicationTypeAndApplicantData/Step5ApplicationTypeAndApplicantData.tsx
View File

@ -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;

6
src/screens/regularPassport/steps/Step6Processing/Step6Processing.tsx → src/screens/regularPassport/steps/Step6ApplicationTypeAndApplicantData/Step6ApplicationTypeAndApplicantData.tsx
View File

@ -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;

6
src/screens/regularPassport/steps/Step7Completion/Step7Completion.tsx → src/screens/regularPassport/steps/Step7ApplicationFeeDetails/Step7ApplicationFeeDetails.tsx
View File

@ -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;