diff --git a/src/components/form/services/validation.service.ts b/src/components/form/services/validation.service.ts index e9cba082..c3763a98 100644 --- a/src/components/form/services/validation.service.ts +++ b/src/components/form/services/validation.service.ts @@ -46,19 +46,19 @@ export function validateInput(data: { answer: any; type: string }, allRules: any break; } } else if (ruleName === Validators.MAX_TODAY && rule.value) { - const unixAnswer = new Date(data.answer.split('-').reverse().join('-')).getTime(); + const unixAnswer = new Date(data?.answer.split('-').reverse().join('-')).getTime(); if (!(unixAnswer > 0 && unixAnswer <= endOfDayDate.getTime())) { result = rule.message; break; } } else if (ruleName === Validators.MIN_TODAY && rule.value) { - const unixAnswer = new Date(data.answer.split('-').reverse().join('-')).getTime(); + const unixAnswer = new Date(data?.answer.split('-').reverse().join('-')).getTime(); if (!(unixAnswer > 0 && unixAnswer >= startOfDayDate.getTime())) { result = rule.message; break; } } else if (ruleName === Validators.PHONE_NUMBER && rule.value) { - if (data.answer.length && data.answer.length !== rule.value) { + if (data?.answer?.length && data.answer.length !== rule.value) { result = rule.message; break; } diff --git a/src/components/utlis/apiHelper.ts b/src/components/utlis/apiHelper.ts index d9c43d37..e0bff016 100644 --- a/src/components/utlis/apiHelper.ts +++ b/src/components/utlis/apiHelper.ts @@ -337,16 +337,16 @@ axiosInstance.interceptors.response.use( ); if ( config?.headers?.donotHandleError || - donotHandleErrorOnStatusCode.includes(error.response.status) + donotHandleErrorOnStatusCode.includes(error?.response?.status) ) { return Promise.reject(error); } - if (!config || config.retry <= 1 || !errorsToRetry.includes(error.response.status)) { + if (!config || config.retry <= 1 || !errorsToRetry.includes(error?.response?.status)) { const errorString = getErrorMessage(error); if ( !config.headers.donotHandleError && (config.headers?.showInSpecificComponents - ? config.headers.showInSpecificComponents?.includes(getCurrentScreen().name) + ? config.headers.showInSpecificComponents?.includes(getCurrentScreen()?.name) : true) ) { if (API_STATUS_CODE.GONE !== response.status) {