- saving progress;

src/pages/BandoApplication/index.js

@@ -174,19 +174,32 @@ const BandoApplication = () => {
     const validateApplicationCallback = (data) => {
         if (data.status === 'SUCCESS') {
             if (data.data.status) {
-                setApplicationStatus(data.data.status); // ask why not 'applicationStatus'?
+                setApplicationStatus(data.data.status);
             }
         }
         storeSet.main.unsetAsyncRequest();
     }
 
     const errValidateApplicationCallback = (data) => {
-        if (toast.current) {
-            toast.current.show({
-                severity: 'error',
-                summary: '',
-                detail: data.message
-            });
+        if (data.status === 'VALIDATION_ERROR') {
+            if (formMsgs.current) {
+                formMsgs.current.show([
+                    {
+                        id: '99',
+                        sticky: true, severity: 'error', summary: '',
+                        detail: data.data.join(' '),
+                        closable: true
+                    }
+                ]);
+            }
+        } else {
+            if (toast.current) {
+                toast.current.show({
+                    severity: 'error',
+                    summary: '',
+                    detail: data.message
+                });
+            }
         }
         storeSet.main.unsetAsyncRequest();
     }
@@ -269,7 +282,7 @@ const BandoApplication = () => {
                     {
                         id: '99',
                         sticky: true, severity: 'error', summary: '',
-                        detail: data.data.join(', '),
+                        detail: data.data.join(' '),
                         closable: true
                     }
                 ]);
@@ -441,7 +454,9 @@ const BandoApplication = () => {
                 icon="pi pi-arrow-right"
                 iconPos="right"/> : null}
         <Button
+            type="button"
             disabled={'SUBMIT' === applicationStatus || isExpired}
+            onClick={onValidate}
             label={__('Convalidare', 'gepafin')}
             icon="pi pi-check"
             iconPos="right"/>
@@ -736,7 +751,7 @@ const BandoApplication = () => {
                                 iconPos="right"/>
                         </div> : null}
 
-                    {'DRAFT' !== applicationStatus
+                    {'AWAITING' === applicationStatus
                         ? <div className="appPageSection">
                             <div className="appForm__field">
                                 <label htmlFor="signedPdfFile">
@@ -759,7 +774,7 @@ const BandoApplication = () => {
                         </div>
                         : null}
 
-                    {'DRAFT' !== applicationStatus
+                    {['AWAITING', 'READY'].includes(applicationStatus)
                         ? <div className="appPageSection">
                             <Button
                                 type="button"