1 files changed, 31 insertions, 16 deletions

diff --git a/packages/web-util/src/hooks/useNotifications.ts b/packages/web-util/src/hooks/useNotifications.ts
index 33e0cdf53..9f955f92d 100644
--- a/packages/web-util/src/hooks/useNotifications.ts
+++ b/packages/web-util/src/hooks/useNotifications.ts
@@ -1,4 +1,4 @@
-import { OperationFail, OperationOk, OperationResult, TalerError, TalerErrorCode, TranslatedString } from "@gnu-taler/taler-util";
+import { Duration, OperationFail, OperationOk, OperationResult, TalerError, TalerErrorCode, TranslatedString } from "@gnu-taler/taler-util";
 import { useEffect, useState } from "preact/hooks";
 import { ButtonHandler } from "../components/Button.js";
 import { InternationalizationAPI, memoryMap, useTranslationContext } from "../index.browser.js";
@@ -19,10 +19,28 @@ export interface InfoNotification {
 const storage = memoryMap<Map<string, NotificationMessage>>();
 const NOTIFICATION_KEY = "notification";
 
+export const GLOBAL_NOTIFICATION_TIMEOUT: Duration = { d_ms: 3 * 1000 }
+
+function removeFromStorage(n: NotificationMessage) {
+  const h = hash(n)
+  const mem = storage.get(NOTIFICATION_KEY) ?? new Map();
+  const newState = new Map(mem);
+  newState.delete(h);
+  storage.set(NOTIFICATION_KEY, newState);
+}
+
+
 export function notify(notif: NotificationMessage): void {
   const currentState: Map<string, NotificationMessage> =
     storage.get(NOTIFICATION_KEY) ?? new Map();
   const newState = currentState.set(hash(notif), notif);
+
+  if (GLOBAL_NOTIFICATION_TIMEOUT.d_ms !== "forever") {
+    setTimeout(() => {
+      removeFromStorage(notif)
+    }, GLOBAL_NOTIFICATION_TIMEOUT.d_ms);
+  }
+
   storage.set(NOTIFICATION_KEY, newState);
 }
 export function notifyError(
@@ -73,10 +91,7 @@ export function useNotifications(): Notification[] {
     return {
       message,
       remove: () => {
-        const mem = storage.get(NOTIFICATION_KEY) ?? new Map();
-        const newState = new Map(mem);
-        newState.delete(hash(message));
-        storage.set(NOTIFICATION_KEY, newState);
+        removeFromStorage(message)
       },
     };
   });
@@ -124,7 +139,7 @@ export type ErrorNotificationHandler = (cb: (notify: typeof errorMap) => Promise
  * @returns 
  */
 export function useLocalNotification(): [Notification | undefined, (n: NotificationMessage) => void, ErrorNotificationHandler] {
-  const {i18n} = useTranslationContext();
+  const { i18n } = useTranslationContext();
 
   const [value, setter] = useState<NotificationMessage>();
   const notif = !value ? undefined : {
@@ -154,12 +169,12 @@ export function useLocalNotification(): [Notification | undefined, (n: Notificat
   return [notif, setter, errorHandling]
 }
 
-type HandlerMaker = <T extends OperationResult<A, B>,A,B>(
+type HandlerMaker = <T extends OperationResult<A, B>, A, B>(
   onClick: () => Promise<T | undefined>,
-  onOperationSuccess: ((result:T extends OperationOk<any> ? T :never) => void) | ((result:T extends OperationOk<any> ? T :never) => TranslatedString | undefined),
+  onOperationSuccess: ((result: T extends OperationOk<any> ? T : never) => void) | ((result: T extends OperationOk<any> ? T : never) => TranslatedString | undefined),
   onOperationFail: (d: T extends OperationFail<any> ? T : never) => TranslatedString,
   onOperationComplete?: () => void,
-) => ButtonHandler<T,A,B>;
+) => ButtonHandler<T, A, B>;
 
 export function useLocalNotificationHandler(): [Notification | undefined, HandlerMaker, (n: NotificationMessage) => void] {
   const [value, setter] = useState<NotificationMessage>();
@@ -169,20 +184,20 @@ export function useLocalNotificationHandler(): [Notification | undefined, Handle
       setter(undefined);
     },
   }
-  
-  function makeHandler<T extends OperationResult<A, B>,A,B>(
+
+  function makeHandler<T extends OperationResult<A, B>, A, B>(
     onClick: () => Promise<T | undefined>,
-    onOperationSuccess: ((result:T extends OperationOk<any> ? T :never) => void) | ((result:T extends OperationOk<any> ? T :never) => TranslatedString | undefined),
+    onOperationSuccess: ((result: T extends OperationOk<any> ? T : never) => void) | ((result: T extends OperationOk<any> ? T : never) => TranslatedString | undefined),
     onOperationFail: (d: T extends OperationFail<any> ? T : never) => TranslatedString,
-    onOperationComplete?: () => void,  
-  ): ButtonHandler<T,A,B> {
+    onOperationComplete?: () => void,
+  ): ButtonHandler<T, A, B> {
     return { onClick, onNotification: setter, onOperationFail, onOperationSuccess, onOperationComplete }
   }
-  
+
   return [notif, makeHandler, setter]
 }
 
-export function buildRequestErrorMessage( i18n: InternationalizationAPI, cause: TalerError): ErrorNotification {
+export function buildRequestErrorMessage(i18n: InternationalizationAPI, cause: TalerError): ErrorNotification {
   let result: ErrorNotification;
   switch (cause.errorDetail.code) {
     case TalerErrorCode.WALLET_HTTP_REQUEST_GENERIC_TIMEOUT: {