From 8066cee536ae5678bf27e8745a7e08db9218f928 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Wed, 26 Jun 2024 11:34:21 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20update=20session=20on=20login?=
 =?UTF-8?q?=20rather=20than=20disconnecting=20wallet=20connec=E2=80=A6"=20?=
 =?UTF-8?q?(#2659)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1b917f357d14ef6f92416b5307fa783c6792ad57.
---
 .../dapp-config/components/DappCard.svelte    |  2 +-
 .../components/EditSelectionDrawer.svelte     |  4 +-
 .../views/ConfirmConnectionDrawer.svelte      | 10 +--
 .../views/ConnectedDappsDrawer.svelte         | 13 +++-
 .../views/DappDetailsDrawer.svelte            |  9 ++-
 .../wallet-connect/actions/connectToDapp.ts   |  4 +-
 .../actions/removeAllDisconnectedDapps.ts     | 11 +--
 .../stores/persisted-dapp-namespaces.store.ts |  9 +--
 .../stores/persisted-dapps.store.ts           | 68 ++++++++-----------
 .../utils/buildDefaultNamespaces.ts           | 36 ----------
 .../auxiliary/wallet-connect/utils/index.ts   |  3 -
 .../utils/normalizeSupportedNamespace.ts      | 16 -----
 .../updateActiveSessionsToActiveProfile.ts    | 34 ----------
 .../profile/actions/active-profile/login.ts   |  4 +-
 .../alpha/alpha-profile-migration-15-to-16.ts |  3 +-
 .../prod/prod-profile-migration-8-to-9.ts     |  7 +-
 packages/shared/src/locales/en.json           |  1 -
 17 files changed, 66 insertions(+), 168 deletions(-)
 delete mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/utils/buildDefaultNamespaces.ts
 delete mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/utils/normalizeSupportedNamespace.ts
 delete mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/utils/updateActiveSessionsToActiveProfile.ts

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte
index f025c3f431..0ecea8e1ae 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte
@@ -12,7 +12,7 @@
     export let onClick: (() => unknown) | undefined = undefined
 
     $: networkIds = Object.values(
-        dapp.session?.namespaces ?? getPersistedDappNamespacesForDapp(dapp.metadata?.url ?? '') ?? {}
+        dapp.session?.namespaces ?? getPersistedDappNamespacesForDapp(dapp.metadata?.url ?? '')?.supported ?? {}
     ).flatMap((namespace) => namespace.chains as NetworkId[])
 
     $: verifiedState = $activeProfileId
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte
index 9a167dc4d8..7809483912 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte
@@ -32,7 +32,7 @@
             selections,
             requiredNamespaces,
             optionalNamespaces,
-            persistedDapp?.supported
+            persistedDapp?.namespaces.supported
         )
         updateSupportedDappNamespacesForDapp(dappMetadata.url, updatedNamespace)
         if ($selectedDapp?.session) {
@@ -59,7 +59,7 @@
         <div class="p-6 flex-grow overflow-hidden">
             <div class="h-full flex flex-col gap-8 overflow-scroll">
                 <slot
-                    persistedSupportedNamespaces={persistedDapp?.supported}
+                    persistedSupportedNamespaces={persistedDapp?.namespaces.supported}
                     {requiredNamespaces}
                     {optionalNamespaces}
                 />
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConfirmConnectionDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConfirmConnectionDrawer.svelte
index 0ef46d540d..888df6871c 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConfirmConnectionDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConfirmConnectionDrawer.svelte
@@ -4,7 +4,7 @@
     import { DappVerification } from '@auxiliary/wallet-connect/enums'
     import {
         clearSessionInitiationRequest,
-        getPersistedDapp,
+        getPersistedDappNamespacesForDapp,
         sessionInitiationRequest,
     } from '@auxiliary/wallet-connect/stores'
     import { ISupportedNamespace, SupportedNamespaces } from '@auxiliary/wallet-connect/types'
@@ -63,12 +63,12 @@
             return {}
         }
 
