From 7dd9659852c62771580f4f7480ec020a48297570 Mon Sep 17 00:00:00 2001 From: Michael Queyrichon Date: Wed, 6 Sep 2023 09:54:50 +0200 Subject: [PATCH] Remove line about contacting us from error message --- frontend/language/src/en.json | 2 +- frontend/language/src/nb.json | 2 +- .../shared/src/components/ErrorBoundaryFallback.tsx | 5 ++--- .../packages/shared/src/contexts/ServicesContext.tsx | 10 ++-------- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/frontend/language/src/en.json b/frontend/language/src/en.json index caf3cc9d4f2..1e7295862de 100644 --- a/frontend/language/src/en.json +++ b/frontend/language/src/en.json @@ -243,7 +243,7 @@ "general.disabled": "Disabled", "general.edit": "Edit", "general.enabled": "Enabled", - "general.error_message": "An error has occurred! If the problem persists, contact us on Slack.", + "general.error_message": "An error has occurred!", "general.error_message_with_colon": "Error message:", "general.fetch_error_message": "Failed to load required data for this page. Please reload the page to try again", "general.fetch_error_title": "An error occurred while loading", diff --git a/frontend/language/src/nb.json b/frontend/language/src/nb.json index 1f68e1555cd..b7a4b606f77 100644 --- a/frontend/language/src/nb.json +++ b/frontend/language/src/nb.json @@ -267,7 +267,7 @@ "general.disabled": "Deaktivert", "general.edit": "Endre", "general.enabled": "Aktivert", - "general.error_message": "Det har oppstått en feil! Om problemet vedvarer, ta kontakt med oss på Slack.", + "general.error_message": "Det har oppstått en feil!", "general.error_message_with_colon": "Feilmelding:", "general.fetch_error_message": "Kunne ikke laste inn nødvendig data for denne siden. Last siden på nytt for å prøve igjen.", "general.fetch_error_title": "En feil oppstod ved innlasting av", diff --git a/frontend/packages/shared/src/components/ErrorBoundaryFallback.tsx b/frontend/packages/shared/src/components/ErrorBoundaryFallback.tsx index a3113656dbf..d8bc4c024de 100644 --- a/frontend/packages/shared/src/components/ErrorBoundaryFallback.tsx +++ b/frontend/packages/shared/src/components/ErrorBoundaryFallback.tsx @@ -2,8 +2,7 @@ import React from 'react'; import { useErrorBoundary } from 'react-error-boundary'; import { useTranslation } from 'react-i18next'; import { _useIsProdHack } from 'app-shared/utils/_useIsProdHack'; -import { Trans } from 'react-i18next'; -import { Alert, Button, ErrorMessage, Link, Paragraph } from '@digdir/design-system-react'; +import { Alert, Button, ErrorMessage, Paragraph } from '@digdir/design-system-react'; import { Center } from './Center'; import classes from './ErrorBoundaryFallback.module.css'; @@ -18,7 +17,7 @@ export const ErrorBoundaryFallback = ({ error }: ErrorBoundaryFallbackProps) => return (
- Slack }}/> + {t('general.error_message')} {!_useIsProdHack && {error.message}}
diff --git a/frontend/packages/shared/src/contexts/ServicesContext.tsx b/frontend/packages/shared/src/contexts/ServicesContext.tsx index 5e08d32ea90..b160e0c5ca5 100644 --- a/frontend/packages/shared/src/contexts/ServicesContext.tsx +++ b/frontend/packages/shared/src/contexts/ServicesContext.tsx @@ -14,8 +14,7 @@ import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; import { ToastContainer, Slide, toast } from 'react-toastify'; import { ErrorBoundary } from 'react-error-boundary'; import { AxiosError } from 'axios'; -import { Trans, useTranslation } from 'react-i18next'; -import { Link } from '@digdir/design-system-react'; +import { useTranslation } from 'react-i18next'; import { ErrorBoundaryFallback } from '../components/ErrorBoundaryFallback'; import 'react-toastify/dist/ReactToastify.css'; @@ -46,12 +45,7 @@ const handleError = ( return; toast.error( - () => ( - Slack }} - /> - ), + () => t('general.error_message'), { toastId: 'default' } ); };