From 312747443df4850ca9352017029b11282261d1d3 Mon Sep 17 00:00:00 2001
From: Christopher Cali <chris@consensusnetworks.com>
Date: Tue, 19 Dec 2023 17:06:17 -0500
Subject: [PATCH 1/6] Handle WalletConnect sessions in auth flow

---
 .../mvp/src/components/ConnectWalletsFlow.vue |  11 +-
 apps/mvp/src/composables/auth.ts              |  10 +-
 apps/mvp/src/composables/walletConnectV2.ts   | 129 ++++++++----------
 3 files changed, 73 insertions(+), 77 deletions(-)

diff --git a/apps/mvp/src/components/ConnectWalletsFlow.vue b/apps/mvp/src/components/ConnectWalletsFlow.vue
index 5a554081c..5b62ece8c 100644
--- a/apps/mvp/src/components/ConnectWalletsFlow.vue
+++ b/apps/mvp/src/components/ConnectWalletsFlow.vue
@@ -40,7 +40,7 @@ const { getEthersLedgerAddresses } = useLedger()
 const { getEthersTrezorAddresses } = useTrezor()
 const { user } = useUser()
 const { detectActiveNetwork, switchEthersNetwork } = useWallets()
-const { connectWalletConnectV2 } = useWalletConnect()
+const { connectWalletConnectV2, walletConnectSelectedAccount } = useWalletConnect()
 // const { installedWallets, detectInstalledWalletProviders } = useWallets()
 
 // eslint-disable-next-line no-undef
