diff --git a/.env b/.env index 187caec..0141830 100644 --- a/.env +++ b/.env @@ -6,4 +6,8 @@ TWITTER_URL=https://twitter.com INSTAGRAM_URL=https://www.instagram.com # BACKEND END POINTS -VITE_USERS_ENDPOINT='https://digifi-apidev.chiefsoft.net/employment/v1' \ No newline at end of file +VITE_USERS_ENDPOINT='https://digifi-apidev.chiefsoft.net/employment/v1' + +#BANK NAME +VITE_BANK_NAME='First City Monument Bank' +VITE_BANK_NAME_SHORT='FCMB' \ No newline at end of file diff --git a/.env.development b/.env.development index 9a43031..16c95b2 100644 --- a/.env.development +++ b/.env.development @@ -6,4 +6,8 @@ VITE_TWITTER_URL=https://twitter.com VITE_INSTAGRAM_URL=https://www.instagram.com # BACKEND END POINTS -VITE_USERS_ENDPOINT='https://digifi-apidev.chiefsoft.net/employment/v1' \ No newline at end of file +VITE_USERS_ENDPOINT='https://digifi-apidev.chiefsoft.net/employment/v1' + +#BANK NAME +VITE_BANK_NAME='First City Monument Bank' +VITE_BANK_NAME_SHORT='FCMB' \ No newline at end of file diff --git a/.env.production b/.env.production index 187caec..0141830 100644 --- a/.env.production +++ b/.env.production @@ -6,4 +6,8 @@ TWITTER_URL=https://twitter.com INSTAGRAM_URL=https://www.instagram.com # BACKEND END POINTS -VITE_USERS_ENDPOINT='https://digifi-apidev.chiefsoft.net/employment/v1' \ No newline at end of file +VITE_USERS_ENDPOINT='https://digifi-apidev.chiefsoft.net/employment/v1' + +#BANK NAME +VITE_BANK_NAME='First City Monument Bank' +VITE_BANK_NAME_SHORT='FCMB' \ No newline at end of file diff --git a/src/components/Footer/Footer.tsx b/src/components/Footer/Footer.tsx index 33cddad..4a68637 100644 --- a/src/components/Footer/Footer.tsx +++ b/src/components/Footer/Footer.tsx @@ -8,7 +8,7 @@ export default function Footer() {

- {date} @ First City Monument Bank Limited + {date} @ {import.meta.env.VITE_BANK_NAME} Limited

