From 53af8b486fd8a538c1f54a2ce66ed5f74b2b46ed Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 10 Feb 2023 09:50:54 -0300 Subject: fix: request error is whats being thrown --- .../merchant-backoffice-ui/src/hooks/instance.ts | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'packages/merchant-backoffice-ui/src/hooks/instance.ts') diff --git a/packages/merchant-backoffice-ui/src/hooks/instance.ts b/packages/merchant-backoffice-ui/src/hooks/instance.ts index f118e1e6e..0b00936cd 100644 --- a/packages/merchant-backoffice-ui/src/hooks/instance.ts +++ b/packages/merchant-backoffice-ui/src/hooks/instance.ts @@ -13,14 +13,14 @@ You should have received a copy of the GNU General Public License along with GNU Taler; see the file COPYING. If not, see */ -import useSWR, { useSWRConfig } from "swr"; -import { useBackendContext } from "../context/backend.js"; -import { MerchantBackend } from "../declaration.js"; import { - HttpError, HttpResponse, HttpResponseOk, + RequestError, } from "@gnu-taler/web-util/lib/index.browser"; +import useSWR, { useSWRConfig } from "swr"; +import { useBackendContext } from "../context/backend.js"; +import { MerchantBackend } from "../declaration.js"; import { useBackendBaseRequest, useBackendInstanceRequest, @@ -188,7 +188,7 @@ export function useInstanceDetails(): HttpResponse< const { data, error, isValidating } = useSWR< HttpResponseOk, - HttpError + RequestError >([`/private/`], fetcher, { refreshInterval: 0, refreshWhenHidden: false, @@ -202,7 +202,7 @@ export function useInstanceDetails(): HttpResponse< if (isValidating) return { loading: true, data: data?.data }; if (data) return data; - if (error) return error; + if (error) return error.info; return { loading: true }; } @@ -218,7 +218,7 @@ export function useInstanceKYCDetails(): HttpResponse< const { data, error } = useSWR< HttpResponseOk, - HttpError + RequestError >([`/private/kyc`], fetcher, { refreshInterval: 5000, refreshWhenHidden: false, @@ -235,7 +235,7 @@ export function useInstanceKYCDetails(): HttpResponse< return { ok: true, data: { type: "redirect", status: data.data } }; return { ok: true, data: { type: "ok" } }; } - if (error) return error; + if (error) return error.info; return { loading: true }; } @@ -249,7 +249,7 @@ export function useManagedInstanceDetails( const { data, error, isValidating } = useSWR< HttpResponseOk, - HttpError + RequestError >([`/management/instances/${instanceId}`], request, { refreshInterval: 0, refreshWhenHidden: false, @@ -263,7 +263,7 @@ export function useManagedInstanceDetails( if (isValidating) return { loading: true, data: data?.data }; if (data) return data; - if (error) return error; + if (error) return error.info; return { loading: true }; } @@ -275,11 +275,11 @@ export function useBackendInstances(): HttpResponse< const { data, error, isValidating } = useSWR< HttpResponseOk, - HttpError + RequestError >(["/management/instances"], request); if (isValidating) return { loading: true, data: data?.data }; if (data) return data; - if (error) return error; + if (error) return error.info; return { loading: true }; } -- cgit v1.2.3