@@ -104,6 +104,7 @@ async function handleConfirmCreateAccountWithExistingSecondary() {
 */
 async function selectAddress(address: string, pathIndex?: number): Promise<void> {
     selectedAddress.value = address
+    console.log("selectedAddress.value :>> ", selectedAddress.value)
     flowState.value = "loading"
     const loginCredentials: LoginCredentials = 
       pathIndex !== undefined ? 
@@ -226,6 +227,12 @@ onUnmounted(() => {
         flowState.value = "select_provider"
     }
 })
+
+watch(walletConnectSelectedAccount, () => {
+    if (selectedProvider.value === "WalletConnect") {
+        walletProviderAddresses.value = walletConnectSelectedAccount.value as CryptoAddress[]
+    }
+})
 </script>
 
 <template>
@@ -374,7 +381,7 @@ onUnmounted(() => {
             @click="
               selectedProvider === 'Ledger' || selectedProvider === 'Trezor' ?
                 selectAddress(trimAndLowercaseAddress(act.address), pathIndex) :
-                selectAddress(trimAndLowercaseAddress(act.address), undefined)
+                selectAddress(act.address, undefined)
             "
           >
             <div>
diff --git a/apps/mvp/src/composables/auth.ts b/apps/mvp/src/composables/auth.ts
index 6f745bf96..6a23bdd84 100644
--- a/apps/mvp/src/composables/auth.ts
+++ b/apps/mvp/src/composables/auth.ts
@@ -123,6 +123,7 @@ export default function useAuth() {
         loginCredentials: LoginCredentials
     ): Promise<UserAuthState> {
         const { address, provider } = loginCredentials
+        console.log("loginCredentials :>> ", loginCredentials)
         try {
             if (user.value) {
                 // If address already exists on user, do nothing
@@ -174,6 +175,7 @@ export default function useAuth() {
                 const browserWallet = browserProvidersList.includes(provider as ProviderString)
 
                 if (provider === "WalletConnect") {
+                    console.log("got to wallet connect login")
                     await loginWithProvider(loginCredentials as LoginCredentials)
                     await getUser()
                     return "Successfully logged in"
@@ -265,6 +267,7 @@ export default function useAuth() {
             } else if (provider === "Trezor") {
                 await loginWithTrezor(loginCredentials)
             } else if (provider === "WalletConnect") {
+                console.log("logging in with wallet connect")
                 await loginWithWalletConnectV2(loginCredentials)
             } else {
                 console.log("Sign up not yet supported for this wallet provider")
@@ -308,12 +311,7 @@ export default function useAuth() {
             }
         }
     })
-
-    onUnmounted(() => {
-        initializedAuthComposable.value = false
-        uninitializeWalletConnect()
-    })
-
+    
     // TODO: Re-enable once we have a way to remove accounts in UI
     // async function removeConnectedAccount() {
     //     if (!user?.value?.address) {
diff --git a/apps/mvp/src/composables/walletConnectV2.ts b/apps/mvp/src/composables/walletConnectV2.ts
index 5d248d116..3aa3e1c51 100644
--- a/apps/mvp/src/composables/walletConnectV2.ts
+++ b/apps/mvp/src/composables/walletConnectV2.ts
@@ -18,7 +18,7 @@ let cleanupFunctions: Array<any> = [] // TODO: Potentially fix type here.
 const accounts = ref<Array<string>>([])
 const ethereumProvider = ref()
 const pairings = ref([])
-const session = ref()
+const session = ref<SessionTypes.Struct>()
 const web3Modal = ref()
 const web3Provider = shallowRef()
 
@@ -28,6 +28,8 @@ const subscribedToProviderEvents = ref(false)
 const componentIsMounted = ref(false)
 const isInitializing = ref(false)
 
+const walletConnectSelectedAccount = ref([] as Array<CryptoAddress>)
+
 export default function useWalletConnectV2() {
     async function connectWalletConnectV2(chainId: "1" | "5" | "1337", pairing?: PairingTypes.Struct): Promise<CryptoAddress[]> {
         try {
@@ -40,13 +42,18 @@ export default function useWalletConnectV2() {
             }
             const rpcUrl = customRpcs[chainId]
             if (!rpcUrl) throw new Error(`RPC URL not found for chainId: ${chainId}`)
-
             await ethereumProvider.value.connect()
             createEthersProvider()
-            const _accounts = await ethereumProvider.value.enable()
+            // const _accounts = await ethereumProvider.value.enable()
+            const _accounts = ethereumProvider.value.accounts
             accounts.value = _accounts
-            session.value = session
+            session.value = ethereumProvider.value.session
             web3Modal.value?.closeModal()
+            walletConnectSelectedAccount.value = [{
+                address: accounts.value[0],
+                balance: (await getEthersBalance(accounts.value[0])).toString()
+            }]
+            
             const connectedAddress = _accounts[0].toLowerCase().trim() as string
             const connectedAddressBalance = (await getEthersBalance(connectedAddress)).toString()
             return [{ address: connectedAddress as string, balance: connectedAddressBalance }]
@@ -99,9 +106,7 @@ export default function useWalletConnectV2() {
     }
 
     function getWalletConnectSignerV2() {
-        if (!web3Provider.value) {
-            throw new Error("Web3Provider is not initialized")
-        }
+        if (!web3Provider.value) throw new Error("Web3Provider is not initialized")
         return web3Provider.value.getSigner()
     }
 
@@ -109,83 +114,56 @@ export default function useWalletConnectV2() {
         if (componentIsMounted.value) return
         if (import.meta.env.MODE === "development") console.log("initializing wallet connect")
         componentIsMounted.value = true
-
-        // Check for persisted sessions & Subscribe to provider events
-        if (ethereumProvider.value && user.value) {
-            _subscribeToProviderEvents()
-            subscribedToProviderEvents.value = true
-            await _checkForPersistedSession()
-            checkedForPersistedSession.value = true
-        } else {
-            await createClient()
-        }
+        await createClient()
     }
 
     async function loginWithWalletConnectV2(loginCredentials: LoginCredentials) {
         const { provider, address, currency } = loginCredentials
-        try {
-            const message = await createSiweMessage(address, "Sign in with Ethereum to the Casimir.")
-            const signedMessage = await signWalletConnectMessage(message)
-            await signInWithEthereum({
-                address,
-                currency: currency || "ETH",
-                provider,
-                message,
-                signedMessage
-            })
-        } catch (err) {
-            console.log("error in loginWithWalletConnect :>> ", err)
-        }
+        const message = await createSiweMessage(address, "Sign in with Ethereum to the Casimir.")
+        const signedMessage = await signWalletConnectMessage(message)
+        await signInWithEthereum({
+            address,
+            currency: currency || "ETH",
+            provider,
+            message,
+            signedMessage
+        })
     }
   
     async function signWalletConnectMessage(message: string) : Promise<string> {
-        try {
-            const signer = await web3Provider.value?.getSigner()
-            return await signer?.signMessage(message) as string
-        } catch (err) {
-            console.error("error in signWalletConnectMessage :>> ", err)
-            throw err
-            return ""
-        }
-    }
-
-    function uninitializeWalletConnect() {
-        cleanupFunctions.forEach((cleanup) => cleanup())
-        cleanupFunctions = [] // Reset the array
-        componentIsMounted.value = false
+        const signer = await web3Provider.value?.getSigner()
+        return await signer?.signMessage(message) as string
     }
 
     async function _checkForPersistedSession() {
         if (ethereumProvider.value?.session) {
-            const _session = ethereumProvider.value?.session
-            console.log("RESTORED SESSION:", _session)
+            session.value = ethereumProvider.value?.session
+            console.log("RESTORED SESSION:", session.value)
             if (!user.value) {
                 await disconnectWalletConnect()
-                return
+            } else {
+                if (!ethereumProvider.value) {
+                    throw new ReferenceError("EthereumProvider is not initialized.")
+                }
+                walletConnectSelectedAccount.value = [{
+                    address: ethereumProvider.value.accounts[0],
+                    balance: (await getEthersBalance(ethereumProvider.value.accounts[0])).toString()
+                }]
+                createEthersProvider()
             }
-            await _onSessionConnected(_session)
-            return _session
         }
     }
 
-    async function _onSessionConnected(_session: SessionTypes.Struct) {
-        if (!ethereumProvider.value) {
-            throw new ReferenceError("EthereumProvider is not initialized.")
-        }
-        const allNamespaceAccounts = Object.values(_session.namespaces).map(namespace => namespace.accounts).flat()
-        const allNamespaceChains = Object.keys(_session.namespaces)
-
-        session.value = _session
-        accounts.value = allNamespaceAccounts.map(account => account.split(":")[2])
-        console.log("RESTORED", allNamespaceChains, allNamespaceAccounts)
-        createEthersProvider()
-    }
-
     function _resetApp() {
-        console.log("resetting app")
+        cleanupFunctions.forEach((cleanup) => cleanup())
+        cleanupFunctions = [] // Reset the array
         pairings.value = []
         session.value = undefined
         accounts.value = []
+        web3Provider.value = undefined
+        walletConnectSelectedAccount.value = []
+        checkedForPersistedSession.value = false
+        subscribedToProviderEvents.value = false
     }
 
     function _subscribeToProviderEvents() {
@@ -195,10 +173,21 @@ export default function useWalletConnectV2() {
 
         // Event handler for display_uri
         const handleDisplayUri = (uri: string) => {
-            console.log("DISPLAY URI EVENT", "QR Code Modal open")
+            console.log("QR Code Modal open")
             web3Modal.value?.openModal({ uri })
         }
 
+        // Event handler for accountsChanged
+        const handleAccountsChanged = async (walletConnectAccounts: Array<string>) => {
+            console.log("ACCOUNTS CHANGED EVENT", walletConnectAccounts)
+            if (!user.value && accounts.value.length > 0) return window.location.reload()
+        }
+
+        // Event handler for chainChanged
+        const handleChainChanged = (chainId: number) => {
+            // console.log("CHAIN CHANGED EVENT", chainId)
+        }
+
         // Event handler for session_ping
         const handleSessionPing = ({ id, topic }: { id: number; topic: string }) => {
             console.log("SESSION PING EVENT", "session_ping")
@@ -207,8 +196,7 @@ export default function useWalletConnectV2() {
 
         // Event handler for session_event
         const handleSessionEvent = ({ event, chainId }: { event: any; chainId: string }) => {
-            console.log("SESSION EVENT", "session_event")
-            console.log(event, chainId)
+            console.log("SESSION EVENT", event)
         }
 
         // Event handler for session_update
@@ -219,13 +207,14 @@ export default function useWalletConnectV2() {
 
         // Event handler for session_delete
         const handleSessionDelete = ({ id, topic }: { id: number; topic: string }) => {
-            console.log("DELETE SESSION EVENT", "session_deleted")
-            console.log(id, topic)
+            console.log("DELETE SESSION EVENT", "session_deleted", id, topic)
             _resetApp()
         }
 
         // Attaching the event listeners
         ethereumProvider.value.on("display_uri", handleDisplayUri)
+        ethereumProvider.value.on("accountsChanged", handleAccountsChanged)
+        ethereumProvider.value.on("chainChanged", handleChainChanged)
         ethereumProvider.value.on("session_ping", handleSessionPing)
         ethereumProvider.value.on("session_event", handleSessionEvent)
         ethereumProvider.value.on("session_update", handleSessionUpdate)
@@ -233,6 +222,8 @@ export default function useWalletConnectV2() {
 
         // Storing cleanup functions
         cleanupFunctions.push(() => ethereumProvider.value.off("display_uri", handleDisplayUri))
+        cleanupFunctions.push(() => ethereumProvider.value.off("accountsChanged", handleAccountsChanged))
+        cleanupFunctions.push(() => ethereumProvider.value.off("chainChanged", handleChainChanged))
         cleanupFunctions.push(() => ethereumProvider.value.off("session_ping", handleSessionPing))
         cleanupFunctions.push(() => ethereumProvider.value.off("session_event", handleSessionEvent))
         cleanupFunctions.push(() => ethereumProvider.value.off("session_update", handleSessionUpdate))
@@ -240,12 +231,12 @@ export default function useWalletConnectV2() {
     }
 
     return {
+        walletConnectSelectedAccount,
         web3Provider,
         connectWalletConnectV2,
         disconnectWalletConnect,
         getWalletConnectSignerV2,
         initializeWalletConnect,
         loginWithWalletConnectV2,
-        uninitializeWalletConnect
     }
 }
\ No newline at end of file

From 6941c41904401b464a56a777f7c62903e5af50fc Mon Sep 17 00:00:00 2001
From: Christopher Cali <chris@consensusnetworks.com>
Date: Tue, 19 Dec 2023 17:07:07 -0500
Subject: [PATCH 2/6] Remove console log in ConnectWalletsFlow

---
 apps/mvp/src/components/ConnectWalletsFlow.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/mvp/src/components/ConnectWalletsFlow.vue b/apps/mvp/src/components/ConnectWalletsFlow.vue
index 5b62ece8c..0b3b6897b 100644
--- a/apps/mvp/src/components/ConnectWalletsFlow.vue
+++ b/apps/mvp/src/components/ConnectWalletsFlow.vue
@@ -104,7 +104,6 @@ async function handleConfirmCreateAccountWithExistingSecondary() {
 */
 async function selectAddress(address: string, pathIndex?: number): Promise<void> {
     selectedAddress.value = address
-    console.log("selectedAddress.value :>> ", selectedAddress.value)
     flowState.value = "loading"
     const loginCredentials: LoginCredentials = 
       pathIndex !== undefined ? 

From 29331029a07355980e6b77ae39f495dcc644c17c Mon Sep 17 00:00:00 2001
From: Christopher Cali <chris@consensusnetworks.com>
Date: Tue, 19 Dec 2023 17:08:23 -0500
Subject: [PATCH 3/6] Remove console logs in auth

---
 apps/mvp/src/composables/auth.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/mvp/src/composables/auth.ts b/apps/mvp/src/composables/auth.ts
index 6a23bdd84..5ac93f075 100644
--- a/apps/mvp/src/composables/auth.ts
+++ b/apps/mvp/src/composables/auth.ts
@@ -123,7 +123,6 @@ export default function useAuth() {
         loginCredentials: LoginCredentials
     ): Promise<UserAuthState> {
         const { address, provider } = loginCredentials
-        console.log("loginCredentials :>> ", loginCredentials)
         try {
             if (user.value) {
                 // If address already exists on user, do nothing

From e8e0913f99cb9e505f8e94f8271ffbcedef4babb Mon Sep 17 00:00:00 2001
From: Christopher Cali <chris@consensusnetworks.com>
Date: Tue, 19 Dec 2023 17:09:39 -0500
Subject: [PATCH 4/6] Remove unused method in auth.ts

---
 apps/mvp/src/composables/auth.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/mvp/src/composables/auth.ts b/apps/mvp/src/composables/auth.ts
index 5ac93f075..5f8068f13 100644
--- a/apps/mvp/src/composables/auth.ts
+++ b/apps/mvp/src/composables/auth.ts
@@ -20,7 +20,7 @@ const { browserProvidersList, loginWithEthers } = useEthers()
 const { loginWithLedger } = useLedger()
 const { loginWithTrezor } = useTrezor()
 const { setUser, user } = useUser()
-const { disconnectWalletConnect, loginWithWalletConnectV2, initializeWalletConnect, uninitializeWalletConnect } = useWalletConnect()
+const { disconnectWalletConnect, loginWithWalletConnectV2, initializeWalletConnect } = useWalletConnect()
 const { detectActiveWalletAddress } = useWallets()
 
 const initializedAuthComposable = ref(false)
@@ -132,9 +132,8 @@ export default function useAuth() {
                 if (addressExistsOnUser) return "Address already exists on this account"
 
                 // Check if it exists as a primary address of a different user
-                const {
-                    data: { sameAddress, walletProvider },
-                } = await checkIfPrimaryUserExists(provider as ProviderString, address)
+                const { data: { sameAddress } } = 
+                    await checkIfPrimaryUserExists(provider as ProviderString, address)
                 // If yes, ask user if they want to add it as a secondary to this account or if they want to log in with that account
                 if (sameAddress) {
                     return "Address already exists as a primary address on another account"

From cc5880010d1f4ba9759642f7eef927c6775ee345 Mon Sep 17 00:00:00 2001
From: Christopher Cali <chris@consensusnetworks.com>
Date: Tue, 19 Dec 2023 18:08:02 -0500
Subject: [PATCH 5/6] Handle stake/withdraw when user account is a
 WalletConnect account but no active session

---
 apps/mvp/src/composables/auth.ts            |  1 -
 apps/mvp/src/composables/staking.ts         |  3 +++
 apps/mvp/src/composables/walletConnectV2.ts | 17 +++++++++++++++++
 apps/mvp/src/composables/wallets.ts         |  5 ++++-
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/apps/mvp/src/composables/auth.ts b/apps/mvp/src/composables/auth.ts
index 5f8068f13..b5768469a 100644
--- a/apps/mvp/src/composables/auth.ts
+++ b/apps/mvp/src/composables/auth.ts
@@ -265,7 +265,6 @@ export default function useAuth() {
             } else if (provider === "Trezor") {
                 await loginWithTrezor(loginCredentials)
             } else if (provider === "WalletConnect") {
-                console.log("logging in with wallet connect")
                 await loginWithWalletConnectV2(loginCredentials)
             } else {
                 console.log("Sign up not yet supported for this wallet provider")
diff --git a/apps/mvp/src/composables/staking.ts b/apps/mvp/src/composables/staking.ts
index 0e1aa9b16..6821308d8 100644
--- a/apps/mvp/src/composables/staking.ts
+++ b/apps/mvp/src/composables/staking.ts
@@ -50,7 +50,9 @@ export default function useStaking() {
     async function deposit({ amount, walletProvider, type, pathIndex }: { amount: string, walletProvider: ProviderString, type: "default" | "eigen", pathIndex: number | undefined}) {
         stakeWithdrawError.value = ""
         try {
+            // This is currently handling the connectWalletConnectV2 if no current session
             const activeNetwork = await detectActiveNetwork(walletProvider)
+            console.log("activeNetwork :>> ", activeNetwork)
             if (activeNetwork !== 5) {
                 await switchEthersNetwork(walletProvider, "0x5")
                 return window.location.reload()
@@ -184,6 +186,7 @@ export default function useStaking() {
     async function withdraw({ amount, walletProvider, type }: { amount: string, walletProvider: ProviderString, type: "default" | "eigen" }) {
         try {
             stakeWithdrawError.value = ""
+            // This is currently handling the connectWalletConnectV2 if no current session
             const activeNetwork = await detectActiveNetwork(walletProvider)
             if (activeNetwork !== 5) {
                 await switchEthersNetwork(walletProvider, "0x5")
diff --git a/apps/mvp/src/composables/walletConnectV2.ts b/apps/mvp/src/composables/walletConnectV2.ts
index 3aa3e1c51..a94a9f988 100644
--- a/apps/mvp/src/composables/walletConnectV2.ts
+++ b/apps/mvp/src/composables/walletConnectV2.ts
@@ -42,6 +42,7 @@ export default function useWalletConnectV2() {
             }
             const rpcUrl = customRpcs[chainId]
             if (!rpcUrl) throw new Error(`RPC URL not found for chainId: ${chainId}`)
+            if (ethereumProvider.value.accounts.length > 0) throw new Error("Prompt user to simply change accounts to add it to their account")
             await ethereumProvider.value.connect()
             createEthersProvider()
             // const _accounts = await ethereumProvider.value.enable()
@@ -181,6 +182,22 @@ export default function useWalletConnectV2() {
         const handleAccountsChanged = async (walletConnectAccounts: Array<string>) => {
             console.log("ACCOUNTS CHANGED EVENT", walletConnectAccounts)
             if (!user.value && accounts.value.length > 0) return window.location.reload()
+            
+            // Check which accounts are new
+            const userAccounts = user.value?.accounts.map((account) => account.address.toLowerCase().trim())
+            const newAccounts = walletConnectAccounts.filter((account) => !userAccounts?.includes(account.toLowerCase().trim()))
+            
+            // Add new accounts to user
+            if (newAccounts.length > 0) {
+                // await addAccountToUser(newAccounts) // TODO: Enable this (review with @DemogorGod)
+                const newAccountsWithBalances = await Promise.all(newAccounts.map(async (account) => {
+                    return {
+                        address: account,
+                        balance: (await getEthersBalance(account)).toString()
+                    }
+                }))
+                walletConnectSelectedAccount.value = [...walletConnectSelectedAccount.value, ...newAccountsWithBalances]
+            }
         }
 
         // Event handler for chainChanged
diff --git a/apps/mvp/src/composables/wallets.ts b/apps/mvp/src/composables/wallets.ts
index a91228a50..e62aa8cd4 100644
--- a/apps/mvp/src/composables/wallets.ts
+++ b/apps/mvp/src/composables/wallets.ts
@@ -5,7 +5,7 @@ import useWalletConnectV2 from "@/composables/walletConnectV2"
 
 const installedWallets = ref([] as ProviderString[])
 const { browserProvidersList, detectActiveEthersWalletAddress, getBrowserProvider } = useEthers()
-const { web3Provider } = useWalletConnectV2()
+const { connectWalletConnectV2, web3Provider } = useWalletConnectV2()
 
 export default function useWallets() {
     async function detectActiveNetwork(providerString: ProviderString): Promise<number> {
@@ -15,6 +15,9 @@ export default function useWallets() {
                 const chainId = parseInt(await provider.request({ method: "eth_chainId" }), 16)
                 return chainId
             } else if (providerString === "WalletConnect") {
+                if (!web3Provider.value) {
+                    await connectWalletConnectV2("5")
+                }
                 return web3Provider.value.provider.chainId
             } else if (providerString === "Ledger") {
                 // TODO: Determine if there is a way to implement with Ledger or if have to rely on selected network on device

From 7518c8ef578fe0e9962c3180af066c60b46645a9 Mon Sep 17 00:00:00 2001
From: Christopher Cali <chris@consensusnetworks.com>
Date: Wed, 20 Dec 2023 15:21:36 -0500
Subject: [PATCH 6/6] Remove v2 from WalletConnect naming conventions

---
 apps/mvp/src/components/ConnectWalletsFlow.vue     |  8 ++++----
 apps/mvp/src/composables/auth.ts                   |  6 +++---
 apps/mvp/src/composables/operators.ts              |  6 +++---
 apps/mvp/src/composables/staking.ts                | 14 +++++++-------
 .../{walletConnectV2.ts => walletConnect.ts}       | 14 +++++++-------
 apps/mvp/src/composables/wallets.ts                |  6 +++---
 6 files changed, 27 insertions(+), 27 deletions(-)
 rename apps/mvp/src/composables/{walletConnectV2.ts => walletConnect.ts} (96%)

diff --git a/apps/mvp/src/components/ConnectWalletsFlow.vue b/apps/mvp/src/components/ConnectWalletsFlow.vue
index 0b3b6897b..827190376 100644
--- a/apps/mvp/src/components/ConnectWalletsFlow.vue
+++ b/apps/mvp/src/components/ConnectWalletsFlow.vue
@@ -10,7 +10,7 @@ import useLedger from "@/composables/ledger"
 import useTrezor from "@/composables/trezor"
 import useUser from "@/composables/user"
 import useWallets from "@/composables/wallets"
-import useWalletConnect from "@/composables/walletConnectV2"
+import useWalletConnect from "@/composables/walletConnect"
 // import useWallets from '@/composables/wallets'
 
 type UserAuthFlowState = 
@@ -40,7 +40,7 @@ const { getEthersLedgerAddresses } = useLedger()
 const { getEthersTrezorAddresses } = useTrezor()
 const { user } = useUser()
 const { detectActiveNetwork, switchEthersNetwork } = useWallets()
-const { connectWalletConnectV2, walletConnectSelectedAccount } = useWalletConnect()
+const { connectWalletConnect, walletConnectSelectedAccount } = useWalletConnect()
 // const { installedWallets, detectInstalledWalletProviders } = useWallets()
 
 // eslint-disable-next-line no-undef
@@ -164,7 +164,7 @@ async function selectProvider(provider: ProviderString): Promise<void> {
 
         if (provider === "WalletConnect") {
             // TODO: @@cali1 - pass in the network id dynamically
-            walletProviderAddresses.value = await connectWalletConnectV2(requiredNetwork) as CryptoAddress[]
+            walletProviderAddresses.value = await connectWalletConnect(requiredNetwork) as CryptoAddress[]
         } else if (browserProvidersList.includes(provider)) {
             walletProviderAddresses.value = await getEthersAddressesWithBalances(provider) as CryptoAddress[]
         } else if (provider === "Ledger") {
@@ -684,4 +684,4 @@ watch(walletConnectSelectedAccount, () => {
   letter-spacing: -0.01em;
   color: #667085;
 }
-</style>@/composables/eventBus
\ No newline at end of file
+</style>@/composables/eventBus@/composables/walletConnect
\ No newline at end of file
diff --git a/apps/mvp/src/composables/auth.ts b/apps/mvp/src/composables/auth.ts
index b5768469a..f0b725545 100644
--- a/apps/mvp/src/composables/auth.ts
+++ b/apps/mvp/src/composables/auth.ts
@@ -5,7 +5,7 @@ import useEthers from "@/composables/ethers"
 import useLedger from "@/composables/ledger"
 import useTrezor from "@/composables/trezor"
 import useUser from "@/composables/user"
-import useWalletConnect from "@/composables/walletConnectV2"
+import useWalletConnect from "@/composables/walletConnect"
 import useWallets from "@/composables/wallets"
 import {
     Account,
@@ -20,7 +20,7 @@ const { browserProvidersList, loginWithEthers } = useEthers()
 const { loginWithLedger } = useLedger()
 const { loginWithTrezor } = useTrezor()
 const { setUser, user } = useUser()
-const { disconnectWalletConnect, loginWithWalletConnectV2, initializeWalletConnect } = useWalletConnect()
+const { disconnectWalletConnect, loginWithWalletConnect, initializeWalletConnect } = useWalletConnect()
 const { detectActiveWalletAddress } = useWallets()
 
 const initializedAuthComposable = ref(false)
@@ -265,7 +265,7 @@ export default function useAuth() {
             } else if (provider === "Trezor") {
                 await loginWithTrezor(loginCredentials)
             } else if (provider === "WalletConnect") {
-                await loginWithWalletConnectV2(loginCredentials)
+                await loginWithWalletConnect(loginCredentials)
             } else {
                 console.log("Sign up not yet supported for this wallet provider")
             }
diff --git a/apps/mvp/src/composables/operators.ts b/apps/mvp/src/composables/operators.ts
index 3d8aba168..c221447ed 100644
--- a/apps/mvp/src/composables/operators.ts
+++ b/apps/mvp/src/composables/operators.ts
@@ -9,7 +9,7 @@ import useLedger from "@/composables/ledger"
 import useTrezor from "@/composables/trezor"
 import useUser from "@/composables/user"
 import useWallets from "@/composables/wallets"
-import useWalletConnectV2 from "@/composables/walletConnectV2"
+import useWalletConnect from "@/composables/walletConnect"
 import { CasimirManager, CasimirRegistry, CasimirViews } from "@casimir/ethereum/build/@types"
 
 let baseManager: CasimirManager
@@ -35,7 +35,7 @@ const { getEthersLedgerSigner } = useLedger()
 const { getEthersTrezorSigner } = useTrezor()
 const { user } = useUser()
 const { detectActiveNetwork, switchEthersNetwork } = useWallets()
-const { getWalletConnectSignerV2 } = useWalletConnectV2()
+const { getWalletConnectSigner } = useWalletConnect()
 const loadingInitializeOperators = ref(false)
 const loadingInitializeOperatorsError = ref(false)
 
@@ -210,7 +210,7 @@ export default function useOperators() {
             if (browserProvidersList.includes(walletProvider)) {
                 signer = getEthersBrowserSigner(walletProvider)
             } else if (walletProvider === "WalletConnect") {
-                await getWalletConnectSignerV2()
+                await getWalletConnectSigner()
             } else if (walletProvider === "Ledger") {
                 getEthersLedgerSigner()
             } else if (walletProvider === "Trezor") {
diff --git a/apps/mvp/src/composables/staking.ts b/apps/mvp/src/composables/staking.ts
index 6821308d8..b3a9e7ca2 100644
--- a/apps/mvp/src/composables/staking.ts
+++ b/apps/mvp/src/composables/staking.ts
@@ -7,7 +7,7 @@ import useLedger from "@/composables/ledger"
 import useTrezor from "@/composables/trezor"
 import useUser from "@/composables/user"
 import useWallets from "@/composables/wallets"
-import useWalletConnectV2 from "./walletConnectV2"
+import useWalletConnect from "./walletConnect"
 import { CasimirManager } from "@casimir/ethereum/build/@types"
 import { StakeDetails } from "@casimir/types"
 
@@ -17,7 +17,7 @@ const { getEthersLedgerSigner } = useLedger()
 const { getEthersTrezorSigner } = useTrezor()
 const { user } = useUser()
 const { detectActiveNetwork, switchEthersNetwork } = useWallets()
-const { getWalletConnectSignerV2 } = useWalletConnectV2()
+const { getWalletConnectSigner } = useWalletConnect()
 
 const stakingComposableInitialized = ref(false)
 const awaitingStakeOrWithdrawConfirmation = ref(false)
@@ -50,7 +50,7 @@ export default function useStaking() {
     async function deposit({ amount, walletProvider, type, pathIndex }: { amount: string, walletProvider: ProviderString, type: "default" | "eigen", pathIndex: number | undefined}) {
         stakeWithdrawError.value = ""
         try {
-            // This is currently handling the connectWalletConnectV2 if no current session
+            // This is currently handling the connectWalletConnect if no current session
             const activeNetwork = await detectActiveNetwork(walletProvider)
             console.log("activeNetwork :>> ", activeNetwork)
             if (activeNetwork !== 5) {
@@ -62,7 +62,7 @@ export default function useStaking() {
             if (browserProvidersList.includes(walletProvider)) {
                 signer = getEthersBrowserSigner(walletProvider)
             } else if (walletProvider === "WalletConnect") {
-                signer = await getWalletConnectSignerV2()
+                signer = await getWalletConnectSigner()
             } else if (walletProvider === "Ledger") {
                 signer = getEthersLedgerSigner(pathIndex)
             } else if (walletProvider === "Trezor") {
@@ -168,7 +168,7 @@ export default function useStaking() {
         if (browserProvidersList.includes(walletProvider)) {
             signer = getEthersBrowserSigner(walletProvider)
         } else if (walletProvider === "WalletConnect") {
-            await getWalletConnectSignerV2()
+            await getWalletConnectSigner()
         } else if (walletProvider === "Ledger") {
             getEthersLedgerSigner()
         } else if (walletProvider === "Trezor") {
@@ -186,7 +186,7 @@ export default function useStaking() {
     async function withdraw({ amount, walletProvider, type }: { amount: string, walletProvider: ProviderString, type: "default" | "eigen" }) {
         try {
             stakeWithdrawError.value = ""
-            // This is currently handling the connectWalletConnectV2 if no current session
+            // This is currently handling the connectWalletConnect if no current session
             const activeNetwork = await detectActiveNetwork(walletProvider)
             if (activeNetwork !== 5) {
                 await switchEthersNetwork(walletProvider, "0x5")
@@ -197,7 +197,7 @@ export default function useStaking() {
             if (browserProvidersList.includes(walletProvider)) {
                 signer = getEthersBrowserSigner(walletProvider)
             } else if (walletProvider === "WalletConnect") {
-                await getWalletConnectSignerV2()
+                await getWalletConnectSigner()
             } else if (walletProvider === "Ledger") {
                 getEthersLedgerSigner()
             } else if (walletProvider === "Trezor") {
diff --git a/apps/mvp/src/composables/walletConnectV2.ts b/apps/mvp/src/composables/walletConnect.ts
similarity index 96%
rename from apps/mvp/src/composables/walletConnectV2.ts
rename to apps/mvp/src/composables/walletConnect.ts
index a94a9f988..1a37b41e7 100644
--- a/apps/mvp/src/composables/walletConnectV2.ts
+++ b/apps/mvp/src/composables/walletConnect.ts
@@ -30,8 +30,8 @@ const isInitializing = ref(false)
 
 const walletConnectSelectedAccount = ref([] as Array<CryptoAddress>)
 
-export default function useWalletConnectV2() {
-    async function connectWalletConnectV2(chainId: "1" | "5" | "1337", pairing?: PairingTypes.Struct): Promise<CryptoAddress[]> {
+export default function useWalletConnect() {
+    async function connectWalletConnect(chainId: "1" | "5" | "1337", pairing?: PairingTypes.Struct): Promise<CryptoAddress[]> {
         try {
             if (!ethereumProvider.value) throw new ReferenceError("WalletConnect Client is not initialized.")
         
@@ -106,7 +106,7 @@ export default function useWalletConnectV2() {
         _resetApp()
     }
 
-    function getWalletConnectSignerV2() {
+    function getWalletConnectSigner() {
         if (!web3Provider.value) throw new Error("Web3Provider is not initialized")
         return web3Provider.value.getSigner()
     }
@@ -118,7 +118,7 @@ export default function useWalletConnectV2() {
         await createClient()
     }
 
-    async function loginWithWalletConnectV2(loginCredentials: LoginCredentials) {
+    async function loginWithWalletConnect(loginCredentials: LoginCredentials) {
         const { provider, address, currency } = loginCredentials
         const message = await createSiweMessage(address, "Sign in with Ethereum to the Casimir.")
         const signedMessage = await signWalletConnectMessage(message)
@@ -250,10 +250,10 @@ export default function useWalletConnectV2() {
     return {
         walletConnectSelectedAccount,
         web3Provider,
-        connectWalletConnectV2,
+        connectWalletConnect,
         disconnectWalletConnect,
-        getWalletConnectSignerV2,
+        getWalletConnectSigner,
         initializeWalletConnect,
-        loginWithWalletConnectV2,
+        loginWithWalletConnect,
     }
 }
\ No newline at end of file
diff --git a/apps/mvp/src/composables/wallets.ts b/apps/mvp/src/composables/wallets.ts
index e62aa8cd4..509a33edf 100644
--- a/apps/mvp/src/composables/wallets.ts
+++ b/apps/mvp/src/composables/wallets.ts
@@ -1,11 +1,11 @@
 import { ref, readonly } from "vue"
 import { ProviderString } from "@casimir/types"
 import useEthers from "@/composables/ethers"
-import useWalletConnectV2 from "@/composables/walletConnectV2"
+import useWalletConnect from "@/composables/walletConnect"
 
 const installedWallets = ref([] as ProviderString[])
 const { browserProvidersList, detectActiveEthersWalletAddress, getBrowserProvider } = useEthers()
-const { connectWalletConnectV2, web3Provider } = useWalletConnectV2()
+const { connectWalletConnect, web3Provider } = useWalletConnect()
 
 export default function useWallets() {
     async function detectActiveNetwork(providerString: ProviderString): Promise<number> {
@@ -16,7 +16,7 @@ export default function useWallets() {
                 return chainId
             } else if (providerString === "WalletConnect") {
                 if (!web3Provider.value) {
-                    await connectWalletConnectV2("5")
+                    await connectWalletConnect("5")
                 }
                 return web3Provider.value.provider.chainId
             } else if (providerString === "Ledger") {