-        const persistedDapp = $sessionInitiationRequest
-            ? getPersistedDapp($sessionInitiationRequest.params.proposer.metadata.url)
+        const persistedNamespaces = $sessionInitiationRequest
+            ? getPersistedDappNamespacesForDapp($sessionInitiationRequest.params.proposer.metadata.url)
             : undefined
 
-        if (persistedDapp?.supported) {
-            return persistedDapp.supported
+        if (persistedNamespaces) {
+            return persistedNamespaces.supported
         }
 
         const { requiredNamespaces, optionalNamespaces } = $sessionInitiationRequest.params
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectedDappsDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectedDappsDrawer.svelte
index 4aae4c2fb2..decf541efb 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectedDappsDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectedDappsDrawer.svelte
@@ -1,5 +1,10 @@
 <script lang="ts">
-    import { clearSelectedDapp, connectedDapps, setSelectedDapp } from '@auxiliary/wallet-connect/stores'
+    import {
+        clearSelectedDapp,
+        connectedDapps,
+        persistedDapps,
+        setSelectedDapp,
+    } from '@auxiliary/wallet-connect/stores'
     import { Button, IconName, Tabs, Text } from '@bloomwalletio/ui'
     import { DappListActionsMenu, DrawerTemplate, EmptyListPlaceholder } from '@components'
     import { localize } from '@core/i18n'
@@ -8,6 +13,7 @@
     import { DappConfigRoute } from '../dapp-config-route.enum'
     import { IConnectedDapp } from '@auxiliary/wallet-connect/interface'
     import { updateDrawerProps } from '@desktop/auxiliary/drawer'
+    import { activeProfileId } from '@core/profile/stores'
 
     export let drawerRouter: Router<unknown>
 
@@ -25,8 +31,9 @@
     let selectedTab = tabs[0]
     let selectedIndex = 0
 
-    $: connectedDappsForProfile = $connectedDapps
-
+    $: connectedDappsForProfile = $connectedDapps.filter(
+        (dapp) => !!$persistedDapps[$activeProfileId as string]?.[dapp.metadata?.url ?? '']
+    )
     $: displayedDapps = connectedDappsForProfile.filter(
         (dapp) => (selectedIndex === 0 && !!dapp.session) || (selectedIndex === 1 && !dapp.session)
     )
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte
index 26f5b1fd14..86242cd303 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte
@@ -15,7 +15,8 @@
 
     const localeKey = 'views.dashboard.drawers.dapps.details'
     const dapp = structuredClone($selectedDapp) as IConnectedDapp
-    const persistedDapp = dapp?.metadata ? getPersistedDapp(dapp?.metadata.url) : undefined
+
+    $: persistedDapp = dapp?.metadata ? getPersistedDapp(dapp?.metadata.url) : undefined
 
     onMount(() => {
         if (!$selectedDapp) {
@@ -40,17 +41,15 @@
                         orientation="vertical"
                     />
                 {/if}
-                {#if persistedDapp?.supported}
+                {#if persistedDapp?.namespaces.supported}
                     <ConnectionSummary
                         requiredNamespaces={dapp.session?.requiredNamespaces}
                         editable={!!dapp.session}
-                        supportedNamespaces={persistedDapp?.supported}
+                        supportedNamespaces={persistedDapp?.namespaces.supported}
                         onEditPermissionsClick={() => drawerRouter.goTo(DappConfigRoute.EditPermissions)}
                         onEditNetworksClick={() => drawerRouter.goTo(DappConfigRoute.EditNetworks)}
                         onEditAccountsClick={() => drawerRouter.goTo(DappConfigRoute.EditAccounts)}
                     />
-                {:else}
-                    <Text type="body2" align="center">{localize(`${localeKey}.notConnectedToProfile`)}</Text>
                 {/if}
             </div>
         </div>
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/connectToDapp.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/connectToDapp.ts
index 72a12ea0a7..7486b35ae2 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/connectToDapp.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/connectToDapp.ts
@@ -21,8 +21,6 @@ export async function connectToDapp(
     persistDapp(
         dappUrl,
         verificationState.isScam ? DappVerification.Scam : (verificationState.validation as DappVerification),
-        requiredNamespaces,
-        optionalNamespaces,
-        supportedNamespaces
+        { supported: supportedNamespaces, required: requiredNamespaces, optional: optionalNamespaces }
     )
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/removeAllDisconnectedDapps.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/removeAllDisconnectedDapps.ts
index 2ee1416e66..037f7330d8 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/removeAllDisconnectedDapps.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/removeAllDisconnectedDapps.ts
@@ -1,6 +1,5 @@
-import { connectedDapps, getWalletClient, setConnectedDapps } from '../stores'
+import { connectedDapps, getWalletClient, getPersistedDapp, removePersistedDapp } from '../stores'
 import { get } from 'svelte/store'
-import { clearOldPairings } from './clearOldPairings'
 
 export function removeAllDisconnectedDapps(): void {
     const client = getWalletClient()
@@ -8,11 +7,13 @@ export function removeAllDisconnectedDapps(): void {
         return
     }
 
-    const connectedDappsForProfile = get(connectedDapps).filter((dapp) => !dapp.session)
+    const connectedDappsForProfile = get(connectedDapps).filter(
+        (dapp) => !!getPersistedDapp(dapp.metadata?.url ?? '') && !dapp.session
+    )
+
     for (const dapp of connectedDappsForProfile) {
         if (dapp.metadata) {
-            void clearOldPairings(dapp.metadata.url)
+            removePersistedDapp(dapp.metadata.url)
         }
     }
-    setConnectedDapps()
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/stores/persisted-dapp-namespaces.store.ts b/packages/shared/src/lib/auxiliary/wallet-connect/stores/persisted-dapp-namespaces.store.ts
index dc65238e35..46bed3d205 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/stores/persisted-dapp-namespaces.store.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/stores/persisted-dapp-namespaces.store.ts
@@ -1,15 +1,10 @@
 import { persistent } from '@core/utils/store'
 import { Writable } from 'svelte/store'
-import { SupportedNamespaces } from '../types'
-import { ProposalTypes } from '@walletconnect/types'
+import { IPersistedNamespaces } from '../interface'
 
 interface IPersistedNamespacesStore {
     [profileId: string]: {
-        [dappOriginUrl: string]: {
-            supported: SupportedNamespaces
-            required: ProposalTypes.RequiredNamespaces
-            optional: ProposalTypes.OptionalNamespaces
-        }
+        [dappOriginUrl: string]: IPersistedNamespaces
     }
 }
 // Keeping this store for for backwards compatibility for 1.0.1
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/stores/persisted-dapps.store.ts b/packages/shared/src/lib/auxiliary/wallet-connect/stores/persisted-dapps.store.ts
index afe1870e0b..cb4c1619f5 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/stores/persisted-dapps.store.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/stores/persisted-dapps.store.ts
@@ -2,16 +2,14 @@ import { persistent } from '@core/utils/store'
 import { Writable, get } from 'svelte/store'
 import { SupportedNamespaces } from '../types'
 import { getActiveProfileId } from '@core/profile/stores'
+import { IPersistedNamespaces } from '../interface'
 import { DappVerification } from '../enums'
-import { ProposalTypes } from '@walletconnect/types'
 
 interface IPersistedDappStore {
-    [dappOriginUrl: string]: {
-        verificationState: DappVerification
-        required: ProposalTypes.RequiredNamespaces
-        optional: ProposalTypes.OptionalNamespaces
-        supported: {
-            [profileId: string]: SupportedNamespaces
+    [profileId: string]: {
+        [dappOriginUrl: string]: {
+            verificationState: DappVerification
+            namespaces: IPersistedNamespaces
         }
     }
 }
@@ -21,47 +19,31 @@ export const persistedDapps: Writable<IPersistedDappStore> = persistent('persist
 export function getPersistedDapp(dappOriginUrl: string):
     | {
           verificationState: DappVerification
-          required: ProposalTypes.RequiredNamespaces
-          optional: ProposalTypes.OptionalNamespaces
-          supported: SupportedNamespaces | undefined
+          namespaces: IPersistedNamespaces
       }
     | undefined {
     const profileId = getActiveProfileId()
-    const persistedDapp = get(persistedDapps)?.[dappOriginUrl]
-    if (!persistedDapp) {
-        return undefined
-    }
-
-    return {
-        verificationState: persistedDapp.verificationState,
-        required: persistedDapp.required,
-        optional: persistedDapp.optional,
-        supported: persistedDapp.supported[profileId],
-    }
+    return get(persistedDapps)?.[profileId]?.[dappOriginUrl]
 }
 
-export function getPersistedDappNamespacesForDapp(dappOriginUrl: string): SupportedNamespaces | undefined {
-    return getPersistedDapp(dappOriginUrl)?.supported
+export function getPersistedDappNamespacesForDapp(dappOriginUrl: string): IPersistedNamespaces | undefined {
+    return getPersistedDapp(dappOriginUrl)?.namespaces
 }
 
 export function persistDapp(
     dappOriginUrl: string,
     verificationState: DappVerification,
-    required: ProposalTypes.RequiredNamespaces,
-    optional: ProposalTypes.OptionalNamespaces,
-    supported: SupportedNamespaces
+    namespaces: IPersistedNamespaces
 ): void {
     const profileId = getActiveProfileId()
 
     return persistedDapps.update((state) => {
-        state[dappOriginUrl] = {
+        if (!state[profileId]) {
+            state[profileId] = {}
+        }
+        state[profileId][dappOriginUrl] = {
             verificationState,
-            required,
-            optional,
-            supported: {
-                ...(state[dappOriginUrl]?.supported ?? {}),
-                [profileId]: supported,
-            },
+            namespaces,
         }
 
         return state
@@ -72,14 +54,14 @@ export function updateSupportedDappNamespacesForDapp(dappOriginUrl: string, supp
     const profileId = getActiveProfileId()
 
     return persistedDapps.update((state) => {
-        const persistedDapp = state?.[dappOriginUrl]
+        const persistedDapp = state?.[profileId]?.[dappOriginUrl]
         if (!persistedDapp) {
             return state
         }
 
         const updatedNamespaces = {
-            ...persistedDapp,
-            supported: { ...persistedDapp.supported, [profileId]: supported },
+            ...persistedDapp.namespaces,
+            supported: { ...persistedDapp.namespaces.supported, ...supported },
         }
 
         state[profileId][dappOriginUrl] = {
@@ -89,15 +71,16 @@ export function updateSupportedDappNamespacesForDapp(dappOriginUrl: string, supp
         return state
     })
 }
-
 export function updateVerificationStateForDapp(dappOriginUrl: string, verificationState: DappVerification): void {
+    const profileId = getActiveProfileId()
+
     return persistedDapps.update((state) => {
-        const persistedDapp = state?.[dappOriginUrl]
+        const persistedDapp = state?.[profileId]?.[dappOriginUrl]
         if (!persistedDapp) {
             return state
         }
 
-        state[dappOriginUrl] = {
+        state[profileId][dappOriginUrl] = {
             ...persistedDapp,
             verificationState,
         }
@@ -106,8 +89,13 @@ export function updateVerificationStateForDapp(dappOriginUrl: string, verificati
 }
 
 export function removePersistedDapp(dappOriginUrl: string): void {
+    const profileId = getActiveProfileId()
+
     return persistedDapps.update((state) => {
-        delete state[dappOriginUrl]
+        if (!state[profileId]) {
+            return state
+        }
+        delete state[profileId][dappOriginUrl]
         return state
     })
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/buildDefaultNamespaces.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/buildDefaultNamespaces.ts
deleted file mode 100644
index c11916cf64..0000000000
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/buildDefaultNamespaces.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { getEvmNetworks } from '@core/network'
-import { SupportedNamespaces } from '../types'
-import { getCaip10AddressForAccount } from './buildCaip10Address'
-import { ALL_SUPPORTED_METHODS, SUPPORTED_EVENTS } from '../constants'
-import { get } from 'svelte/store'
-import { activeAccounts } from '@core/profile/stores'
-import type { ProposalTypes } from '@walletconnect/types'
-
-export function buildDefaultNamespaces(
-    requiredNamespaces: ProposalTypes.RequiredNamespaces,
-    optionalNamespaces: ProposalTypes.OptionalNamespaces
-): SupportedNamespaces {
-    const allChainids = [...Object.values(requiredNamespaces), ...Object.values(optionalNamespaces)]
-        .flatMap(({ chains }) => chains)
-        .filter(Boolean)
-
-    const namespace: SupportedNamespaces = {}
-    for (const network of getEvmNetworks()) {
-        if (!allChainids.includes(network.id)) {
-            continue
-        }
-        if (!namespace[network.namespace]) {
-            const accounts = get(activeAccounts)
-                .map((account) => getCaip10AddressForAccount(account, network.id) as string)
-                .filter(Boolean)
-            namespace[network.namespace] = {
-                chains: [],
-                methods: ALL_SUPPORTED_METHODS,
-                events: SUPPORTED_EVENTS,
-                accounts,
-            }
-        }
-        namespace[network.namespace].chains.push(network.id)
-    }
-    return namespace
-}
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
index 9970ca1062..fbb8752cf8 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
@@ -1,13 +1,10 @@
 export * from './buildCaip10Address'
-export * from './buildDefaultNamespaces'
 export * from './disconnectAllDapps'
 export * from './doesNamespaceSupportEvent'
 export * from './getBloomError'
 export * from './getPermissionForMethod'
-export * from './normalizeSupportedNamespace'
 export * from './rejectAndClearSessionInitiationRequest'
 export * from './rejectSessionInitiationRequest'
 export * from './switchToRequiredAccount'
-export * from './updateActiveSessionsToActiveProfile'
 export * from './updateSession'
 export * from './validateConnectionCodeUri'
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/normalizeSupportedNamespace.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/normalizeSupportedNamespace.ts
deleted file mode 100644
index fe96a9edb9..0000000000
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/normalizeSupportedNamespace.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type { SessionTypes } from '@walletconnect/types'
-import type { SupportedNamespaces } from '../types'
-
-export function normalizeSessionNamespace(sessionNamespace: SessionTypes.Namespaces): SupportedNamespaces {
-    const normalizedRecord: SupportedNamespaces = {}
-
-    for (const key in sessionNamespace) {
-        const session = sessionNamespace[key]
-        normalizedRecord[key] = {
-            ...session,
-            chains: session.chains || [],
-        }
-    }
-
-    return normalizedRecord
-}
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/updateActiveSessionsToActiveProfile.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/updateActiveSessionsToActiveProfile.ts
deleted file mode 100644
index 7f395c2be6..0000000000
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/updateActiveSessionsToActiveProfile.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { DappVerification } from '../enums'
-import { getPersistedDappNamespacesForDapp, getWalletClient, persistDapp, setConnectedDapps } from '../stores'
-import { buildDefaultNamespaces } from './buildDefaultNamespaces'
-
-export async function updateActiveSessionsToActiveProfile(): Promise<void> {
-    const activeSessions = getWalletClient()?.getActiveSessions() ?? {}
-    for (const session of Object.values(activeSessions)) {
-        try {
-            const persistedSupportedNamespaces = getPersistedDappNamespacesForDapp(session.peer.metadata.url)
-            if (persistedSupportedNamespaces) {
-                await getWalletClient()?.updateSession({
-                    topic: session.topic,
-                    namespaces: persistedSupportedNamespaces,
-                })
-            } else {
-                const supportedNamespaces = buildDefaultNamespaces(
-                    session.requiredNamespaces,
-                    session.optionalNamespaces
-                )
-                await getWalletClient()?.updateSession({ topic: session.topic, namespaces: supportedNamespaces })
-                persistDapp(
-                    session.peer.metadata.url,
-                    DappVerification.Unknown,
-                    session.requiredNamespaces,
-                    session.optionalNamespaces,
-                    supportedNamespaces
-                )
-            }
-        } catch (err) {
-            console.error('Error updating session', err)
-        }
-    }
-    setConnectedDapps()
-}
diff --git a/packages/shared/src/lib/core/profile/actions/active-profile/login.ts b/packages/shared/src/lib/core/profile/actions/active-profile/login.ts
index 40ad3207eb..28c847e529 100644
--- a/packages/shared/src/lib/core/profile/actions/active-profile/login.ts
+++ b/packages/shared/src/lib/core/profile/actions/active-profile/login.ts
@@ -38,12 +38,12 @@ import { checkAndInitializeActiveProfileNetwork } from './checkAndInitializeActi
 import { loadAccounts } from './loadAccounts'
 import { logout } from './logout'
 import { subscribeToWalletApiEventsForActiveProfile } from './subscribeToWalletApiEventsForActiveProfile'
+import { disconnectAllDapps } from '@auxiliary/wallet-connect/utils'
 import { cleanupOnboarding } from '@contexts/onboarding'
 import { fetchAndPersistTransactionsForAccounts } from '@core/transactions/actions'
 import { updateCirculatingSupplyForActiveProfile } from './updateCirculatingSupplyForActiveProfile'
 import { notificationsManager } from '@auxiliary/wallet-connect/notifications'
 import { getEvmNetworks } from '@core/network'
-import { updateActiveSessionsToActiveProfile } from '@auxiliary/wallet-connect/utils'
 
 export async function login(loginOptions?: ILoginOptions): Promise<void> {
     const loginRouter = get(routerManager)?.getRouterForAppContext(AppContext.Login)
@@ -114,7 +114,7 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
         }
 
         if (getLastLoggedInProfileId() !== _activeProfile.id) {
-            void updateActiveSessionsToActiveProfile()
+            void disconnectAllDapps()
         }
 
         setSelectedAccount(lastUsedAccountIndex ?? loadedAccounts?.[0]?.index)
diff --git a/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-15-to-16.ts b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-15-to-16.ts
index f18fe7c98f..e892bb3820 100644
--- a/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-15-to-16.ts
+++ b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-15-to-16.ts
@@ -8,8 +8,7 @@ export function alphaProfileMigration15To16(existingProfile: unknown): Promise<v
 
     const namespaces = get(persistedDappNamespaces)[profile.id] ?? {}
     for (const dappUrl of Object.keys(namespaces)) {
-        const { required, optional, supported } = namespaces[dappUrl]
-        persistDapp(dappUrl, DappVerification.Unknown, required, optional, supported)
+        persistDapp(dappUrl, DappVerification.Unknown, namespaces[dappUrl])
     }
 
     persistedDappNamespaces.update((state) => {
diff --git a/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-8-to-9.ts b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-8-to-9.ts
index 8f575c9edb..a9381bb2af 100644
--- a/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-8-to-9.ts
+++ b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-8-to-9.ts
@@ -1,5 +1,5 @@
 import { DappVerification } from '@auxiliary/wallet-connect/enums'
-import { persistDapp, persistedDappNamespaces } from '@auxiliary/wallet-connect/stores'
+import { getPersistedDapp, persistDapp, persistedDappNamespaces } from '@auxiliary/wallet-connect/stores'
 import { DEFAULT_BASE_TOKEN, DEFAULT_EXPLORER_URLS } from '@core/network/constants'
 import { IPersistedProfile } from '@core/profile/interfaces'
 import { IBaseToken } from '@core/token/interfaces'
@@ -11,8 +11,9 @@ export function prodProfileMigration8To9(existingProfile: unknown): Promise<void
 
     const namespaces = get(persistedDappNamespaces)[profile.id] ?? {}
     for (const dappUrl of Object.keys(namespaces)) {
-        const { required, optional, supported } = namespaces[dappUrl]
-        persistDapp(dappUrl, DappVerification.Unknown, required, optional, supported)
+        if (!getPersistedDapp(dappUrl)) {
+            persistDapp(dappUrl, DappVerification.Unknown, namespaces[dappUrl])
+        }
     }
 
     persistedDappNamespaces.update((state) => {
diff --git a/packages/shared/src/locales/en.json b/packages/shared/src/locales/en.json
index 8c22bfa33a..703af9153c 100644
--- a/packages/shared/src/locales/en.json
+++ b/packages/shared/src/locales/en.json
@@ -624,7 +624,6 @@
                         "description": "Description",
                         "url": "URL",
                         "verifyUrl": "Verify URL",
-                        "notConnectedToProfile": "Not connected to this profile",
                         "disconnect": {
                             "title": "Disconnect",
                             "description": "Do you want to disconnect from {dappName}?"