Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/layout/PublicApplicationLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export default function PublicApplicationLayout() {
application.status === APPLICATION_STATUS.SUBMITTED ||
application.status === APPLICATION_STATUS.STARTED
) {
if (lastSegment === 'external-onboarding-completed') return;
if (lastSegment !== 'submission-completed') navigate('./submission-completed');
} else if (application.pending_documents || application.status === APPLICATION_STATUS.INFORMATION_REQUESTED) {
if (lastSegment !== 'documents' && lastSegment !== 'confirm-submission') navigate('./documents');
Expand Down
46 changes: 46 additions & 0 deletions src/pages/msme/ExternalOnboardingCompleted.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import { useT } from '@transifex/react';
import Text from 'src/stories/text/Text';
import Title from 'src/stories/title/Title';

import useApplicationContext from '../../hooks/useApplicationContext';

function ExternalOnboardingCompleted() {
const t = useT();
const applicationContext = useApplicationContext();

return (
<>
<Title type="page" label={t('External Onboarding Completed')} className="mb-8" />
<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
<div className="col-span-1 md:col-span-2 md:mr-10">
<Text className="mb-8">
{t('Thank you for confirming that you have already started the onboarding process with {fi_name}. ', {
fi_name: applicationContext.state.data?.lender.name,
})}
</Text>
<div>
<Text className="mb-8">
{t(
'Pending some checks by {fi_name}, we will be in touch via email to let you know if the application has been approved and tell you the next steps for funds to be disbursed to you.',
{
fi_name: applicationContext.state.data?.lender.name,
},
)}
</Text>
</div>
<div>
<Text className="mb-8">
{t(
'In the meantime if you have any questions, you can reach out to member of the Open Contracting Partnership team at: credere@open-contracting.org.',
)}
</Text>
<Text className="mb-8">{t('Thank you for counting with us')}</Text>
<Text className="mb-8">{t('Credere team')}</Text>
</div>
</div>
</div>
</>
);
}

export default ExternalOnboardingCompleted;
5 changes: 3 additions & 2 deletions src/pages/msme/SubmissionCompleted.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ function SubmissionCompleted() {
},
)}
</Text>
{applicationContext.state.data?.lender.external_onboarding_url ? (
{applicationContext.state.data?.lender.external_onboarding_url &&
!applicationContext.state.data?.application.borrower_accessed_external_onboarding_at ? (
<div className="mb-8">
<Text className="mb-8">
{t(
Expand Down Expand Up @@ -63,7 +64,7 @@ function SubmissionCompleted() {
'In the meantime if you have any questions, you can reach out to member of the Open Contracting Partnership team at: credere@open-contracting.org.',
)}
</Text>
<Text className="mb-8">{t('Thank you for counting with us')}</Text>
<Text className="mb-8">{t('Thank you for choosing us')}</Text>
<Text className="mb-8">{t('Credere team')}</Text>
</div>
</div>
Expand Down
5 changes: 5 additions & 0 deletions src/routes/AppRouter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import StageTwo from 'src/pages/fi/StageTwo';
import Decline from 'src/pages/msme/Decline';
import DeclineCompleted from 'src/pages/msme/DeclineCompleted';
import DeclineFeedback from 'src/pages/msme/DeclineFeedback';
import ExternalOnboardingCompleted from 'src/pages/msme/ExternalOnboardingCompleted';
import FrequentlyAskedQuestionsPage from 'src/pages/msme/FrequentlyAskedQuestionsPage';
import IntroMsme from 'src/pages/msme/IntroMsme';
import SubmissionCompleted from 'src/pages/msme/SubmissionCompleted';
Expand Down Expand Up @@ -296,6 +297,10 @@ const router = createBrowserRouter([
path: 'submission-completed',
element: <SubmissionCompleted />,
},
{
path: 'external-onboarding-completed',
element: <ExternalOnboardingCompleted />,
},
{
path: 'decline',
element: <Decline />,
Expand Down
3 changes: 1 addition & 2 deletions src/schemas/application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ export interface IApplication {
award_borrowed_identifier: string;
borrower_id: number;
lender_id?: number;
contract_amount_submitted?: any;
amount_requested?: any;
currency: string;
repayment_months?: number;
Expand All @@ -257,7 +256,7 @@ export interface IApplication {
lender_approved_at?: any;
lender_approved_data: any;
lender_rejected_data: any;
borrower_uploaded_contracted_at?: any;
borrower_accessed_external_onboarding_at?: any;
completed_in_days?: any;
created_at: string;
updated_at: string;
Expand Down