@konemono/nostr-login 1.7.22 → 1.7.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@konemono/nostr-login",
-  "version": "1.7.22",
+  "version": "1.7.23",
   "description": "",
   "main": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",

package/src/const/index.ts

@@ -1 +1,2 @@
 export const CALL_TIMEOUT = 5000;
+export const NIP46_TIMEOUT = 30000;

package/src/iife-module.ts

@@ -1,9 +1,7 @@
 import { init } from './index';
 import { NostrLoginOptions, StartScreens } from './types';
 
-// wrap to hide local vars
 (() => {
-  // currentScript only visible in global scope code, not event handlers
   const cs = document.currentScript;
   const start = async () => {
     const options: NostrLoginOptions = {};
@@ -71,6 +69,13 @@ import { NostrLoginOptions, StartScreens } from './types';
       const custom = cs.getAttribute('data-custom-nostr-connect') === 'true';
       if (custom) options.customNostrConnect = custom;
 
+      const connectRelays = cs.getAttribute('data-connect-relays');
+      if (connectRelays)
+        options.connectRelays = connectRelays
+          .split(',')
+          .map(r => r.trim())
+          .filter(r => !!r);
+
       console.log('nostr-login options', options);
     }
 

package/src/index.ts

@@ -93,13 +93,6 @@ export class NostrLoginInitializer {
       this.bannerManager.onUserInfo(info);
     });
 
-    this.authNostrService.on('timeout', () => {
-      console.log('nostr-login: timeout event received');
-      this.bannerManager.onCallTimeout();
-      // Don't cancel the connection on timeout - user may want to retry
-      // this.authNostrService.cancelNostrConnect();
-    });
-
     this.modalManager.on('onAuthUrlClick', url => {
       this.openPopup(url);
     });

package/src/modules/AuthNostrService.ts

@@ -1,5 +1,5 @@
 import { localStorageAddAccount, bunkerUrlToInfo, isBunkerUrl, fetchProfile, getBunkerUrl, localStorageRemoveCurrentAccount, createProfile, getIcon } from '../utils';
-import { ConnectionString, Info } from 'nostr-login-components';
+import { ConnectionString, Info } from 'nostr-login-components/dist/types/types';
 import { generatePrivateKey, getEventHash, getPublicKey, nip19 } from 'nostr-tools';
 import { NostrLoginAuthOptions, Response } from '../types';
 import NDK, { NDKEvent, NDKNip46Signer, NDKRpcResponse, NDKUser, NostrEvent } from '@nostr-dev-kit/ndk';
@@ -11,7 +11,7 @@ import { IframeNostrRpc, Nip46Signer, ReadyListener } from './Nip46';
 import { PrivateKeySigner } from './Signer';
 
 const OUTBOX_RELAYS = ['wss://user.kindpag.es', 'wss://purplepag.es', 'wss://relay.nos.social'];
-const DEFAULT_NOSTRCONNECT_RELAY = 'wss://relay.nsec.app/';
+const DEFAULT_NOSTRCONNECT_RELAYS = ['wss://relay.nsec.app/', 'wss://ephemeral.snowflare.cc/'];
 const NOSTRCONNECT_APPS: ConnectionString[] = [
   {
     name: 'Nsec.app',
@@ -106,8 +106,15 @@ class AuthNostrService extends EventEmitter implements Signer {
     this.resetAuth();
   }
 
+  private getDefaultRelays(customRelays?: string[]): string[] {
+    if (customRelays && customRelays.length > 0) {
+      return customRelays;
+    }
+    return [...DEFAULT_NOSTRCONNECT_RELAYS];
+  }
+
   public async nostrConnect(
-    relay?: string,
+    relay?: string | string[],
     {
       domain = '',
       link = '',
@@ -120,55 +127,34 @@ class AuthNostrService extends EventEmitter implements Signer {
       iframeUrl?: string;
     } = {},
   ) {
-    relay = relay || DEFAULT_NOSTRCONNECT_RELAY;
-
-    const relays = relay
-      .split(',')
-      .map(r => r.replace(/['" \t\r\n]/g, '')) // Remove quotes, spaces, tabs, newlines
-      .filter(r => r)
-      .map(r => {
-        try {
-          const url = new URL(r);
-          if (url.protocol === 'wss:' || url.protocol === 'ws:') return url.href;
-        } catch {}
-        return null;
-      })
-      .filter(r => r !== null) as string[];
+    const relays = Array.isArray(relay) ? relay : relay ? [relay] : this.getDefaultRelays();
 
     const info: Info = {
       authMethod: 'connect',
-      pubkey: '', // unknown yet!
-      signerPubkey: '', // unknown too!
+      pubkey: '',
+      signerPubkey: '',
       sk: this.nostrConnectKey,
       domain: domain,
-      relays,
+      relays: relays,
       iframeUrl,
     };
 
     console.log('nostrconnect info', info, link);
 
-    // non-iframe flow
     if (link && !iframeUrl) window.open(link, '_blank', 'width=400,height=700');
 
-    // init nip46 signer
     await this.initSigner(info, { listen: true });
 
-    // signer learns the remote pubkey
     if (!info.pubkey || !info.signerPubkey) throw new Error('Bad remote pubkey');
 
-    let bunkerUrl = `bunker://${info.signerPubkey}?`;
-    for (const r of relays) {
-      bunkerUrl += `relay=${r}&`;
-    }
-    info.bunkerUrl = bunkerUrl;
+    info.bunkerUrl = `bunker://${info.signerPubkey}?${relays.map(r => `relay=${r}`).join('&')}`;
 
-    // callback
     if (!importConnect) this.onAuth('login', info);
 
     return info;
   }
 
-  public async createNostrConnect(relay?: string) {
+  public async createNostrConnect(relay?: string | string[]) {
     this.nostrConnectKey = generatePrivateKey();
     this.nostrConnectSecret = Math.random().toString(36).substring(7);
 
@@ -180,45 +166,40 @@ class AuthNostrService extends EventEmitter implements Signer {
       perms: encodeURIComponent(this.params.optionsModal.perms || ''),
     };
 
-    return `nostrconnect://${pubkey}?image=${meta.icon}&url=${meta.url}&name=${meta.name}&perms=${meta.perms}&secret=${this.nostrConnectSecret}${relay ? `&relay=${relay}` : ''}`;
+    const relays = Array.isArray(relay) ? relay : relay ? [relay] : this.getDefaultRelays();
+
+    const relayParams = relays.map(r => `relay=${r}`).join('&');
+    return `nostrconnect://${pubkey}?image=${meta.icon}&url=${meta.url}&name=${meta.name}&perms=${meta.perms}&secret=${this.nostrConnectSecret}&${relayParams}`;
   }
 
   public async getNostrConnectServices(): Promise<[string, ConnectionString[]]> {
-    const nostrconnect = await this.createNostrConnect();
+    const customRelays = this.params.optionsModal.connectRelays;
+    const nostrconnect = await this.createNostrConnect(customRelays);
 
-    // copy defaults
     const apps = NOSTRCONNECT_APPS.map(a => ({ ...a }));
-    // if (this.params.optionsModal.dev) {
-    //   apps.push({
-    //     name: 'Dev.Nsec.app',
-    //     domain: 'new.nsec.app',
-    //     canImport: true,
-    //     img: 'https://new.nsec.app/assets/favicon.ico',
-    //     link: 'https://dev.nsec.app/<nostrconnect>',
-    //     relay: 'wss://relay.nsec.app/',
-    //   });
-    // }
 
     for (const a of apps) {
-      let relay = DEFAULT_NOSTRCONNECT_RELAY;
+      let relays = customRelays && customRelays.length > 0 ? customRelays : this.getDefaultRelays();
+
       if (a.link.startsWith('https://')) {
         let domain = a.domain || new URL(a.link).hostname;
         try {
           const info = await (await fetch(`https://${domain}/.well-known/nostr.json`)).json();
           const pubkey = info.names['_'];
-          const relays = info.nip46[pubkey] as string[];
-          if (relays && relays.length) relay = relays[0];
+          const serviceRelays = info.nip46[pubkey] as string[];
+          if (serviceRelays && serviceRelays.length) {
+            relays = serviceRelays;
+          }
           a.iframeUrl = info.nip46.iframe_url || '';
         } catch (e) {
           console.log('Bad app info', e, a);
         }
       }
-      const nc = nostrconnect + '&relay=' + relay;
+
+      const nc = nostrconnect + '&' + relays.map(r => `relay=${r}`).join('&');
       if (a.iframeUrl) {
-        // pass plain nc url for iframe-based flow
         a.link = nc;
       } else {
-        // we will open popup ourselves
         a.link = a.link.replace('<nostrconnect>', nc);
       }
     }
@@ -250,10 +231,8 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   public prepareImportUrl(url: string) {
-    // for OTP we choose interactive import
     if (this.params.userInfo?.authMethod === 'otp') return url + '&import=true';
 
-    // for local we export our existing key
     if (!this.localSigner || this.params.userInfo?.authMethod !== 'local') throw new Error('Most be local keys');
     return url + '#import=' + nip19.nsecEncode(this.localSigner.privateKey!);
   }
@@ -262,16 +241,13 @@ class AuthNostrService extends EventEmitter implements Signer {
     const { relay, domain, link, iframeUrl } = cs;
     if (!domain) throw new Error('Domain required');
 
-    const info = await this.nostrConnect(relay, { domain, link, importConnect: true, iframeUrl });
+    const relays = relay ? [relay] : this.getDefaultRelays();
+    const info = await this.nostrConnect(relays, { domain, link, importConnect: true, iframeUrl });
 
-    // logout to remove local keys from storage
-    // but keep the connect signer
-    await this.logout(/*keepSigner*/ true);
+    await this.logout(true);
 
-    // release local one
     this.localSigner = null;
 
-    // notify app that we've switched to 'connect' keys
     this.onAuth('login', info);
   }
 
@@ -301,41 +277,29 @@ class AuthNostrService extends EventEmitter implements Signer {
   public async createAccount(nip05: string) {
     const [name, domain] = nip05.split('@');
 
-    // bunker's own url
     const bunkerUrl = await getBunkerUrl(`_@${domain}`, this.params.optionsModal);
     console.log("create account bunker's url", bunkerUrl);
 
-    // parse bunker url and generate local nsec
     const info = bunkerUrlToInfo(bunkerUrl);
     if (!info.signerPubkey) throw new Error('Bad bunker url');
 
     const eventToAddAccount = Boolean(this.params.userInfo);
 
-    // init signer to talk to the bunker (not the user!)
     await this.initSigner(info, { eventToAddAccount });
 
     const userPubkey = await this.signer!.createAccount2({ bunkerPubkey: info.signerPubkey!, name, domain, perms: this.params.optionsModal.perms });
 
     return {
       bunkerUrl: `bunker://${userPubkey}?relay=${info.relays?.[0]}`,
-      sk: info.sk, // reuse the same local key
+      sk: info.sk,
     };
   }
 
   private releaseSigner() {
-    // cleanup iframe ping interval if using IframeNostrRpc
-    if (this.signer && '_rpc' in this.signer) {
-      const rpc = (this.signer as any)._rpc;
-      if (rpc && typeof rpc.cleanup === 'function') {
-        rpc.cleanup();
-      }
-    }
-    
     this.signer = null;
     this.signerErrCallback?.('cancelled');
     this.localSigner = null;
 
-    // disconnect from signer relays
     for (const r of this.ndk.pool.relays.keys()) {
       this.ndk.pool.removeRelay(r);
     }
@@ -344,10 +308,8 @@ class AuthNostrService extends EventEmitter implements Signer {
   public async logout(keepSigner = false) {
     if (!keepSigner) this.releaseSigner();
 
-    // move current to recent
     localStorageRemoveCurrentAccount();
 
-    // notify everyone
     this.onAuth('logout');
 
     this.emit('updateAccounts');
@@ -372,17 +334,15 @@ class AuthNostrService extends EventEmitter implements Signer {
   private onAuth(type: 'login' | 'signup' | 'logout', info: Info | null = null) {
     if (type !== 'logout' && !info) throw new Error('No user info in onAuth');
 
-    // make sure we emulate logout first
     if (info && this.params.userInfo && (info.pubkey !== this.params.userInfo.pubkey || info.authMethod !== this.params.userInfo.authMethod)) {
       const event = new CustomEvent('nlAuth', { detail: { type: 'logout' } });
       console.log('nostr-login auth', event.detail);
-      document.dispatchEvent(event)
+      document.dispatchEvent(event);
     }
 
     this.setUserInfo(info);
 
     if (info) {
-      // async profile fetch
       fetchProfile(info, this.profileNdk).then(p => {
         if (this.params.userInfo !== info) return;
 
@@ -390,10 +350,6 @@ class AuthNostrService extends EventEmitter implements Signer {
           ...this.params.userInfo,
           picture: p?.image || p?.picture,
           name: p?.name || p?.displayName || p?.nip05 || nip19.npubEncode(info.pubkey),
-          // NOTE: do not overwrite info.nip05 with the one from profile!
-          // info.nip05 refers to nip46 provider,
-          // profile.nip05 is just a fancy name that user has chosen
-          // nip05: p?.nip05
         };
 
         this.setUserInfo(userInfo);
@@ -408,7 +364,6 @@ class AuthNostrService extends EventEmitter implements Signer {
       };
 
       if (type === 'logout') {
-        // reset
         if (this.iframe) this.iframe.remove();
         this.iframe = undefined;
       } else {
@@ -445,12 +400,10 @@ class AuthNostrService extends EventEmitter implements Signer {
   private async createIframe(iframeUrl?: string) {
     if (!iframeUrl) return undefined;
 
-    // ensure iframe
     const url = new URL(iframeUrl);
     const domain = url.hostname;
     let iframe: HTMLIFrameElement | undefined;
 
-    // one iframe per domain
     const did = domain.replaceAll('.', '-');
     const id = '__nostr-login-worker-iframe-' + did;
     iframe = document.querySelector(`#${id}`) as HTMLIFrameElement;
@@ -461,50 +414,25 @@ class AuthNostrService extends EventEmitter implements Signer {
       iframe.setAttribute('height', '0');
       iframe.setAttribute('border', '0');
       iframe.style.display = 'none';
-      // iframe.setAttribute('sandbox', 'allow-forms allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts');
       iframe.id = id;
       document.body.append(iframe);
     }
 
-    // wait until loaded
     iframe.setAttribute('src', iframeUrl);
 
-    // we start listening right now to avoid races
-    // with 'load' event below
     const ready = new ReadyListener(['workerReady', 'workerError'], url.origin);
 
-    await new Promise((ok, err) => {
-      const timeoutId = setTimeout(() => err('Iframe load timeout'), 30000);
-      iframe!.addEventListener('load', () => {
-        clearTimeout(timeoutId);
-        ok(undefined);
-      });
+    await new Promise(ok => {
+      iframe!.addEventListener('load', ok);
     });
 
-    // now make sure the iframe is ready,
-    // timeout timer starts here
     const r = await ready.wait();
 
-    // FIXME wait until the iframe is ready to accept requests,
-    // maybe it should send us some message?
-
     console.log('nostr-login iframe ready', iframeUrl, r);
 
     return { iframe, port: r[1] as MessagePort };
   }
 
-  // private async getIframeUrl(domain?: string) {
-  //   if (!domain) return '';
-  //   try {
-  //     const r = await fetch(`https://${domain}/.well-known/nostr.json`);
-  //     const data = await r.json();
-  //     return data.nip46?.iframe_url || '';
-  //   } catch (e) {
-  //     console.log('failed to fetch iframe url', e, domain);
-  //     return '';
-  //   }
-  // }
-
   public async sendNeedAuth() {
     const [nostrconnect] = await this.getNostrConnectServices();
     const event = new CustomEvent('nlNeedAuth', { detail: { nostrconnect } });
@@ -517,22 +445,19 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   public async startAuth() {
-    console.log("startAuth");
+    console.log('startAuth');
     if (this.readyCallback) throw new Error('Already started');
 
-    // start the new promise
     this.readyPromise = new Promise<void>(ok => (this.readyCallback = ok));
   }
 
   public async endAuth() {
     console.log('endAuth', this.params.userInfo);
     if (this.params.userInfo && this.params.userInfo.iframeUrl) {
-      // create iframe
       const { iframe, port } = (await this.createIframe(this.params.userInfo.iframeUrl)) || {};
       this.iframe = iframe;
       if (!this.iframe || !port) return;
 
-      // assign iframe to RPC object
       (this.signer!.rpc as IframeNostrRpc).setWorkerIframePort(port);
     }
 
@@ -557,113 +482,58 @@ class AuthNostrService extends EventEmitter implements Signer {
   }
 
   public async initSigner(info: Info, { listen = false, connect = false, eventToAddAccount = false } = {}) {
-    // mutex
     if (this.signerPromise) {
       try {
         await this.signerPromise;
       } catch {}
     }
 
-    // we remove support for iframe from nip05 and bunker-url methods,
-    // only nostrconnect flow will use it.
-    // info.iframeUrl = info.iframeUrl || (await this.getIframeUrl(info.domain));
     console.log('initSigner info', info);
 
-    // start listening for the ready signal
     const iframeOrigin = info.iframeUrl ? new URL(info.iframeUrl!).origin : undefined;
     if (iframeOrigin) this.starterReady = new ReadyListener(['starterDone', 'starterError'], iframeOrigin);
 
-    // notify modals so they could show the starter iframe,
-    // FIXME shouldn't this come from nostrconnect service list?
     this.emit('onIframeUrl', info.iframeUrl);
 
     this.signerPromise = new Promise<void>(async (ok, err) => {
       this.signerErrCallback = err;
       try {
-        // pre-connect if we're creating the connection (listen|connect) or
-        // not iframe mode
         if (info.relays && !info.iframeUrl) {
           for (const r of info.relays) {
             this.ndk.addExplicitRelay(r, undefined);
           }
         }
 
-        // wait until we connect, otherwise
-        // signer won't start properly
-        await new Promise<void>((resolve, reject) => {
-           let finished = false
-           // 10 sec timeout for connection
-           setTimeout(() => {
-             if (!finished) {
-               finished = true
-               console.log('nostr-login: relay connection timeout, emitting timeout event');
-               this.emit('timeout');
-               reject('Connection timed out')
-             }
-           }, 10000)
-
-           this.ndk.connect().then(() => {
-             if (!finished) {
-               finished = true
-               resolve()
-             }
-           }).catch(e => {
-             if (!finished) {
-               finished = true
-               reject(e)
-             }
-           })
-        });
+        await this.ndk.connect();
 
-        // create and prepare the signer
         const localSigner = new PrivateKeySigner(info.sk!);
         this.signer = new Nip46Signer(this.ndk, localSigner, info.signerPubkey!, iframeOrigin);
 
-        // forward timeout events
-        this.signer.on('timeout', () => {
-          this.emit('timeout');
-        });
-
-        // we should notify the banner the same way as
-        // the onAuthUrl does
         this.signer.on(`iframeRestart`, async () => {
           const iframeUrl = info.iframeUrl + (info.iframeUrl!.includes('?') ? '&' : '?') + 'pubkey=' + info.pubkey + '&rebind=' + localSigner.pubkey;
           this.emit('iframeRestart', { pubkey: info.pubkey, iframeUrl });
         });
 
-        // OAuth flow
-        // if (!listen) {
         this.signer.on('authUrl', (url: string) => {
           console.log('nostr login auth url', url);
 
-          // notify our UI
           this.emit('onAuthUrl', { url, iframeUrl: info.iframeUrl, eventToAddAccount });
         });
-        // }
 
         if (listen) {
-          // nostrconnect: flow
-          // wait for the incoming message from signer
           await this.listen(info);
         } else if (connect) {
-          // bunker: flow
-          // send 'connect' message to signer
           await this.connect(info, this.params.optionsModal.perms);
         } else {
-          // provide saved pubkey as a hint
           await this.signer!.initUserPubkey(info.pubkey);
         }
 
-        // ensure, we're using it in callbacks above
-        // and expect info to be valid after this call
         info.pubkey = this.signer!.userPubkey;
-        // learned after nostrconnect flow
         info.signerPubkey = this.signer!.remotePubkey;
 
         ok();
       } catch (e) {
         console.log('initSigner failure', e);
-        // make sure signer isn't set
         this.signer = null;
         err(e);
       }
@@ -686,7 +556,6 @@ class AuthNostrService extends EventEmitter implements Signer {
       if (domain) info.domain = domain;
       if (iframeUrl) info.iframeUrl = iframeUrl;
 
-      // console.log('nostr login auth info', info);
       if (!info.signerPubkey || !info.sk || !info.relays?.[0]) {
         throw new Error(`Bad bunker url ${bunkerUrl}`);
       }
@@ -694,47 +563,27 @@ class AuthNostrService extends EventEmitter implements Signer {
       const eventToAddAccount = Boolean(this.params.userInfo);
       console.log('authNip46', type, info);
 
-      // updates the info
       await this.initSigner(info, { connect: true, eventToAddAccount });
 
-      // callback
       this.onAuth(type, info);
     } catch (e) {
       console.log('nostr login auth failed', e);
-      // make ure it's closed
-      // this.popupManager.closePopup();
       throw e;
     }
   }
 
   public async signEvent(event: any) {
-    console.log('AuthNostrService.signEvent called', {
-      hasLocalSigner: !!this.localSigner,
-      hasSigner: !!this.signer,
-      signerRemotePubkey: this.signer?.remotePubkey,
-      eventBefore: JSON.parse(JSON.stringify(event))
-    });
-    
-    // Create a copy to avoid mutating the original event on timeout
-    const eventToSign = { ...event };
-    
     if (this.localSigner) {
-      eventToSign.pubkey = getPublicKey(this.localSigner.privateKey!);
-      eventToSign.id = getEventHash(eventToSign);
-      eventToSign.sig = await this.localSigner.sign(eventToSign);
+      event.pubkey = getPublicKey(this.localSigner.privateKey!);
+      event.id = getEventHash(event);
+      event.sig = await this.localSigner.sign(event);
     } else {
-      if (!this.signer) {
-        console.error('No signer available!');
-        throw new Error('No signer available');
-      }
-      eventToSign.pubkey = this.signer.remotePubkey;
-      eventToSign.id = getEventHash(eventToSign);
-      console.log('Calling signer.sign with event:', eventToSign);
-      eventToSign.sig = await this.signer.sign(eventToSign);
-      console.log('Received signature:', eventToSign.sig);
+      event.pubkey = this.signer?.remotePubkey;
+      event.id = getEventHash(event);
+      event.sig = await this.signer?.sign(event);
     }
-    console.log('signed event:', { event: eventToSign });
-    return eventToSign;
+    console.log('signed', { event });
+    return event;
   }
 
   private async codec_call(method: string, pubkey: string, param: string) {
@@ -761,10 +610,6 @@ class AuthNostrService extends EventEmitter implements Signer {
     if (this.localSigner) {
       return this.localSigner.decrypt(new NDKUser({ pubkey }), ciphertext);
     } else {
-      // decrypt is broken in ndk v2.3.1, and latest
-      // ndk v2.8.1 doesn't allow to override connect easily,
-      // so we reimplement and fix decrypt here as a temporary fix
-
       return this.codec_call('nip04_decrypt', pubkey, ciphertext);
     }
   }
@@ -773,7 +618,6 @@ class AuthNostrService extends EventEmitter implements Signer {
     if (this.localSigner) {
       return this.nip44Codec.encrypt(this.localSigner.privateKey!, pubkey, plaintext);
     } else {
-      // no support of nip44 in ndk yet
       return this.codec_call('nip44_encrypt', pubkey, plaintext);
     }
   }
@@ -782,7 +626,6 @@ class AuthNostrService extends EventEmitter implements Signer {
     if (this.localSigner) {
       return this.nip44Codec.decrypt(this.localSigner.privateKey!, pubkey, ciphertext);
     } else {
-      // no support of nip44 in ndk yet
       return this.codec_call('nip44_decrypt', pubkey, ciphertext);
     }
   }

package/src/modules/BannerManager.ts

@@ -47,15 +47,10 @@ class BannerManager extends EventEmitter {
   }
 
   public onCallTimeout() {
-    console.log('BannerManager.onCallTimeout called, banner:', this.banner);
     if (this.banner) {
-      console.log('Setting banner isLoading=false and notify=timeout');
-      this.banner.isLoading = false;
       this.banner.notify = {
         mode: 'timeout',
       };
-    } else {
-      console.log('Banner is null, cannot set timeout notification');
     }
   }
 
@@ -72,10 +67,7 @@ class BannerManager extends EventEmitter {
         this.iframeReady = undefined;
       }
       this.banner.isLoading = false;
-      // Don't clear timeout notification, user needs to see it
-      if (this.banner.notify?.mode !== 'timeout') {
-        this.banner.notify = { mode: '' };
-      }
+      this.banner.notify = { mode: '' };
     }
   }