diff --git a/src/siteSettings/components/SiteSettingsKeyDialog/SiteSettingsKeyDialog.tsx b/src/siteSettings/components/SiteSettingsKeyDialog/SiteSettingsKeyDialog.tsx index 7affac29d..11d394df0 100644 --- a/src/siteSettings/components/SiteSettingsKeyDialog/SiteSettingsKeyDialog.tsx +++ b/src/siteSettings/components/SiteSettingsKeyDialog/SiteSettingsKeyDialog.tsx @@ -12,7 +12,7 @@ import { FormSpacer } from "@saleor/components/FormSpacer"; import SingleSelectField from "@saleor/components/SingleSelectField"; import { buttonMessages } from "@saleor/intl"; import { DialogProps } from "@saleor/types"; -import { getFieldError, getFormErrors } from "@saleor/utils/errors"; +import { getFormErrors } from "@saleor/utils/errors"; import { ShopErrorFragment } from "@saleor/siteSettings/types/ShopErrorFragment"; import getShopErrorMessage from "@saleor/utils/errors/shop"; import { authorizationKeyTypes } from "../../../misc"; diff --git a/src/siteSettings/views/index.tsx b/src/siteSettings/views/index.tsx index 9ae2347c4..2d33440d7 100644 --- a/src/siteSettings/views/index.tsx +++ b/src/siteSettings/views/index.tsx @@ -51,14 +51,7 @@ export const SiteSettings: React.FC = ({ params }) => { }); } else { notify({ - text: intl.formatMessage( - { - defaultMessage: "Could not delete authorization key: {errorMessage}" - }, - { - errorMessage: data.authorizationKeyDelete.errors[0].message - } - ) + text: intl.formatMessage(commonMessages.somethingWentWrong) }); } }; diff --git a/src/storybook/stories/siteSettings/SiteSettingsKeyDialog.tsx b/src/storybook/stories/siteSettings/SiteSettingsKeyDialog.tsx index 37373abab..dc2bb1b0e 100644 --- a/src/storybook/stories/siteSettings/SiteSettingsKeyDialog.tsx +++ b/src/storybook/stories/siteSettings/SiteSettingsKeyDialog.tsx @@ -4,9 +4,11 @@ import React from "react"; import SiteSettingsKeyDialog, { SiteSettingsKeyDialogProps } from "../../../siteSettings/components/SiteSettingsKeyDialog"; -import { AuthorizationKeyType } from "../../../types/globalTypes"; +import { + AuthorizationKeyType, + ShopErrorCode +} from "../../../types/globalTypes"; import Decorator from "../../Decorator"; -import { formError } from "../../misc"; const props: SiteSettingsKeyDialogProps = { errors: [], @@ -26,6 +28,10 @@ storiesOf("SiteSettings / Add key dialog", module) .add("form errors", () => ( formError(field))} + errors={["key", "password", "keyType"].map(field => ({ + __typename: "ShopError", + code: ShopErrorCode.INVALID, + field + }))} /> ));