From 30d87f330f8c255d5428ed03c53cc2cca4d15894 Mon Sep 17 00:00:00 2001
From: Christopher Cali <chris@consensusnetworks.com>
Date: Tue, 12 Sep 2023 23:59:07 -0400
Subject: [PATCH] Fix double listener issue

---
 apps/web/src/composables/contracts.ts     |  4 +--
 apps/web/src/composables/user.ts          | 43 ++++++++++-------------
 apps/web/src/pages/operators/Operator.vue |  1 -
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/apps/web/src/composables/contracts.ts b/apps/web/src/composables/contracts.ts
index 151f9626b..7597f8d18 100644
--- a/apps/web/src/composables/contracts.ts
+++ b/apps/web/src/composables/contracts.ts
@@ -185,9 +185,9 @@ export default function useContracts() {
     return { 
         loadingRegisteredOperators,
         manager,
-        views,
-        registry,
         operators,
+        registry,
+        views,
         deposit, 
         getDepositFees,
         getUserStake,
diff --git a/apps/web/src/composables/user.ts b/apps/web/src/composables/user.ts
index fbb280326..5d44ecb92 100644
--- a/apps/web/src/composables/user.ts
+++ b/apps/web/src/composables/user.ts
@@ -23,6 +23,7 @@ const { getCurrentPrice } = usePrice()
 const { loginWithWalletConnectV2, initializeWalletConnect, uninitializeWalletConnect } = useWalletConnect()
 
 const initializeComposable = ref(false)
+const initializedUser = ref(false)
 const nonregisteredOperators = ref<Operator[]>([])
 const provider = new ethers.providers.JsonRpcProvider(ethereumUrl)
 const rawUserAnalytics = ref<any>(null)
@@ -112,6 +113,7 @@ export default function useUser() {
     }
 
     async function blockListener(blockNumber: number) {
+        if (!user.value) return
         console.log('blockNumber :>> ', blockNumber)
         const addresses = (user.value as UserWithAccountsAndOperators).accounts.map((account: Account) => account.address) as string[]
         const block = await provider.getBlockWithTransactions(blockNumber)
@@ -477,31 +479,23 @@ export default function useUser() {
         registeredOperators.value = casimirOperators as Array<RegisteredOperator>
     }
 
-    async function initializeUser() {
-        listenForContractEvents()
-        listenForTransactions()
-        await Promise.all([refreshBreakdown(), getUserOperators(), getUserAnalytics()])
-    }
-
     function listenForContractEvents() {
+        stopListeningForContractEvents() // Clear old listeners
         try {
-            console.log('listening for contract events')
             manager.on('StakeDeposited', stakeDepositedListener)
             manager.on('StakeRebalanced', stakeRebalancedListener)
             manager.on('WithdrawalInitiated', withdrawalInitiatedListener)
             registry.on('OperatorRegistered', getUserOperators)
-            registry.on('OperatorDeregistered', getUserOperators)
-            registry.on('DeregistrationRequested', getUserOperators)
+            // registry.on('OperatorDeregistered', getUserOperators)
+            // registry.on('DeregistrationRequested', getUserOperators)
         } catch (err) {
             console.log(`There was an error in listenForContractEvents: ${err}`)
         }
     }
 
     async function listenForTransactions() {
+        stopListeningForTransactions()
         provider.on('block', blockListener as ethers.providers.Listener)
-        await new Promise(() => {
-          // Wait indefinitely using a Promise that never resolves
-        })
     }
 
     /**
@@ -523,11 +517,9 @@ export default function useUser() {
             } else if (provider === 'WalletConnect'){
                 await loginWithWalletConnectV2(loginCredentials)
             } else {
-                // TODO: Implement this for other providers
                 console.log('Sign up not yet supported for this wallet provider')
             }
             await getUser()
-            
         } catch (error: any) {
             throw new Error(error.message || 'There was an error logging in')
         }
@@ -536,32 +528,33 @@ export default function useUser() {
     async function logout() {
         await Session.signOut()
         uninitializeUser()
-        // await disconnectWalletConnect()
         // TODO: Fix bug that doesn't allow you to log in without refreshing page after a user logs out
         window.location.reload()
-        console.log('user.value :>> ', user.value)
     }
       
     onMounted(async () => {
         if (!initializeComposable.value) {
             initializeComposable.value = true
-            const session = await Session.doesSessionExist()
-            if (session) await getUser()
-            await initializeWalletConnect()
-
+            listenForContractEvents()
+            listenForTransactions()
             watch(user, async () => {
-                console.log('User Updated', user.value)
-                if (user.value) {
-                    await initializeUser()
-                } else {
+                if (user.value && !initializedUser.value) {
+                    initializedUser.value = true
+                    await Promise.all([refreshBreakdown(), getUserOperators(), getUserAnalytics()])
+                } else if (!user.value) {
                     uninitializeUser()
                 }
             })
+            const session = await Session.doesSessionExist()
+            if (session) await getUser()
+            await initializeWalletConnect()
         }
     })
     
     onUnmounted(() => {
         uninitializeWalletConnect()
+        stopListeningForContractEvents()
+        stopListeningForTransactions()
         initializeComposable.value = false
     })
 
@@ -651,7 +644,7 @@ export default function useUser() {
     }
 
     function stopListeningForTransactions() {
-        provider.off('block', blockListener as ethers.providers.Listener)
+        provider.removeAllListeners('block')
     }
 
     function uninitializeUser() {
diff --git a/apps/web/src/pages/operators/Operator.vue b/apps/web/src/pages/operators/Operator.vue
index ece7a52e4..0120eb48f 100644
--- a/apps/web/src/pages/operators/Operator.vue
+++ b/apps/web/src/pages/operators/Operator.vue
@@ -99,7 +99,6 @@ onMounted(async () => {
     }
 
     document.addEventListener('DOMContentLoaded', disableAutofill)
-    //
 
     filterData()
   }