{renderSocialLinks()} diff --git a/src/components/GetStarted/EmployerValidation.tsx b/src/components/GetStarted/EmployerValidation.tsx index 8c9f14d..d2f1bed 100644 --- a/src/components/GetStarted/EmployerValidation.tsx +++ b/src/components/GetStarted/EmployerValidation.tsx @@ -1,4 +1,4 @@ -import React, {useState} from "react"; +import React from "react"; import { useSelector } from "react-redux"; import { useLocation } from "react-router-dom"; @@ -51,13 +51,15 @@ const validationSchema = Yup.object().shape({ .oneOf([true], "You must accept that the information here is correct"), }); +type Props = { + requestStatus: RequestStatus + setRequestStatus: (value:RequestStatus)=>void +} -const EmployerValidation: React.FC= () => { +const EmployerValidation: React.FC= ({requestStatus, setRequestStatus}:Props) => { const { userDetails } = useSelector((state:StoreState) => state.userDetails); - const [requestStatus, setRequestStatus] = useState({loading:false, status:null, message:'', data:{}}) - const { state:{application_uid, verify_uid} } = useLocation(); const initialValuesNew = {...initialValues, application_uid, verify_uid} @@ -87,199 +89,191 @@ const EmployerValidation: React.FC= () => { return ( <> - {requestStatus.status ? -

- Thank you for completing the process, we will continue further processing with the information provided -

- : - <> - {/* Header */} -
-

- EMPLOYER'S COMMITMENT AND VALIDATION -

-

(This is to be filled and validated by the employer of the applicant)

-
- - {(props)=>( -
-
-

We hereby confirm that Mr {userDetails.firstname} {userDetails.lastname} (The Applicant) who applied for our loan facility is a permanent and confirmed (Non-contract) staff of {userDetails.employer_name} and that he is actively on the company's payroll -

-

We hereby irrevocably and unconditionally undertake to domicile his/her salaries to First City Monument Bank Ltd (FCMB) Accounts number. -

-
-
-
- - -
- {(props.errors.confirm_salary_acct && props.touched.confirm_salary_acct) && {props.errors.confirm_salary_acct} } -
- -
-

We further undertake that we shall not change the domiciliation of the applicant's account from FCMB throughout the tenor of the loan and any extension thereof unless with your written consent stating that the applicant is no longer indebted to the Bank. -

-

We agree to notigy you within 14 days in the event of transfer of the applicant from his/her present location, any change in the employment status or disengagement from the service of our organization or death of the applicant and shall pay his/her benefits, if applicable (excluding Pension Contribution) to the designated FCMB Account number above or issue a cheque or bank draft in favour of We further consent to any additional salary plus facility enhancement that may be obtained by the Beneficiary from your Bank subject to the Bank carrying out a due diligence as to the status of the Beneficiary's employment with our company prior to the approval of the facility Our commitment/consent and undertaking as stated above extends to cover additinal facilities of any kind that may be obtained from your Bank by any of the above mentioned Beneficiary(ies). -

-

This Undertaking is given in good faith and shall remain irrevocable except with the written consent of the Bank. -

-

Thank you.

-
- -
-

- Employers Validation -

-
- -
+ {/* Header */} +
+

+ EMPLOYER'S COMMITMENT AND VALIDATION +

+

(This is to be filled and validated by the employer of the applicant)

+
+ + {(props)=>( + +
+

We hereby confirm that Mr {userDetails.firstname} {userDetails.lastname} (The Applicant) who applied for our loan facility is a permanent and confirmed (Non-contract) staff of {userDetails.employer_name} and that he is actively on the company's payroll +

+

We hereby irrevocably and unconditionally undertake to domicile his/her salaries to {import.meta.env.VITE_BANK_NAME} Ltd ({import.meta.env.VITE_BANK_NAME_SHORT}) Accounts number. +

+
+
+
- -
- - -
- - -
- -
-
- -

We hereby accept that all the information provided about the applicant (your employee) is true and correct to the best of our knowledge -

-
- {props.errors.checked && props.touched.checked && {props.errors.checked}}
+ {(props.errors.confirm_salary_acct && props.touched.confirm_salary_acct) && {props.errors.confirm_salary_acct} } +
-
- +

We further undertake that we shall not change the domiciliation of the applicant's account from {import.meta.env.VITE_BANK_NAME_SHORT} throughout the tenor of the loan and any extension thereof unless with your written consent stating that the applicant is no longer indebted to the Bank. +

+

We agree to notigy you within 14 days in the event of transfer of the applicant from his/her present location, any change in the employment status or disengagement from the service of our organization or death of the applicant and shall pay his/her benefits, if applicable (excluding Pension Contribution) to the designated {import.meta.env.VITE_BANK_NAME_SHORT} Account number above or issue a cheque or bank draft in favour of We further consent to any additional salary plus facility enhancement that may be obtained by the Beneficiary from your Bank subject to the Bank carrying out a due diligence as to the status of the Beneficiary's employment with our company prior to the approval of the facility Our commitment/consent and undertaking as stated above extends to cover additinal facilities of any kind that may be obtained from your Bank by any of the above mentioned Beneficiary(ies). +

+

This Undertaking is given in good faith and shall remain irrevocable except with the written consent of the Bank. +

+

Thank you.

+
+ +
+

+ Employers Validation +

+
+ +
+ + +
+ + +
+ + +
+ +
+
+ - +

We hereby accept that all the information provided about the applicant (your employee) is true and correct to the best of our knowledge +

+ {props.errors.checked && props.touched.checked && {props.errors.checked}} +
+ +
+ + +
- {/* submit button */} -
-
-
- -
- - )} - - - } + {/* submit button */} +
+
+
+ +
+ + )} + ); }; diff --git a/src/components/GetStarted/StartValidation.tsx b/src/components/GetStarted/StartValidation.tsx index 483fe3b..479c88e 100644 --- a/src/components/GetStarted/StartValidation.tsx +++ b/src/components/GetStarted/StartValidation.tsx @@ -1,14 +1,34 @@ +import {useState} from "react"; +import { RequestStatus } from "../../core/models"; import EmployerValidation from "./EmployerValidation"; const StartValidation = () => { + const [requestStatus, setRequestStatus] = useState({loading:false, status:null, message:'', data:{}}) + return ( <> -
-
- + {requestStatus.status ? +
+
+
+
+
+

+ Thank you for completing the process, we will continue further processing with the information provided +

+
+
+
+ : +
+
+ +
+
+ } ); };