From a1b8e902feeba9f3b0be9e4a96a956e49a12ede6 Mon Sep 17 00:00:00 2001 From: Elena Makarova Date: Wed, 23 Jul 2025 13:05:49 +0300 Subject: [PATCH 1/2] feat(prepareErrorMessage): treat error.data as object --- src/utils/prepareErrorMessage.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/utils/prepareErrorMessage.ts b/src/utils/prepareErrorMessage.ts index fdf995db2a..bfe4fe5199 100644 --- a/src/utils/prepareErrorMessage.ts +++ b/src/utils/prepareErrorMessage.ts @@ -4,8 +4,12 @@ export function prepareErrorMessage(error: unknown) { } if (error && typeof error === 'object') { - if ('data' in error && typeof error.data === 'string') { - return error.data; + if ('data' in error && error.data) { + if (typeof error.data === 'string') { + return error.data; + } else if (typeof error.data === 'object' && 'message' in error.data) { + return error.data.message; + } } else if ('statusText' in error && typeof error.statusText === 'string') { return error.statusText; } else if ('message' in error && typeof error.message === 'string') { From 265675d40e9482b5a821594b91b0773d846e8d06 Mon Sep 17 00:00:00 2001 From: Elena Makarova Date: Wed, 23 Jul 2025 13:09:40 +0300 Subject: [PATCH 2/2] fix: typecheck --- src/utils/prepareErrorMessage.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/utils/prepareErrorMessage.ts b/src/utils/prepareErrorMessage.ts index bfe4fe5199..2b125ae0e1 100644 --- a/src/utils/prepareErrorMessage.ts +++ b/src/utils/prepareErrorMessage.ts @@ -7,7 +7,11 @@ export function prepareErrorMessage(error: unknown) { if ('data' in error && error.data) { if (typeof error.data === 'string') { return error.data; - } else if (typeof error.data === 'object' && 'message' in error.data) { + } else if ( + typeof error.data === 'object' && + 'message' in error.data && + typeof error.data.message === 'string' + ) { return error.data.message; } } else if ('statusText' in error && typeof error.statusText === 'string') {