diff --git a/src/mutations.tsx b/src/mutations.tsx index f6611b837..5fcda0308 100644 --- a/src/mutations.tsx +++ b/src/mutations.tsx @@ -5,6 +5,7 @@ import { Mutation, MutationFunction, MutationResult } from "react-apollo"; import { useIntl } from "react-intl"; import useNotifier from "./hooks/useNotifier"; +import { commonMessages } from "./intl"; export interface TypedMutationInnerProps { children: ( @@ -30,17 +31,10 @@ export function TypedMutation( { - const msg = intl.formatMessage( - { - defaultMessage: "Something went wrong. {errorMessage}", - description: "error message" - }, - { - errorMessage: err.message - } - ); - notify({ text: msg }); + onError={(err: ApolloError) => { + notify({ + text: intl.formatMessage(commonMessages.somethingWentWrong) + }); if (onError) { onError(err); } diff --git a/src/queries.tsx b/src/queries.tsx index bde4cdb04..e3bdda8cd 100644 --- a/src/queries.tsx +++ b/src/queries.tsx @@ -9,6 +9,7 @@ import AppProgress from "./components/AppProgress"; import ErrorPage from "./components/ErrorPage/ErrorPage"; import useNavigator from "./hooks/useNavigator"; import useNotifier from "./hooks/useNotifier"; +import { commonMessages } from "./intl"; import { RequireAtLeastOne } from "./misc"; export interface LoadMore { @@ -83,16 +84,9 @@ export function TypedQuery( > {queryData => { if (queryData.error) { - const msg = intl.formatMessage( - { - defaultMessage: "Something went wrong. {errorMessage}", - description: "error message" - }, - { - message: queryData.error.message - } - ); - pushMessage({ text: msg }); + pushMessage({ + text: intl.formatMessage(commonMessages.somethingWentWrong) + }); } const loadMore = (