From 165bfb1b2b101cf44438733bdf0172c562dede7b Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 18 Nov 2024 16:14:57 -0800
Subject: [PATCH] Fix a memory leak and loading on amber login

---
 src/app/components/LogIn.svelte | 20 +++++++++++---------
 src/routes/+layout.svelte       |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/app/components/LogIn.svelte b/src/app/components/LogIn.svelte
index 7dbda6bf..f751208d 100644
--- a/src/app/components/LogIn.svelte
+++ b/src/app/components/LogIn.svelte
@@ -17,15 +17,17 @@
 
   const signUp = () => pushModal(SignUp)
 
-  const withLoading = (cb: () => void) => async () => {
-    loading = true
+  const withLoading =
+    (cb: (...args: any[]) => any) =>
+    async (...args: any[]) => {
+      loading = true
 
-    try {
-      await cb()
-    } finally {
-      loading = false
+      try {
+        await cb(...args)
+      } finally {
+        loading = false
+      }
     }
-  }
 
   const onSuccess = async (session: Session, relays: string[] = []) => {
     addSession(session)
@@ -50,7 +52,7 @@
     }
   })
 
-  const loginWithSigner = async (app: any) => {
+  const loginWithSigner = withLoading(async (app: any) => {
     const signer = new Nip55Signer(app.packageName)
     const pubkey = await signer.getPubkey()
 
@@ -62,7 +64,7 @@
         message: "Something went wrong! Please try again.",
       })
     }
-  }
+  })
 
   const loginWithBunker = () => pushModal(LogInBunker)
 
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index be7b29bf..1b2d83c2 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -209,7 +209,7 @@
         })
 
         // Listen for new notifications/memberships
-        subscribePersistent({
+        unsubRooms = subscribePersistent({
           relays,
           filters: [
             {kinds: [THREAD], since},