From 9b04d8bf3581d162cbd631892ca115df811c46f8 Mon Sep 17 00:00:00 2001
From: Sebastian <sebasjm@gmail.com>
Date: Mon, 9 Jan 2023 08:38:48 -0300
Subject: fix #7152

---
 .../taler-wallet-webextension/src/cta/Tip/index.ts | 16 +++++--------
 .../taler-wallet-webextension/src/cta/Tip/state.ts | 16 +++++++++++--
 .../taler-wallet-webextension/src/cta/Tip/test.ts  |  9 +++----
 .../src/cta/Tip/views.tsx                          | 28 +++++-----------------
 4 files changed, 29 insertions(+), 40 deletions(-)

(limited to 'packages/taler-wallet-webextension/src/cta/Tip')

diff --git a/packages/taler-wallet-webextension/src/cta/Tip/index.ts b/packages/taler-wallet-webextension/src/cta/Tip/index.ts
index 62e0688be..5e56db7bc 100644
--- a/packages/taler-wallet-webextension/src/cta/Tip/index.ts
+++ b/packages/taler-wallet-webextension/src/cta/Tip/index.ts
@@ -15,17 +15,13 @@
  */
 
 import { AmountJson } from "@gnu-taler/taler-util";
+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 } from "../../mui/handlers.js";
 import { compose, StateViewMap } from "../../utils/index.js";
 import { useComponentState } from "./state.js";
