diff --git a/portal-ui/src/screens/Console/Account/Account.tsx b/portal-ui/src/screens/Console/Account/Account.tsx index 57f15cd26..753fa8b6f 100644 --- a/portal-ui/src/screens/Console/Account/Account.tsx +++ b/portal-ui/src/screens/Console/Account/Account.tsx @@ -47,7 +47,7 @@ import { errorToHandler } from "api/errors"; import HelpMenu from "../HelpMenu"; import { ACCOUNT_TABLE_COLUMNS } from "./AccountUtils"; import { useAppDispatch } from "store"; -import { ApiError, ServiceAccounts } from "api/consoleApi"; +import { ServiceAccounts } from "api/consoleApi"; import { setErrorSnackMessage, setHelpName, @@ -104,9 +104,12 @@ const Account = () => { const sortedRows = res.data.sort(usersSort); setRecords(sortedRows); }) - .catch(async (res) => { - const err = (await res.json()) as ApiError; - dispatch(setErrorSnackMessage(errorToHandler(err))); + .catch((res) => { + dispatch( + setErrorSnackMessage( + errorToHandler(res?.error || "Error retrieving access keys"), + ), + ); setLoading(false); }); } diff --git a/portal-ui/src/screens/Console/Account/AddServiceAccountScreen.tsx b/portal-ui/src/screens/Console/Account/AddServiceAccountScreen.tsx index 17d0a94b9..7429a52a7 100644 --- a/portal-ui/src/screens/Console/Account/AddServiceAccountScreen.tsx +++ b/portal-ui/src/screens/Console/Account/AddServiceAccountScreen.tsx @@ -35,7 +35,7 @@ import { IAM_PAGES } from "../../../common/SecureComponent/permissions"; import { setErrorSnackMessage, setHelpName } from "../../../systemSlice"; import { api } from "api"; import { errorToHandler } from "api/errors"; -import { ApiError, ContentType } from "api/consoleApi"; +import { ContentType } from "api/consoleApi"; import CodeMirrorWrapper from "../Common/FormComponents/CodeMirrorWrapper/CodeMirrorWrapper"; import AddServiceAccountHelpBox from "./AddServiceAccountHelpBox"; import CredentialsPrompt from "../Common/CredentialsPrompt/CredentialsPrompt"; @@ -83,10 +83,9 @@ const AddServiceAccount = () => { }); }) - .catch(async (res) => { + .catch((res) => { setAddSending(false); - const err = (await res.json()) as ApiError; - dispatch(setErrorSnackMessage(errorToHandler(err))); + dispatch(setErrorSnackMessage(errorToHandler(res.error))); }); } }, [addSending, setAddSending, dispatch, policyJSON, accessKey, secretKey]);