6767 <v-row v-if =" applications && userStore.isVerified && (showApplicationCard || showIcraEligibilityCard)" justify =" center" >
6868 <v-col >
6969 <v-row >
70- <v-col v-if =" showIcraEligibilityCard" cols =" 12" :sm =" showTransferCard ? 6 : 12" >
71- <IcraEligibilityCard @cancel-application =" showCancelDialog = true" />
72- </v-col >
73- <v-col v-else-if =" showApplicationCard" cols =" 12" :sm =" showTransferCard ? 6 : 12" >
70+ <v-col v-if =" showApplicationCard" cols =" 12" :sm =" showTransferCard ? 6 : 12" >
7471 <ApplicationCard @cancel-application =" showCancelDialog = true" />
7572 </v-col >
7673 <v-col v-if =" showTransferCard" cols =" 12" sm =" 6" >
7774 <TransferCard />
7875 </v-col >
79- <v-col v-if =" showIcraCard " cols =" 12" sm =" 6 " >
80- <IcraCard />
76+ <v-col v-if =" showIcraEligibilityCard " cols =" 12" : sm =" showTransferCard ? 6 : 12 " >
77+ <IcraEligibilityCard />
8178 </v-col >
8279 </v-row >
8380 </v-col >
@@ -223,7 +220,6 @@ import ActionCard from "@/components/ActionCard.vue";
223220import Alert from " @/components/Alert.vue" ;
224221import ApplicationCard from " @/components/ApplicationCard.vue" ;
225222import TransferCard from " @/components/TransferCard.vue" ;
226- import IcraCard from " @/components/IcraCard.vue" ;
227223import IcraEligibilityCard from " @/components/IcraEligibilityCard.vue" ;
228224import CertificationCard from " @/components/CertificationCard.vue" ;
229225import ConfirmationDialog from " @/components/ConfirmationDialog.vue" ;
@@ -250,7 +246,6 @@ export default defineComponent({
250246 PageContainer ,
251247 ApplicationCard ,
252248 TransferCard ,
253- IcraCard ,
254249 IcraEligibilityCard ,
255250 CertificationCard ,
256251 ECEHeader ,
@@ -343,6 +338,10 @@ export default defineComponent({
343338 return false ;
344339 }
345340
341+ if (this .icraStore .hasIcraEligibilityInProcess ) {
342+ return false ;
343+ }
344+
346345 return (
347346 this .applicationStore .applicationStatus === undefined ||
348347 this .applicationStore .applicationStatus === " Draft" ||
@@ -358,20 +357,21 @@ export default defineComponent({
358357 ! this .icraStore .hasSubmittedIcraEligibility
359358 );
360359 },
361- showIcraCard(): boolean {
362- return (
363- (this .configurationStore .applicationConfiguration .icraFeatureEnabled ?? false ) &&
364- ! this .applicationStore .hasApplication &&
365- ! this .applicationStore .hasDraftApplication &&
366- ! this .icraStore .hasDraftIcraEligibility &&
367- ! this .icraStore .hasSubmittedIcraEligibility
368- );
369- },
370360 showIcraEligibilityCard(): boolean {
371- return (
372- (this .configurationStore .applicationConfiguration .icraFeatureEnabled ?? false ) &&
373- (this .icraStore .hasDraftIcraEligibility || this .icraStore .hasSubmittedIcraEligibility )
374- );
361+ if (this .configurationStore .applicationConfiguration .icraFeatureEnabled === false ) {
362+ return false ;
363+ }
364+ if (this .certificationStore .hasCertifications && this .icraStore .icraEligibilityStatus === undefined ) {
365+ return false ;
366+ }
367+ // do not show if there is an application in process
368+ if (this .applicationStore .hasApplication || this .applicationStore .hasDraftApplication ) {
369+ return false ;
370+ }
371+ if (this .icraStore .hasIcraEligibilityInProcess || this .icraStore .icraEligibilityStatus === undefined ) {
372+ return true ;
373+ }
374+ return false ;
375375 },
376376 showLoading(): boolean {
377377 return (
0 commit comments