-import {
-  AcceptedView,
-  IgnoredView,
-  LoadingUriView,
-  ReadyView,
-} from "./views.js";
+import { AcceptedView, IgnoredView, ReadyView } from "./views.js";
 
 export interface Props {
   talerTipUri?: string;
@@ -48,8 +44,8 @@ export namespace State {
   }
 
   export interface LoadingUriError {
-    status: "loading-uri";
-    error: HookError;
+    status: "error";
+    error: ErrorAlert;
   }
 
   export interface BaseInfo {
@@ -75,7 +71,7 @@ export namespace State {
 
 const viewMapping: StateViewMap<State> = {
   loading: Loading,
-  "loading-uri": LoadingUriView,
+  error: ErrorAlertView,
   accepted: AcceptedView,
   ignored: IgnoredView,
   ready: ReadyView,
diff --git a/packages/taler-wallet-webextension/src/cta/Tip/state.ts b/packages/taler-wallet-webextension/src/cta/Tip/state.ts
index e83755119..29a9c4c71 100644
--- a/packages/taler-wallet-webextension/src/cta/Tip/state.ts
+++ b/packages/taler-wallet-webextension/src/cta/Tip/state.ts
@@ -16,7 +16,9 @@
 
 import { Amounts } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
+import { alertFromError } 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";
 
@@ -26,6 +28,7 @@ export function useComponentState({
   onSuccess,
 }: Props): State {
   const api = useBackendContext();
+  const { i18n } = useTranslationContext();
   const tipInfo = useAsyncAsHook(async () => {
     if (!talerTipUri) throw Error("ERROR_NO-URI-FOR-TIP");
     const tip = await api.wallet.call(WalletApiOperation.PrepareTip, {
@@ -42,10 +45,19 @@ export function useComponentState({
   }
   if (tipInfo.hasError) {
     return {
-      status: "loading-uri",
-      error: tipInfo,
+      status: "error",
+      error: alertFromError(
+        i18n.str`Could not load the status of the term of service`,
+        tipInfo,
+      ),
     };
   }
+  // if (tipInfo.hasError) {
+  //   return {
+  //     status: "loading-uri",
+  //     error: tipInfo,
+  //   };
+  // }
 
   const { tip } = tipInfo.response;
 
diff --git a/packages/taler-wallet-webextension/src/cta/Tip/test.ts b/packages/taler-wallet-webextension/src/cta/Tip/test.ts
index 5688d82a9..2cc95f424 100644
--- a/packages/taler-wallet-webextension/src/cta/Tip/test.ts
+++ b/packages/taler-wallet-webextension/src/cta/Tip/test.ts
@@ -23,8 +23,7 @@ import { Amounts } from "@gnu-taler/taler-util";
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { expect } from "chai";
 import { tests } from "../../../../web-util/src/index.browser.js";
-import { mountHook, nullFunction } from "../../test-utils.js";
-import { createWalletApiMock } from "../../test-utils.js";
+import { createWalletApiMock, nullFunction } from "../../test-utils.js";
 import { Props } from "./index.js";
 import { useComponentState } from "./state.js";
 
@@ -47,11 +46,9 @@ describe("Tip CTA states", () => {
           expect(error).undefined;
         },
         ({ status, error }) => {
-          expect(status).equals("loading-uri");
+          expect(status).equals("error");
           if (!error) expect.fail();
-          if (!error.hasError) expect.fail();
-          if (error.operational) expect.fail();
-          expect(error.message).eq("ERROR_NO-URI-FOR-TIP");
+          expect(error.cause?.message).eq("ERROR_NO-URI-FOR-TIP");
         },
       ],
       TestingContext,
diff --git a/packages/taler-wallet-webextension/src/cta/Tip/views.tsx b/packages/taler-wallet-webextension/src/cta/Tip/views.tsx
index fbc93c5ab..000daf19e 100644
--- a/packages/taler-wallet-webextension/src/cta/Tip/views.tsx
+++ b/packages/taler-wallet-webextension/src/cta/Tip/views.tsx
@@ -14,9 +14,9 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
+import { TranslatedString } from "@gnu-taler/taler-util";
 import { Fragment, h, VNode } from "preact";
 import { Amount } from "../../components/Amount.js";
-import { LoadingError } from "../../components/LoadingError.js";
 import { LogoHeader } from "../../components/LogoHeader.js";
 import { Part } from "../../components/Part.js";
 import { Link, SubTitle, WalletAction } from "../../components/styled/index.js";
@@ -24,17 +24,6 @@ import { useTranslationContext } from "../../context/translation.js";
 import { Button } from "../../mui/Button.js";
 import { State } from "./index.js";
 
-export function LoadingUriView({ error }: State.LoadingUriError): VNode {
-  const { i18n } = useTranslationContext();
-
-  return (
-    <LoadingError
-      title={<i18n.Translate>Could not load tip status</i18n.Translate>}
-      error={error}
-    />
-  );
-}
-
 export function IgnoredView(state: State.Ignored): VNode {
   const { i18n } = useTranslationContext();
   return (
@@ -66,18 +55,18 @@ export function ReadyView(state: State.Ready): VNode {
           <i18n.Translate>The merchant is offering you a tip</i18n.Translate>
         </p>
         <Part
-          title={<i18n.Translate>Amount</i18n.Translate>}
+          title={i18n.str`Amount`}
           text={<Amount value={state.amount} />}
           kind="positive"
         />
         <Part
-          title={<i18n.Translate>Merchant URL</i18n.Translate>}
-          text={state.merchantBaseUrl}
+          title={i18n.str`Merchant URL`}
+          text={state.merchantBaseUrl as TranslatedString}
           kind="neutral"
         />
         <Part
-          title={<i18n.Translate>Exchange</i18n.Translate>}
-          text={state.exchangeBaseUrl}
+          title={i18n.str`Exchange`}
+          text={state.exchangeBaseUrl as TranslatedString}
           kind="neutral"
         />
       </section>
@@ -92,11 +81,6 @@ export function ReadyView(state: State.Ready): VNode {
           </i18n.Translate>
         </Button>
       </section>
-      <section>
-        <Link upperCased onClick={state.cancel.onClick}>
-          <i18n.Translate>Cancel</i18n.Translate>
-        </Link>
-      </section>
     </WalletAction>
   );
 }
-- 
cgit v1.2.3