diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js index e7cdc02..a607780 100644 --- a/src/pages/DomandaEditInstructorManager/index.js +++ b/src/pages/DomandaEditInstructorManager/index.js @@ -439,7 +439,7 @@ const DomandaEditInstructorManager = () => { errApproveRejectCallback ); } - }, [data]); + }, [data, motivation]); const doReject = useCallback(() => { if (data.evaluationVersion === 'V1') { @@ -486,7 +486,7 @@ const DomandaEditInstructorManager = () => { errApproveRejectCallback ); } - }, [data]); + }, [data, motivation]); const approveRejectCallback = (data) => { if (data.status === 'SUCCESS') { @@ -617,7 +617,7 @@ const DomandaEditInstructorManager = () => { disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))} label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/> - }, [amountAccepted, data]); + }, [amountAccepted, data, motivation]); const initiateApproving = () => { setOperationType('approve'); diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js index b8b9f4a..448e20d 100644 --- a/src/pages/DomandaEditPreInstructor/index.js +++ b/src/pages/DomandaEditPreInstructor/index.js @@ -438,7 +438,7 @@ const DomandaEditPreInstructor = () => { errApproveRejectCallback ); } - }, [data]); + }, [data, motivation]); const doReject = useCallback(() => { if (data.evaluationVersion === 'V1') { @@ -485,7 +485,7 @@ const DomandaEditPreInstructor = () => { errApproveRejectCallback ); } - }, [data]); + }, [data, motivation]); const approveRejectCallback = (data) => { if (data.status === 'SUCCESS') { @@ -616,7 +616,7 @@ const DomandaEditPreInstructor = () => { disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))} label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/> - }, [amountAccepted, data]); + }, [amountAccepted, data, motivation]); const initiateApproving = () => { setOperationType('approve'); diff --git a/src/service/network-service.js b/src/service/network-service.js index acacaa4..dba6285 100644 --- a/src/service/network-service.js +++ b/src/service/network-service.js @@ -264,7 +264,7 @@ export class NetworkService { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + storeGet.main.getToken(), }, - signal: AbortSignal.timeout(5000) + //signal: AbortSignal.timeout(5000) }) .then(async response => { let status = response.status;