From 9ac568131463aa2bbffe471b5892e8288349728d Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Sat, 27 Apr 2024 11:01:16 +0200
Subject: [PATCH] enhancement: persist verification state for dapp (#2357)

* create persisted dapps store

* add verified icon to dapp list

* add migrations

* add verification icon to edit + details drawer

* add comment + fix profile version

* PR fixes

* update migrations

---------

Co-authored-by: Tuditi <45079109+Tuditi@users.noreply.github.com>
---
 .../dapp-config/components/DappCard.svelte    |  28 +++--
 .../components/EditSelectionDrawer.svelte     |  16 +--
 .../views/ConnectedDappsDrawer.svelte         |   4 +-
 .../views/DappDetailsDrawer.svelte            |  12 +--
 .../wallet-connect/actions/connectToDapp.ts   |  11 +-
 .../actions/removeAllDisconnectedDapps.ts     |  11 +-
 .../wallet-connect/actions/removeDapp.ts      |   4 +-
 .../handlers/onSessionRequest.handler.ts      |   5 +-
 .../auxiliary/wallet-connect/stores/index.ts  |   1 +
 .../stores/persisted-dapp-namespaces.store.ts |  60 +----------
 .../stores/persisted-dapps.store.ts           | 101 ++++++++++++++++++
 .../constants/profile-version.constant.ts     |   4 +-
 .../alpha/alpha-profile-migration-15-to-16.ts |  20 ++++
 .../alpha/alpha-profile-migration-map.ts      |   2 +
 .../prod/prod-profile-migration-8-to-9.ts     |  20 ++++
 .../prod/prod-profile-migration-map.ts        |   2 +
 16 files changed, 202 insertions(+), 99 deletions(-)
 create mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/stores/persisted-dapps.store.ts
 create mode 100644 packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-15-to-16.ts
 create mode 100644 packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-8-to-9.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 f08022df16..0ecea8e1ae 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte
@@ -1,18 +1,23 @@
 <script lang="ts">
     import { IConnectedDapp } from '@auxiliary/wallet-connect/interface'
-    import { ClickableTile, NetworkAvatar } from '@ui'
+    import { ClickableTile, DappVerificationIcon, NetworkAvatar } from '@ui'
     import { Avatar, AvatarGroup, IconName, Text } from '@bloomwalletio/ui'
     import { NetworkId } from '@core/network'
-    import { getPersistedDappNamespacesForDapp } from '@auxiliary/wallet-connect/stores'
+    import { getPersistedDappNamespacesForDapp, persistedDapps } from '@auxiliary/wallet-connect/stores'
     import { localize } from '@core/i18n'
+    import { activeProfileId } from '@core/profile/stores'
 
     export let dapp: IConnectedDapp
     export let disabled: boolean = false
     export let onClick: (() => unknown) | undefined = undefined
 
     $: networkIds = Object.values(
-        dapp.session?.namespaces ?? getPersistedDappNamespacesForDapp(dapp.metadata?.url)?.supported ?? {}
+        dapp.session?.namespaces ?? getPersistedDappNamespacesForDapp(dapp.metadata?.url ?? '')?.supported ?? {}
     ).flatMap((namespace) => namespace.chains as NetworkId[])
+
+    $: verifiedState = $activeProfileId
+        ? $persistedDapps[$activeProfileId]?.[dapp.metadata?.url ?? '']?.verificationState
+        : undefined
 </script>
 
 <ClickableTile
@@ -28,14 +33,19 @@
                 <Avatar icon={IconName.Link} size="lg" surface={0} />
             {/if}
             <div class="flex flex-col overflow-hidden">
-                <Text type="body2" truncate>
+                <Text type="body2" truncate align="left">
                     {dapp.metadata?.name ?? localize('general.unknown')}
                 </Text>
-                {#if dapp.metadata?.url}
-                    <Text type="sm" textColor="secondary" truncate>
-                        {dapp.metadata?.url}
-                    </Text>
-                {/if}
+                <div class="flex flex-row items-center gap-1">
+                    {#if verifiedState}
+                        <DappVerificationIcon {verifiedState} />
+                    {/if}
+                    {#if dapp.metadata?.url}
+                        <Text type="sm" textColor="secondary" truncate>
+                            {dapp.metadata?.url}
+                        </Text>
+                    {/if}
+                </div>
             </div>
         </div>
         <div>
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 e49508dc8a..ec54918b88 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte
@@ -4,10 +4,10 @@
     import { localize } from '@core/i18n'
     import { Router } from '@core/router'
     import {
-        getPersistedDappNamespacesForDapp,
         updateSupportedDappNamespacesForDapp,
         selectedDapp,
         sessionProposal,
+        getPersistedDapp,
     } from '@auxiliary/wallet-connect/stores'
     import { onMount } from 'svelte'
     import { buildSupportedNamespacesFromSelections } from '@auxiliary/wallet-connect/actions'
@@ -21,9 +21,7 @@
     export let disableContinue: boolean
 
     $: dappMetadata = $selectedDapp?.metadata ?? ($sessionProposal?.params.proposer.metadata as IDappMetadata)
-    $: persistedSupportedNamespaces = dappMetadata
-        ? getPersistedDappNamespacesForDapp(dappMetadata.url)?.supported
-        : undefined
+    $: persistedDapp = dappMetadata ? getPersistedDapp(dappMetadata.url) : undefined
     $: requiredNamespaces =
         $selectedDapp?.session?.requiredNamespaces ?? $sessionProposal?.params.requiredNamespaces ?? {}
     $: optionalNamespaces =
@@ -34,7 +32,7 @@
             selections,
             requiredNamespaces,
             optionalNamespaces,
-            persistedSupportedNamespaces
+            persistedDapp?.namespaces.supported
         )
         updateSupportedDappNamespacesForDapp(dappMetadata.url, updatedNamespace)
         if ($selectedDapp?.session) {
@@ -56,11 +54,15 @@
 
 <DrawerTemplate title={localize(`views.dashboard.drawers.${titleLocale}.title`)} {drawerRouter}>
     <div class="w-full h-full flex flex-col">
-        <DappInfo metadata={dappMetadata} />
+        <DappInfo metadata={dappMetadata} verifiedState={persistedDapp?.verificationState} />
 
         <div class="p-6 flex-grow overflow-hidden">
             <div class="h-full flex flex-col gap-8 overflow-scroll">
-                <slot {persistedSupportedNamespaces} {requiredNamespaces} {optionalNamespaces} />
+                <slot
+                    persistedSupportedNamespaces={persistedDapp?.namespaces.supported}
+                    {requiredNamespaces}
+                    {optionalNamespaces}
+                />
             </div>
         </div>
     </div>
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 5db0622e91..d2e4df094b 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,5 @@
 <script lang="ts">
-    import { connectedDapps, persistedDappNamespaces, setSelectedDapp } from '@auxiliary/wallet-connect/stores'
+    import { 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'
@@ -27,7 +27,7 @@
     let selectedIndex = 0
 
     $: connectedDappsForProfile = $connectedDapps.filter(
-        (dapp) => !!$persistedDappNamespaces[$activeProfileId as string]?.[dapp.metadata?.url ?? '']
+        (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 e196a897c7..0aa96ae125 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { getPersistedDappNamespacesForDapp, selectedDapp } from '@auxiliary/wallet-connect/stores'
+    import { getPersistedDapp, selectedDapp } from '@auxiliary/wallet-connect/stores'
     import { DrawerTemplate } from '@components/drawers'
     import { Router } from '@core/router'
     import { onMount } from 'svelte'
@@ -15,9 +15,7 @@
     const localeKey = 'views.dashboard.drawers.dapps.details'
     const dapp = structuredClone($selectedDapp) as IConnectedDapp
 
-    $: persistedSupportedNamespaces = dapp?.metadata
-        ? getPersistedDappNamespacesForDapp(dapp?.metadata.url)?.supported
-        : undefined
+    $: persistedDapp = dapp?.metadata ? getPersistedDapp(dapp?.metadata.url) : undefined
 
     onMount(() => {
         if (!$selectedDapp) {
@@ -32,7 +30,7 @@
         <DappActionsMenu {drawerRouter} {dapp} />
     </div>
     <div class="w-full h-full flex flex-col space-y-6 overflow-hidden">
-        <DappInfo metadata={dapp.metadata} />
+        <DappInfo metadata={dapp.metadata} verifiedState={persistedDapp?.verificationState} />
 
         <div class="flex-grow overflow-hidden">
             <div class="h-full space-y-6 overflow-scroll px-6 pb-4">
@@ -42,11 +40,11 @@
                         orientation="vertical"
                     />
                 {/if}
-                {#if persistedSupportedNamespaces}
+                {#if persistedDapp?.namespaces.supported}
                     <ConnectionSummary
                         requiredNamespaces={dapp.session?.requiredNamespaces}
                         editable={!!dapp.session}
-                        {persistedSupportedNamespaces}
+                        persistedSupportedNamespaces={persistedDapp?.namespaces.supported}
                         {drawerRouter}
                     />
                 {/if}
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 b7ddfb2849..38a0a70b1e 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/connectToDapp.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/connectToDapp.ts
@@ -1,11 +1,12 @@
 import { IAccountState } from '@core/account'
-import { persistDappNamespacesForDapp } from '../stores'
+import { persistDapp } from '../stores'
 import { approveSession } from './approveSession'
 import { buildSupportedNamespacesFromSelections } from './buildSupportedNamespaceFromSelections'
 import { clearOldPairings } from './clearOldPairings'
 import { ISelections } from '../interface'
 import { Web3WalletTypes } from '@walletconnect/web3wallet'
 import { SupportedNamespaces } from '../types'
+import { DappVerification } from '../enums'
 
 export async function connectToDapp(
     selections: ISelections,
@@ -25,5 +26,11 @@ export async function connectToDapp(
 
     await clearOldPairings(dappUrl)
     await approveSession(sessionProposal, supportedNamespaces, account)
-    persistDappNamespacesForDapp(dappUrl, supportedNamespaces, requiredNamespaces, optionalNamespaces)
+
+    const verificationState = sessionProposal.verifyContext.verified
+    persistDapp(
+        dappUrl,
+        verificationState.isScam ? DappVerification.Scam : (verificationState.validation as DappVerification),
+        { 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 62cb99f7fa..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,9 +1,4 @@
-import {
-    connectedDapps,
-    getPersistedDappNamespacesForDapp,
-    getWalletClient,
-    removeDappNamespacesForDapp,
-} from '../stores'
+import { connectedDapps, getWalletClient, getPersistedDapp, removePersistedDapp } from '../stores'
 import { get } from 'svelte/store'
 
 export function removeAllDisconnectedDapps(): void {
@@ -13,12 +8,12 @@ export function removeAllDisconnectedDapps(): void {
     }
 
     const connectedDappsForProfile = get(connectedDapps).filter(
-        (dapp) => dapp.metadata?.url && !!getPersistedDappNamespacesForDapp(dapp.metadata.url) && !dapp.session
+        (dapp) => !!getPersistedDapp(dapp.metadata?.url ?? '') && !dapp.session
     )
 
     for (const dapp of connectedDappsForProfile) {
         if (dapp.metadata) {
-            removeDappNamespacesForDapp(dapp.metadata.url)
+            removePersistedDapp(dapp.metadata.url)
         }
     }
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/removeDapp.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/removeDapp.ts
index dd5f945037..fa3fe239fc 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/removeDapp.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/removeDapp.ts
@@ -1,4 +1,4 @@
-import { getWalletClient, removeDappNamespacesForDapp, setConnectedDapps } from '../stores'
+import { getWalletClient, removePersistedDapp, setConnectedDapps } from '../stores'
 import { getSdkError } from '@walletconnect/utils'
 import { IConnectedDapp } from '../interface'
 import { handleError } from '@core/error/handlers'
@@ -20,7 +20,7 @@ export async function removeDapp(dapp: IConnectedDapp): Promise<void> {
         handleError(err)
     } finally {
         if (dapp.metadata) {
-            removeDappNamespacesForDapp(dapp.metadata.url)
+            removePersistedDapp(dapp.metadata.url)
         }
         setConnectedDapps()
     }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionRequest.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionRequest.handler.ts
index c3ffcb1748..c3a802539b 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionRequest.handler.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionRequest.handler.ts
@@ -3,7 +3,7 @@ import { NetworkId, getEvmNetwork } from '@core/network'
 import { JsonRpcResponse } from '@walletconnect/jsonrpc-types'
 import { getSdkError } from '@walletconnect/utils'
 import { Web3WalletTypes } from '@walletconnect/web3wallet'
-import { getConnectedDappByOrigin, getWalletClient, setConnectedDapps } from '../stores'
+import { getConnectedDappByOrigin, getWalletClient, setConnectedDapps, updateVerificationStateForDapp } from '../stores'
 import { CallbackParameters } from '../types'
 import { handleEthSignTypedData } from './eth_signTypedData.handler'
 import { handleEthTransaction } from './eth_transaction.handler'
@@ -20,9 +20,10 @@ export function onSessionRequest(event: Web3WalletTypes.SessionRequest): void {
     const method = request.method as RpcMethod
 
     const dapp = getConnectedDappByOrigin(verifyContext.verified.origin)
-    const verifiedState: DappVerification = verifyContext.verified.isScam
+    const verifiedState = verifyContext.verified.isScam
         ? DappVerification.Scam
         : (verifyContext.verified.validation as DappVerification)
+    updateVerificationStateForDapp(verifyContext.verified.origin, verifiedState)
 
     function returnResponse({ result, error }: CallbackParameters): void {
         const response: JsonRpcResponse | undefined = result
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/stores/index.ts b/packages/shared/src/lib/auxiliary/wallet-connect/stores/index.ts
index 5ee41d4f91..cac401ea14 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/stores/index.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/stores/index.ts
@@ -1,5 +1,6 @@
 export * from './connected-dapps.store'
 export * from './wallet-client.store'
+export * from './persisted-dapps.store'
 export * from './persisted-dapp-namespaces.store'
 export * from './selected-dapp.store'
 export * from './session-proposal.store'
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 3526e5d5cc..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,8 +1,5 @@
 import { persistent } from '@core/utils/store'
-import { Writable, get } from 'svelte/store'
-import { SupportedNamespaces } from '../types'
-import { getActiveProfile } from '@core/profile/stores'
-import { ProposalTypes } from '@walletconnect/types'
+import { Writable } from 'svelte/store'
 import { IPersistedNamespaces } from '../interface'
 
 interface IPersistedNamespacesStore {
@@ -10,58 +7,5 @@ interface IPersistedNamespacesStore {
         [dappOriginUrl: string]: IPersistedNamespaces
     }
 }
-
+// Keeping this store for for backwards compatibility for 1.0.1
 export const persistedDappNamespaces: Writable<IPersistedNamespacesStore> = persistent('persistedDappNamespaces', {})
-
-export function getPersistedDappNamespacesForDapp(dappOriginUrl: string): IPersistedNamespaces | undefined {
-    const profileId = getActiveProfile()?.id
-    return get(persistedDappNamespaces)?.[profileId]?.[dappOriginUrl]
-}
-
-export function persistDappNamespacesForDapp(
-    dappOriginUrl: string,
-    supported: SupportedNamespaces,
-    required: ProposalTypes.RequiredNamespaces,
-    optional: ProposalTypes.OptionalNamespaces
-): void {
-    const profileId = getActiveProfile()?.id
-
-    return persistedDappNamespaces.update((state) => {
-        if (!state[profileId]) {
-            state[profileId] = {}
-        }
-        state[profileId][dappOriginUrl] = { supported, required, optional }
-
-        return state
-    })
-}
-
-export function updateSupportedDappNamespacesForDapp(dappOriginUrl: string, supported: SupportedNamespaces): void {
-    const profileId = getActiveProfile()?.id
-
-    return persistedDappNamespaces.update((state) => {
-        const persistedNamespaces = state?.[profileId]?.[dappOriginUrl]
-
-        if (!persistedNamespaces) {
-            return state
-        }
-
-        state[profileId][dappOriginUrl] = {
-            ...persistedNamespaces,
-            supported: { ...persistedNamespaces.supported, ...supported },
-        }
-        return state
-    })
-}
-
-export function removeDappNamespacesForDapp(dappOriginUrl: string): void {
-    const profileId = getActiveProfile()?.id
-
-    return persistedDappNamespaces.update((state) => {
-        if (!state[profileId]) {
-            return state
-        }
-        delete state[profileId][dappOriginUrl]
-        return state
-    })
-}
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
new file mode 100644
index 0000000000..cb4c1619f5
--- /dev/null
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/stores/persisted-dapps.store.ts
@@ -0,0 +1,101 @@
+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'
+
+interface IPersistedDappStore {
+    [profileId: string]: {
+        [dappOriginUrl: string]: {
+            verificationState: DappVerification
+            namespaces: IPersistedNamespaces
+        }
+    }
+}
+
+export const persistedDapps: Writable<IPersistedDappStore> = persistent('persistedDapps', {})
+
+export function getPersistedDapp(dappOriginUrl: string):
+    | {
+          verificationState: DappVerification
+          namespaces: IPersistedNamespaces
+      }
+    | undefined {
+    const profileId = getActiveProfileId()
+    return get(persistedDapps)?.[profileId]?.[dappOriginUrl]
+}
+
+export function getPersistedDappNamespacesForDapp(dappOriginUrl: string): IPersistedNamespaces | undefined {
+    return getPersistedDapp(dappOriginUrl)?.namespaces
+}
+
+export function persistDapp(
+    dappOriginUrl: string,
+    verificationState: DappVerification,
+    namespaces: IPersistedNamespaces
+): void {
+    const profileId = getActiveProfileId()
+
+    return persistedDapps.update((state) => {
+        if (!state[profileId]) {
+            state[profileId] = {}
+        }
+        state[profileId][dappOriginUrl] = {
+            verificationState,
+            namespaces,
+        }
+
+        return state
+    })
+}
+
+export function updateSupportedDappNamespacesForDapp(dappOriginUrl: string, supported: SupportedNamespaces): void {
+    const profileId = getActiveProfileId()
+
+    return persistedDapps.update((state) => {
+        const persistedDapp = state?.[profileId]?.[dappOriginUrl]
+        if (!persistedDapp) {
+            return state
+        }
+
+        const updatedNamespaces = {
+            ...persistedDapp.namespaces,
+            supported: { ...persistedDapp.namespaces.supported, ...supported },
+        }
+
+        state[profileId][dappOriginUrl] = {
+            ...persistedDapp,
+            namespaces: updatedNamespaces,
+        }
+        return state
+    })
+}
+export function updateVerificationStateForDapp(dappOriginUrl: string, verificationState: DappVerification): void {
+    const profileId = getActiveProfileId()
+
+    return persistedDapps.update((state) => {
+        const persistedDapp = state?.[profileId]?.[dappOriginUrl]
+        if (!persistedDapp) {
+            return state
+        }
+
+        state[profileId][dappOriginUrl] = {
+            ...persistedDapp,
+            verificationState,
+        }
+        return state
+    })
+}
+
+export function removePersistedDapp(dappOriginUrl: string): void {
+    const profileId = getActiveProfileId()
+
+    return persistedDapps.update((state) => {
+        if (!state[profileId]) {
+            return state
+        }
+        delete state[profileId][dappOriginUrl]
+        return state
+    })
+}
diff --git a/packages/shared/src/lib/core/profile/constants/profile-version.constant.ts b/packages/shared/src/lib/core/profile/constants/profile-version.constant.ts
index 1ee693fa8f..15b74f935d 100644
--- a/packages/shared/src/lib/core/profile/constants/profile-version.constant.ts
+++ b/packages/shared/src/lib/core/profile/constants/profile-version.constant.ts
@@ -1,7 +1,7 @@
 import { AppStage } from '@core/app/enums'
 
 export const PROFILE_VERSION: Record<AppStage, number> = {
-    [AppStage.ALPHA]: 15,
+    [AppStage.ALPHA]: 16,
     [AppStage.BETA]: 1,
-    [AppStage.PROD]: 8,
+    [AppStage.PROD]: 9,
 }
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
new file mode 100644
index 0000000000..0652080dbe
--- /dev/null
+++ b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-15-to-16.ts
@@ -0,0 +1,20 @@
+import { DappVerification } from '@auxiliary/wallet-connect/enums'
+import { persistDapp, persistedDappNamespaces } from '@auxiliary/wallet-connect/stores'
+import { IPersistedProfile } from '@core/profile/interfaces'
+import { get } from 'svelte/store'
+
+export function alphaProfileMigration15To16(existingProfile: unknown): Promise<void> {
+    const profile = existingProfile as IPersistedProfile
+
+    const namespaces = get(persistedDappNamespaces)[profile.id] ?? {}
+    for (const dappUrl of Object.keys(namespaces)) {
+        persistDapp(dappUrl, DappVerification.Unknown, namespaces[dappUrl])
+    }
+
+    persistedDappNamespaces.update((state) => {
+        delete state[profile.id]
+        return state
+    })
+
+    return Promise.resolve()
+}
diff --git a/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-map.ts b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-map.ts
index 65c86248a7..c33fa5f827 100644
--- a/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-map.ts
+++ b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-map.ts
@@ -6,6 +6,7 @@ import { alphaProfileMigration11To12 } from './alpha-profile-migration-11-to-12'
 import { alphaProfileMigration12To13 } from './alpha-profile-migration-12-to-13'
 import { alphaProfileMigration13To14 } from './alpha-profile-migration-13-to-14'
 import { alphaProfileMigration14To15 } from './alpha-profile-migration-14-to-15'
+import { alphaProfileMigration15To16 } from './alpha-profile-migration-15-to-16'
 import { alphaProfileMigration2To3 } from './alpha-profile-migration-2-to-3'
 import { alphaProfileMigration3To4 } from './alpha-profile-migration-3-to-4'
 import { alphaProfileMigration4To5 } from './alpha-profile-migration-4-to-5'
@@ -31,4 +32,5 @@ export const ALPHA_PROFILE_MIGRATION_MAP: ProfileMigrationMap = {
     12: alphaProfileMigration12To13,
     13: alphaProfileMigration13To14,
     14: alphaProfileMigration14To15,
+    15: alphaProfileMigration15To16,
 }
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
new file mode 100644
index 0000000000..47542982e6
--- /dev/null
+++ b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-8-to-9.ts
@@ -0,0 +1,20 @@
+import { DappVerification } from '@auxiliary/wallet-connect/enums'
+import { persistDapp, persistedDappNamespaces } from '@auxiliary/wallet-connect/stores'
+import { IPersistedProfile } from '@core/profile/interfaces'
+import { get } from 'svelte/store'
+
+export function prodProfileMigration8To9(existingProfile: unknown): Promise<void> {
+    const profile = existingProfile as IPersistedProfile
+
+    const namespaces = get(persistedDappNamespaces)[profile.id] ?? {}
+    for (const dappUrl of Object.keys(namespaces)) {
+        persistDapp(dappUrl, DappVerification.Unknown, namespaces[dappUrl])
+    }
+
+    persistedDappNamespaces.update((state) => {
+        delete state[profile.id]
+        return state
+    })
+
+    return Promise.resolve()
+}
diff --git a/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-map.ts b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-map.ts
index ec445085a6..a6c6c5e84b 100644
--- a/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-map.ts
+++ b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-map.ts
@@ -8,6 +8,7 @@ import { prodProfileMigration4To5 } from './prod-profile-migration-4-to-5'
 import { prodProfileMigration5To6 } from './prod-profile-migration-5-to-6'
 import { prodProfileMigration6To7 } from './prod-profile-migration-6-to-7'
 import { prodProfileMigration7To8 } from './prod-profile-migration-7-to-8'
+import { prodProfileMigration8To9 } from './prod-profile-migration-8-to-9'
 
 export const PROD_PROFILE_MIGRATION_MAP: ProfileMigrationMap = {
     0: prodProfileMigration0To1,
@@ -18,4 +19,5 @@ export const PROD_PROFILE_MIGRATION_MAP: ProfileMigrationMap = {
     5: prodProfileMigration5To6,
     6: prodProfileMigration6To7,
     7: prodProfileMigration7To8,
+    8: prodProfileMigration8To9,
 }