fix #7152

3 files changed, 19 insertions, 5 deletions

diff --git a/packages/taler-wallet-webextension/src/hooks/useAsyncAsHook.ts b/packages/taler-wallet-webextension/src/hooks/useAsyncAsHook.ts
index 1b2929317..978ea90e1 100644
--- a/packages/taler-wallet-webextension/src/hooks/useAsyncAsHook.ts
+++ b/packages/taler-wallet-webextension/src/hooks/useAsyncAsHook.ts
@@ -16,6 +16,7 @@
 import { TalerErrorDetail } from "@gnu-taler/taler-util";
 import { TalerError } from "@gnu-taler/taler-wallet-core";
 import { useEffect, useMemo, useState } from "preact/hooks";
+import { WalletError } from "../wxApi.js";
 
 export interface HookOk<T> {
   hasError: false;
@@ -26,13 +27,14 @@ export type HookError = HookGenericError | HookOperationalError;
 
 export interface HookGenericError {
   hasError: true;
-  operational: false;
+  type: "error";
   message: string;
 }
 
 export interface HookOperationalError {
   hasError: true;
-  operational: true;
+  type: "taler";
+  message: string;
   details: TalerErrorDetail;
 }
 
@@ -68,13 +70,21 @@ export function useAsyncAsHook<T>(
       if (e instanceof TalerError) {
         setHookResponse({
           hasError: true,
-          operational: true,
+          type: "taler",
+          message: e.message,
           details: e.errorDetail,
         });
+      } else if (e instanceof WalletError) {
+        setHookResponse({
+          hasError: true,
+          type: "taler",
+          message: e.message,
+          details: e.errorDetail.errorDetail,
+        });
       } else if (e instanceof Error) {
         setHookResponse({
           hasError: true,
-          operational: false,
+          type: "error",
           message: e.message,
         });
       }
diff --git a/packages/taler-wallet-webextension/src/hooks/useLang.ts b/packages/taler-wallet-webextension/src/hooks/useLang.ts
index 269fe6239..b1aa40015 100644
--- a/packages/taler-wallet-webextension/src/hooks/useLang.ts
+++ b/packages/taler-wallet-webextension/src/hooks/useLang.ts
@@ -17,6 +17,7 @@
 import { useNotNullLocalStorage } from "./useLocalStorage.js";
 
 function getBrowserLang(): string | undefined {
+  if (typeof window === "undefined") return undefined;
   if (window.navigator.languages) return window.navigator.languages[0];
   if (window.navigator.language) return window.navigator.language;
   return undefined;
diff --git a/packages/taler-wallet-webextension/src/hooks/useLocalStorage.ts b/packages/taler-wallet-webextension/src/hooks/useLocalStorage.ts
index 88b7655b6..387798c96 100644
--- a/packages/taler-wallet-webextension/src/hooks/useLocalStorage.ts
+++ b/packages/taler-wallet-webextension/src/hooks/useLocalStorage.ts
@@ -75,6 +75,9 @@ export function useNotNullLocalStorage(
     }
   };
 
-  const isSaved = window.localStorage.getItem(key) !== null;
+  const isSaved =
+    typeof window === "undefined"
+      ? false
+      : window.localStorage.getItem(key) !== null;
   return [storedValue, setValue, isSaved];
 }