fix #7152

3 files changed, 23 insertions, 69 deletions

diff --git a/packages/taler-wallet-webextension/src/components/TermsOfService/index.ts b/packages/taler-wallet-webextension/src/components/TermsOfService/index.ts
index d7716f208..a8c1558d8 100644
--- a/packages/taler-wallet-webextension/src/components/TermsOfService/index.ts
+++ b/packages/taler-wallet-webextension/src/components/TermsOfService/index.ts
@@ -15,14 +15,13 @@
  */
 
 import { Loading } from "../../components/Loading.js";
-import { HookError } from "../../hooks/useAsyncAsHook.js";
+import { ErrorAlert } from "../../context/alert.js";
 import { ToggleHandler } from "../../mui/handlers.js";
 import { compose, StateViewMap } from "../../utils/index.js";
+import { ErrorAlertView } from "../CurrentAlerts.js";
 import { useComponentState } from "./state.js";
 import { TermsState } from "./utils.js";
 import {
-  ErrorAcceptingView,
-  LoadingUriView,
   ShowButtonsAcceptedTosView,
   ShowButtonsNonAcceptedTosView,
   ShowTosContentView,
@@ -35,8 +34,7 @@ export interface Props {
 
 export type State =
   | State.Loading
-  | State.LoadingUriError
-  | State.ErrorAccepting
+  | State.Error
   | State.ShowButtonsAccepted
   | State.ShowButtonsNotAccepted
   | State.ShowContent;
@@ -47,14 +45,9 @@ export namespace State {
     error: undefined;
   }
 
-  export interface LoadingUriError {
-    status: "loading-error";
-    error: HookError;
-  }
-
-  export interface ErrorAccepting {
-    status: "error-accepting";
-    error: HookError;
+  export interface Error {
+    status: "error";
+    error: ErrorAlert;
   }
 
   export interface BaseInfo {
@@ -79,11 +72,10 @@ export namespace State {
 
 const viewMapping: StateViewMap<State> = {
   loading: Loading,
-  "loading-error": LoadingUriView,
+  error: ErrorAlertView,
   "show-content": ShowTosContentView,
   "show-buttons-accepted": ShowButtonsAcceptedTosView,
   "show-buttons-not-accepted": ShowButtonsNonAcceptedTosView,
-  "error-accepting": ErrorAcceptingView,
 };
 
 export const TermsOfService = compose(
diff --git a/packages/taler-wallet-webextension/src/components/TermsOfService/state.ts b/packages/taler-wallet-webextension/src/components/TermsOfService/state.ts
index 3b75965d3..c25c0ed13 100644
--- a/packages/taler-wallet-webextension/src/components/TermsOfService/state.ts
+++ b/packages/taler-wallet-webextension/src/components/TermsOfService/state.ts
@@ -16,7 +16,9 @@
 
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { useState } from "preact/hooks";
+import { alertFromError, useAlertContext } from "../../context/alert.js";
 import { useBackendContext } from "../../context/backend.js";
+import { useTranslationContext } from "../../context/translation.js";
 import { useAsyncAsHook } from "../../hooks/useAsyncAsHook.js";
 import { Props, State } from "./index.js";
 import { buildTermsOfServiceState } from "./utils.js";
@@ -25,9 +27,8 @@ export function useComponentState({ exchangeUrl, onChange }: Props): State {
   const api = useBackendContext();
   const readOnly = !onChange;
   const [showContent, setShowContent] = useState<boolean>(readOnly);
-  const [errorAccepting, setErrorAccepting] = useState<Error | undefined>(
-    undefined,
-  );
+  const { i18n } = useTranslationContext();
+  const { pushAlert } = useAlertContext();
 
   /**
    * For the exchange selected, bring the status of the terms of service
@@ -54,22 +55,13 @@ export function useComponentState({ exchangeUrl, onChange }: Props): State {
   }
   if (terms.hasError) {
     return {
-      status: "loading-error",
-      error: terms,
+      status: "error",
+      error: alertFromError(
+        i18n.str`Could not load the status of the term of service`,
+        terms,
+      ),
     };
   }
-
-  if (errorAccepting) {
-    return {
-      status: "error-accepting",
-      error: {
-        hasError: true,
-        operational: false,
-        message: errorAccepting.message,
-      },
-    };
-  }
-
   const { state } = terms.response;
 
   async function onUpdate(accepted: boolean): Promise<void> {
@@ -77,13 +69,13 @@ export function useComponentState({ exchangeUrl, onChange }: Props): State {
 
     try {
       if (accepted) {
-        api.wallet.call(WalletApiOperation.SetExchangeTosAccepted, {
+        await api.wallet.call(WalletApiOperation.SetExchangeTosAccepted, {
           exchangeBaseUrl: exchangeUrl,
           etag: state.version,
         });
       } else {
         // mark as not accepted
-        api.wallet.call(WalletApiOperation.SetExchangeTosAccepted, {
+        await api.wallet.call(WalletApiOperation.SetExchangeTosAccepted, {
           exchangeBaseUrl: exchangeUrl,
           etag: undefined,
         });
@@ -91,11 +83,7 @@ export function useComponentState({ exchangeUrl, onChange }: Props): State {
       // setAccepted(accepted);
       if (!readOnly) onChange(accepted); //external update
     } catch (e) {
-      if (e instanceof Error) {
-        //FIXME: uncomment this and display error
-        // setErrorAccepting(e.message);
-        setErrorAccepting(e);
-      }
+      pushAlert(alertFromError(i18n.str`Could not accept terms of service`, e));
     }
   }
 
diff --git a/packages/taler-wallet-webextension/src/components/TermsOfService/views.tsx b/packages/taler-wallet-webextension/src/components/TermsOfService/views.tsx
index a7e03fd01..0b5a71b3e 100644
--- a/packages/taler-wallet-webextension/src/components/TermsOfService/views.tsx
+++ b/packages/taler-wallet-webextension/src/components/TermsOfService/views.tsx
@@ -14,49 +14,23 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
+import { ExchangeTosStatus } from "@gnu-taler/taler-util";
 import { Fragment, h, VNode } from "preact";
-import { LoadingError } from "../../components/LoadingError.js";
-import { useTranslationContext } from "../../context/translation.js";
-import { TermsDocument, TermsState } from "./utils.js";
-import { State } from "./index.js";
 import { CheckboxOutlined } from "../../components/CheckboxOutlined.js";
+import { ExchangeXmlTos } from "../../components/ExchangeToS.js";
 import {
   LinkSuccess,
   TermsOfService,
   WarningBox,
   WarningText,
 } from "../../components/styled/index.js";
-import { ExchangeXmlTos } from "../../components/ExchangeToS.js";
-import { ToggleHandler } from "../../mui/handlers.js";
+import { useTranslationContext } from "../../context/translation.js";
 import { Button } from "../../mui/Button.js";
-import { ExchangeTosStatus } from "@gnu-taler/taler-util";
-
-export function LoadingUriView({ error }: State.LoadingUriError): VNode {
-  const { i18n } = useTranslationContext();
-
-  return (
-    <LoadingError
-      title={<i18n.Translate>Could not load</i18n.Translate>}
-      error={error}
-    />
-  );
-}
-
-export function ErrorAcceptingView({ error }: State.ErrorAccepting): VNode {
-  const { i18n } = useTranslationContext();
-
-  return (
-    <LoadingError
-      title={<i18n.Translate>Could not load</i18n.Translate>}
-      error={error}
-    />
-  );
-}
+import { State } from "./index.js";
 
 export function ShowButtonsAcceptedTosView({
   termsAccepted,
   showingTermsOfService,
-  terms,
 }: State.ShowButtonsAccepted): VNode {
   const { i18n } = useTranslationContext();
   const ableToReviewTermsOfService =