From 9b04d8bf3581d162cbd631892ca115df811c46f8 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 9 Jan 2023 08:38:48 -0300 Subject: fix #7152 --- .../src/wallet/AddBackupProvider/index.ts | 15 ++++++--------- .../src/wallet/AddBackupProvider/views.tsx | 16 +--------------- 2 files changed, 7 insertions(+), 24 deletions(-) (limited to 'packages/taler-wallet-webextension/src/wallet/AddBackupProvider') diff --git a/packages/taler-wallet-webextension/src/wallet/AddBackupProvider/index.ts b/packages/taler-wallet-webextension/src/wallet/AddBackupProvider/index.ts index 10fcd84ce..4ec4c0ffe 100644 --- a/packages/taler-wallet-webextension/src/wallet/AddBackupProvider/index.ts +++ b/packages/taler-wallet-webextension/src/wallet/AddBackupProvider/index.ts @@ -16,8 +16,9 @@ import { TalerErrorDetail } from "@gnu-taler/taler-util"; import { SyncTermsOfServiceResponse } from "@gnu-taler/taler-wallet-core"; +import { ErrorAlertView } from "../../components/CurrentAlerts.js"; import { Loading } from "../../components/Loading.js"; -import { HookError } from "../../hooks/useAsyncAsHook.js"; +import { ErrorAlert } from "../../context/alert.js"; import { ButtonHandler, TextFieldHandler, @@ -25,11 +26,7 @@ import { } from "../../mui/handlers.js"; import { compose, StateViewMap } from "../../utils/index.js"; import { useComponentState } from "./state.js"; -import { - ConfirmProviderView, - LoadingUriView, - SelectProviderView, -} from "./views.js"; +import { ConfirmProviderView, SelectProviderView } from "./views.js"; export interface Props { onBack: () => Promise; @@ -50,8 +47,8 @@ export namespace State { } export interface LoadingUriError { - status: "loading-error"; - error: HookError; + status: "error"; + error: ErrorAlert; } export interface ConfirmProvider { @@ -77,7 +74,7 @@ export namespace State { const viewMapping: StateViewMap = { loading: Loading, - "loading-error": LoadingUriView, + error: ErrorAlertView, "select-provider": SelectProviderView, "confirm-provider": ConfirmProviderView, }; diff --git a/packages/taler-wallet-webextension/src/wallet/AddBackupProvider/views.tsx b/packages/taler-wallet-webextension/src/wallet/AddBackupProvider/views.tsx index b633a595f..c3afc0d33 100644 --- a/packages/taler-wallet-webextension/src/wallet/AddBackupProvider/views.tsx +++ b/packages/taler-wallet-webextension/src/wallet/AddBackupProvider/views.tsx @@ -17,12 +17,10 @@ import { Amounts } from "@gnu-taler/taler-util"; import { Fragment, h, VNode } from "preact"; import { Checkbox } from "../../components/Checkbox.js"; -import { LoadingError } from "../../components/LoadingError.js"; import { LightText, SmallLightText, SubTitle, - TermsOfService, Title, } from "../../components/styled/index.js"; import { useTranslationContext } from "../../context/translation.js"; @@ -30,17 +28,6 @@ import { Button } from "../../mui/Button.js"; import { TextField } from "../../mui/TextField.js"; import { State } from "./index.js"; -export function LoadingUriView({ error }: State.LoadingUriError): VNode { - const { i18n } = useTranslationContext(); - - return ( - Could not load} - error={error} - /> - ); -} - export function ConfirmProviderView({ url, provider, @@ -88,9 +75,8 @@ export function ConfirmProviderView({ of service

- {/* replace with */} Accept terms of service} + label={i18n.str`Accept terms of service`} name="terms" onToggle={tos.button.onClick} enabled={tos.value} -- cgit v1.2.3