Merge branch 'dev' into staging

This commit is contained in:
Nastya 2024-08-24 16:57:29 +03:00
commit 977629f5cb
3 changed files with 8 additions and 1 deletions

@ -34,6 +34,7 @@ export const register = async (
return [registerResponse];
} catch (nativeError) {
const [error] = parseAxiosError(nativeError);
console.log(error)
return [null, `Не удалось зарегестрировать аккаунт. ${error}`];
}

@ -40,7 +40,6 @@ export const useUserAccountFetcher = <T = UserAccount>({
})
.catch((error) => {
devlog("Error fetching user account", error);
if (error.response?.status === 409) return;
if (isAxiosError(error) && error.response?.status === 404) {
createUserAccount(controller.signal, url.replace("get", "create"))
.then((result) => {
@ -48,6 +47,7 @@ export const useUserAccountFetcher = <T = UserAccount>({
onNewUserAccountRef.current(result as T);
})
.catch((error) => {
if (error.response?.status === 409) return;
devlog("Error creating user account", error);
onErrorRef.current?.(error);
});

@ -37,6 +37,12 @@ export const parseAxiosError = (nativeError: unknown): [string, number?] => {
if (error.response?.data) {
const serverError = error.response.data as ServerError;
let SEMessage;
if(error.response.status === 409) {
const serverErrorMessage = error.response.data.message
const translatedMessage = translateMessage[serverErrorMessage.toLowerCase() || ""]
return [translatedMessage || "", serverError.statusCode];
}
// if (error.response.statusText) {
// return [error.response.statusText];