From 1403e5651f749106f198164bd474f823acd3cb26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Sj=C3=B6kvist?= Date: Tue, 5 Nov 2024 20:19:44 +0100 Subject: [PATCH] fix isFGCTrackerError fn --- gui/src/main/app-error.tsx | 2 +- pkg/model/error.go | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gui/src/main/app-error.tsx b/gui/src/main/app-error.tsx index 27814d3..7f899f5 100644 --- a/gui/src/main/app-error.tsx +++ b/gui/src/main/app-error.tsx @@ -34,7 +34,7 @@ export function PageErrorBoundary() { ) } -const isFGCTrackerError = (error: unknown) => error instanceof Object && 'translationKey' in error +const isFGCTrackerError = (error: unknown) => error instanceof Object && 'localizationKey' in error function useFGCTrackerError() { const thrownError = useRouteError() diff --git a/pkg/model/error.go b/pkg/model/error.go index 09aae6d..00e6c81 100644 --- a/pkg/model/error.go +++ b/pkg/model/error.go @@ -74,8 +74,11 @@ type FGCTrackerError struct { } func NewError(fmtErr *FGCTrackerError, err error) *FGCTrackerError { - fmtErr.InnerError = fmt.Errorf("%w: %w", fmtErr.InnerError, err) - return fmtErr + return &FGCTrackerError{ + LocalizationKey: fmtErr.LocalizationKey, + Message: fmtErr.Message, + InnerError: fmt.Errorf("%w: %w", fmtErr.InnerError, err), + } } func newError(key ErrorLocalizationKey, err error) *FGCTrackerError {