From f855141da955581aa8afe4e6efa32b92a1397ae1 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Fri, 31 May 2024 13:59:50 +0200
Subject: [PATCH 01/24] generalize proposal store

---
 .../wallet-connect/actions/connectToDapp.ts   |  3 +-
 .../actions/initializeWalletConnect.ts        |  2 ++
 .../wallet-connect/handlers/index.ts          |  1 +
 .../handlers/onSessionAuthenticate.handler.ts | 12 ++++++++
 .../handlers/onSessionDelete.handler.ts       |  4 +--
 .../handlers/onSessionProposal.handler.ts     | 10 +++++--
 .../stores/connection-request.store.ts        | 18 ++++++++++++
 .../auxiliary/wallet-connect/stores/index.ts  |  2 +-
 .../stores/session-proposal.store.ts          |  8 ------
 .../auxiliary/wallet-connect/utils/index.ts   |  2 +-
 .../utils/rejectConnectionRequest.ts          | 28 +++++++++++++++++++
 .../wallet-connect/utils/rejectSession.ts     | 21 --------------
 12 files changed, 75 insertions(+), 36 deletions(-)
 create mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionAuthenticate.handler.ts
 create mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/stores/connection-request.store.ts
 delete mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/stores/session-proposal.store.ts
 create mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectConnectionRequest.ts
 delete mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectSession.ts

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 38a0a70b1e..6ec190a495 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/connectToDapp.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/connectToDapp.ts
@@ -1,5 +1,5 @@
 import { IAccountState } from '@core/account'
-import { persistDapp } from '../stores'
+import { clearConnectionRequest, persistDapp } from '../stores'
 import { approveSession } from './approveSession'
 import { buildSupportedNamespacesFromSelections } from './buildSupportedNamespaceFromSelections'
 import { clearOldPairings } from './clearOldPairings'
@@ -33,4 +33,5 @@ export async function connectToDapp(
         verificationState.isScam ? DappVerification.Scam : (verificationState.validation as DappVerification),
         { supported: supportedNamespaces, required: requiredNamespaces, optional: optionalNamespaces }
     )
+    clearConnectionRequest()
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/initializeWalletConnect.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/initializeWalletConnect.ts
index 81c2834812..3b806cdae6 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/initializeWalletConnect.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/initializeWalletConnect.ts
@@ -7,6 +7,7 @@ import { WALLET_METADATA } from '../constants'
 import { onSessionDelete, onSessionProposal, onSessionRequest } from '../handlers'
 import { walletClient } from '../stores'
 import { setConnectedDapps } from '../stores/connected-dapps.store'
+import { onSessionAuthenticate } from '../handlers/onSessionAuthenticate.handler'
 
 export async function initializeWalletConnect(): Promise<void> {
     if (!features?.walletConnect?.enabled || get(walletClient)) {
@@ -26,6 +27,7 @@ export async function initializeWalletConnect(): Promise<void> {
         client.on('session_proposal', (sessionProposal) => void onSessionProposal(sessionProposal))
         client.on('session_request', (event) => onSessionRequest(event))
         client.on('session_delete', (event) => onSessionDelete(event))
+        client.on('session_authenticate', (payload) => onSessionAuthenticate(payload))
     } catch (err) {
         handleError(err)
     }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/index.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/index.ts
index f95f9bb901..e8b2f93292 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/index.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/index.ts
@@ -1,5 +1,6 @@
 export * from './eth_transaction.handler'
 export * from './eth_signTypedData.handler'
+export * from './onSessionAuthenticate.handler'
 export * from './onSessionDelete.handler'
 export * from './onSessionProposal.handler'
 export * from './onSessionRequest.handler'
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionAuthenticate.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionAuthenticate.handler.ts
new file mode 100644
index 0000000000..8f42a570ec
--- /dev/null
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionAuthenticate.handler.ts
@@ -0,0 +1,12 @@
+import { Web3WalletTypes } from '@walletconnect/web3wallet'
+import { connectionRequest } from '../stores'
+import { get } from 'svelte/store'
+import { rejectConnectionRequest } from '../utils'
+
+export function onSessionAuthenticate(event: Web3WalletTypes.SessionAuthenticate): void {
+    if (get(connectionRequest)) {
+        void rejectConnectionRequest()
+    } else {
+        connectionRequest.set({ type: 'session_authenticate', payload: event })
+    }
+}
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionDelete.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionDelete.handler.ts
index f6ef6be350..032463a78c 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionDelete.handler.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionDelete.handler.ts
@@ -1,11 +1,11 @@
 import { showNotification } from '@auxiliary/notification'
 import { Web3WalletTypes } from '@walletconnect/web3wallet'
-import { getConnectedDapps, setConnectedDapps } from '../stores'
+import { getConnectedDappBySessionTopic, setConnectedDapps } from '../stores'
 
 export function onSessionDelete(event: Web3WalletTypes.SessionDelete): void {
     const { topic } = event
 
-    const dapp = getConnectedDapps().find((_dapp) => _dapp.session?.topic === topic)
+    const dapp = getConnectedDappBySessionTopic(topic)
 
     showNotification({
         variant: 'warning',
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionProposal.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionProposal.handler.ts
index f198ea4783..109488c5b6 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionProposal.handler.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionProposal.handler.ts
@@ -1,6 +1,12 @@
 import { Web3WalletTypes } from '@walletconnect/web3wallet'
-import { sessionProposal } from '../stores'
+import { connectionRequest } from '../stores'
+import { get } from 'svelte/store'
+import { rejectConnectionRequest } from '../utils'
 
 export function onSessionProposal(_sessionProposal: Web3WalletTypes.SessionProposal): void {
-    sessionProposal.set(_sessionProposal)
+    if (get(connectionRequest)) {
+        void rejectConnectionRequest()
+    } else {
+        connectionRequest.set({ type: 'session_proposal', payload: _sessionProposal })
+    }
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/stores/connection-request.store.ts b/packages/shared/src/lib/auxiliary/wallet-connect/stores/connection-request.store.ts
new file mode 100644
index 0000000000..1277d5db86
--- /dev/null
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/stores/connection-request.store.ts
@@ -0,0 +1,18 @@
+import { Writable, writable } from 'svelte/store'
+import { Web3WalletTypes } from '@walletconnect/web3wallet'
+
+export type ConnectionRequest =
+    | {
+          type: 'session_proposal'
+          payload: Web3WalletTypes.SessionProposal
+      }
+    | {
+          type: 'session_authenticate'
+          payload: Web3WalletTypes.SessionAuthenticate
+      }
+
+export const connectionRequest: Writable<ConnectionRequest | undefined> = writable(undefined)
+
+export function clearConnectionRequest(): void {
+    connectionRequest.set(undefined)
+}
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 cac401ea14..3ad605dacc 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/stores/index.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/stores/index.ts
@@ -3,4 +3,4 @@ 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'
+export * from './connection-request.store'
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/stores/session-proposal.store.ts b/packages/shared/src/lib/auxiliary/wallet-connect/stores/session-proposal.store.ts
deleted file mode 100644
index 61c93cdab1..0000000000
--- a/packages/shared/src/lib/auxiliary/wallet-connect/stores/session-proposal.store.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Writable, get, writable } from 'svelte/store'
-import { Web3WalletTypes } from '@walletconnect/web3wallet'
-
-export const sessionProposal: Writable<Web3WalletTypes.SessionProposal | undefined> = writable(undefined)
-
-export function getSessionProposal(): Web3WalletTypes.SessionProposal | undefined {
-    return get(sessionProposal)
-}
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 9ad8948cb7..2814e8ce4c 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
@@ -1,7 +1,7 @@
 export * from './disconnectAllDapps'
 export * from './getBloomError'
 export * from './getPermissionForMethod'
-export * from './rejectSession'
+export * from './rejectConnectionRequest'
 export * from './switchToRequiredAccount'
 export * from './updateSession'
 export * from './validateConnectionCodeUri'
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectConnectionRequest.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectConnectionRequest.ts
new file mode 100644
index 0000000000..9341eef637
--- /dev/null
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectConnectionRequest.ts
@@ -0,0 +1,28 @@
+import { getSdkError } from '@walletconnect/utils'
+import { getWalletClient, connectionRequest } from '../stores'
+import { get } from 'svelte/store'
+import { handleError } from '@core/error/handlers'
+
+export async function rejectConnectionRequest(): Promise<void> {
+    const _connectionRequest = get(connectionRequest)
+    if (!_connectionRequest) {
+        return
+    }
+
+    connectionRequest.set(undefined)
+    try {
+        if (_connectionRequest.type === 'session_proposal') {
+            await getWalletClient()?.rejectSession({
+                id: _connectionRequest.payload.id,
+                reason: getSdkError('USER_REJECTED'),
+            })
+        } else if (_connectionRequest.type === 'session_authenticate') {
+            await getWalletClient()?.rejectSessionAuthenticate({
+                id: _connectionRequest.payload.id,
+                reason: getSdkError('USER_REJECTED'),
+            })
+        }
+    } catch (err) {
+        handleError(err)
+    }
+}
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectSession.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectSession.ts
deleted file mode 100644
index 5a2b253289..0000000000
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectSession.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { getSdkError } from '@walletconnect/utils'
-import { getWalletClient, sessionProposal } from '../stores'
-import { get } from 'svelte/store'
-import { handleError } from '@core/error/handlers'
-
-export async function rejectSession(): Promise<void> {
-    const _sessionProposal = get(sessionProposal)
-    if (!_sessionProposal) {
-        return
-    }
-
-    sessionProposal.set(undefined)
-    try {
-        await getWalletClient()?.rejectSession({
-            id: _sessionProposal.id,
-            reason: getSdkError('USER_REJECTED'),
-        })
-    } catch (err) {
-        handleError(err)
-    }
-}

From 68632a702012bb3c8a714747336c0abb3b39aea2 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Fri, 31 May 2024 13:59:51 +0200
Subject: [PATCH 02/24] refactor selections

---
 .../components/NetworkSelection.svelte        | 57 +++++++++----------
 .../components/PermissionSelection.svelte     | 37 ++++++------
 .../handleDeepLinkAddWCConnectionOperation.ts |  4 +-
 3 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/components/NetworkSelection.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/components/NetworkSelection.svelte
index 50880585c6..83389eb618 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/NetworkSelection.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/NetworkSelection.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-    import { ProposalTypes } from '@walletconnect/types'
     import { getAllNetworkIds } from '@core/network/utils'
     import { onMount } from 'svelte'
     import { Selection } from '@ui'
@@ -9,43 +8,43 @@
     import { SelectionOption } from '@core/utils/interfaces'
 
     export let checkedNetworks: string[]
-    export let requiredNamespaces: ProposalTypes.RequiredNamespaces
-    export let optionalNamespaces: ProposalTypes.RequiredNamespaces
+    export let requiredNetworks: string[]
+    export let optionalNetworks: string[]
     export let persistedSupportedNamespaces: SupportedNamespaces | undefined = undefined
 
     const localeKey = 'views.dashboard.drawers.dapps.confirmConnection.networks'
 
-    let requiredNetworks: SelectionOption<NetworkId>[] = []
-    let optionalNetworks: SelectionOption<NetworkId>[] = []
+    let requiredNetworksOptions: SelectionOption<NetworkId>[] = []
+    let optionalNetworksOptions: SelectionOption<NetworkId>[] = []
     function setNetworkSelections(): void {
         const networks: Record<string, SelectionOption<NetworkId>> = {}
-        for (const namespace of Object.values(requiredNamespaces)) {
-            for (const chainId of namespace.chains ?? []) {
-                const chainName = getEvmNetwork(chainId as NetworkId)?.name ?? chainId
-                networks[chainId] = { label: chainName, value: chainId as NetworkId, checked: true, required: true }
-            }
+        for (const chainId of requiredNetworks) {
+            const chainName = getEvmNetwork(chainId as NetworkId)?.name ?? chainId
+            networks[chainId] = { label: chainName, value: chainId as NetworkId, checked: true, required: true }
         }
         const supportedNetworks = getAllNetworkIds()
-        for (const [namespaceId, namespace] of Object.entries(optionalNamespaces)) {
-            const persistedNamespace = persistedSupportedNamespaces?.[namespaceId]
-            for (const chainId of namespace.chains ?? []) {
-                if (!networks[chainId] && supportedNetworks.includes(chainId)) {
-                    const isChecked = persistedNamespace?.chains?.includes(chainId) ?? true
-                    const chainName = getEvmNetwork(chainId as NetworkId)?.name ?? chainId
-                    networks[chainId] = {
-                        label: chainName,
-                        value: chainId as NetworkId,
-                        checked: isChecked,
-                        required: false,
-                    }
+
+        const persistedChains = Object.values(persistedSupportedNamespaces ?? {}).flatMap(
+            (namespace) => namespace.chains
+        )
+        for (const chainId of optionalNetworks) {
+            if (!networks[chainId] && supportedNetworks.includes(chainId)) {
+                const isChecked = persistedChains?.includes(chainId) ?? true
+                const chainName = getEvmNetwork(chainId as NetworkId)?.name ?? chainId
+                networks[chainId] = {
+                    label: chainName,
+                    value: chainId as NetworkId,
+                    checked: isChecked,
+                    required: false,
                 }
             }
         }
-        requiredNetworks = Object.values(networks).filter((network) => network.required)
-        optionalNetworks = Object.values(networks).filter((network) => !network.required)
+
+        requiredNetworksOptions = Object.values(networks).filter((network) => network.required)
+        optionalNetworksOptions = Object.values(networks).filter((network) => !network.required)
     }
 
-    $: checkedNetworks = [...requiredNetworks, ...optionalNetworks]
+    $: checkedNetworks = [...requiredNetworksOptions, ...optionalNetworksOptions]
         .filter((selection) => selection.checked)
         .map((selection) => selection.value)
 
@@ -55,16 +54,16 @@
 </script>
 
 <div class="h-full flex flex-col gap-8">
-    {#if requiredNetworks.length}
+    {#if requiredNetworksOptions.length}
         <Selection
-            bind:selectionOptions={requiredNetworks}
+            bind:selectionOptions={requiredNetworksOptions}
             disableSelectAll
             title={localize(`${localeKey}.requiredTitle`)}
         />
     {/if}
-    {#if optionalNetworks.length}
+    {#if optionalNetworksOptions.length}
         <Selection
-            bind:selectionOptions={optionalNetworks}
+            bind:selectionOptions={optionalNetworksOptions}
             title={localize(`${localeKey}.optionalTitle`)}
             error={checkedNetworks.length ? undefined : localize(`${localeKey}.empty`)}
         />
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/components/PermissionSelection.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/components/PermissionSelection.svelte
index 76942695ff..57ab8eb731 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/PermissionSelection.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/PermissionSelection.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-    import { ProposalTypes } from '@walletconnect/types'
     import { METHODS_FOR_PERMISSION } from '@auxiliary/wallet-connect/constants'
     import { onMount } from 'svelte'
     import { Selection } from '@ui'
@@ -11,25 +10,21 @@
     import { SelectionOption } from '@core/utils/interfaces'
 
     export let checkedMethods: string[]
-    export let requiredNamespaces: ProposalTypes.RequiredNamespaces
-    export let optionalNamespaces: ProposalTypes.RequiredNamespaces
+    export let requiredMethods: string[]
+    export let optionalMethods: string[]
     export let persistedSupportedNamespaces: SupportedNamespaces | undefined = undefined
 
     const localeKey = 'views.dashboard.drawers.dapps.confirmConnection.permissions'
-    let requiredPermissions: SelectionOption<string>[] = []
-    let optionalPermissions: SelectionOption<string>[] = []
+    let requiredPermissionsOptions: SelectionOption<string>[] = []
+    let optionalPermissionsOptions: SelectionOption<string>[] = []
 
     function setPermissionSelections(): void {
         const checkedMethods: { [method: string]: boolean } = {}
         const addedPermission: { [permission: string]: boolean } = {}
 
         const methods = [
-            ...Object.values(requiredNamespaces).flatMap((namespace) =>
-                namespace.methods.map((method) => ({ method, required: true }))
-            ),
-            ...Object.values(optionalNamespaces).flatMap((namespace) =>
-                namespace.methods.map((method) => ({ method, required: false }))
-            ),
+            ...requiredMethods.map((method) => ({ method, required: true })),
+            ...optionalMethods.map((method) => ({ method, required: false })),
         ]
 
         for (const method of methods) {
@@ -57,17 +52,17 @@
                 required: method.required,
             }
             if (method.required) {
-                requiredPermissions = [...requiredPermissions, option]
+                requiredPermissionsOptions = [...requiredPermissionsOptions, option]
             } else {
-                optionalPermissions = [...optionalPermissions, option]
+                optionalPermissionsOptions = [...optionalPermissionsOptions, option]
             }
         }
     }
 
-    $: requiredPermissions, optionalPermissions, (checkedMethods = getMethodsFromCheckedPermissions())
+    $: requiredPermissionsOptions, optionalPermissionsOptions, (checkedMethods = getMethodsFromCheckedPermissions())
 
     function getMethodsFromCheckedPermissions(): string[] {
-        return [...requiredPermissions, ...optionalPermissions]
+        return [...requiredPermissionsOptions, ...optionalPermissionsOptions]
             .filter((selection) => selection.checked)
             .flatMap((selection) => METHODS_FOR_PERMISSION[selection.value])
     }
@@ -77,18 +72,18 @@
     })
 </script>
 
-{#if requiredPermissions.length || optionalPermissions.length}
+{#if requiredPermissionsOptions.length || optionalPermissionsOptions.length}
     <div class="h-full flex flex-col gap-8">
-        {#if requiredPermissions.length}
+        {#if requiredPermissionsOptions.length}
             <Selection
-                bind:selectionOptions={requiredPermissions}
+                bind:selectionOptions={requiredPermissionsOptions}
                 disableSelectAll
                 title={localize(`${localeKey}.requiredTitle`)}
             />
         {/if}
-        {#if optionalPermissions.length}
+        {#if optionalPermissionsOptions.length}
             <Selection
-                bind:selectionOptions={optionalPermissions}
+                bind:selectionOptions={optionalPermissionsOptions}
                 title={localize(`${localeKey}.optionalTitle`)}
                 error={checkedMethods.length ? undefined : localize(`${localeKey}.empty`)}
             />
@@ -96,7 +91,7 @@
     </div>
 {:else}
     <selection-component class="h-full flex flex-col gap-4">
-        <Text textColor="secondary">{localize(`${localeKey}.title`)}</Text>
+        <Text textColor="secondary">{localize(`${localeKey}.step`)}</Text>
 
         <div class="w-full flex-grow flex justify-center items-center">
             <Text type="body2">{localize(`${localeKey}.noPermissionsRequired`)}</Text>
diff --git a/packages/shared/src/lib/auxiliary/deep-link/handlers/dapps/operations/handleDeepLinkAddWCConnectionOperation.ts b/packages/shared/src/lib/auxiliary/deep-link/handlers/dapps/operations/handleDeepLinkAddWCConnectionOperation.ts
index 00893e9336..1c2e446bf5 100644
--- a/packages/shared/src/lib/auxiliary/deep-link/handlers/dapps/operations/handleDeepLinkAddWCConnectionOperation.ts
+++ b/packages/shared/src/lib/auxiliary/deep-link/handlers/dapps/operations/handleDeepLinkAddWCConnectionOperation.ts
@@ -1,5 +1,5 @@
 import { pairWithNewDapp } from '@auxiliary/wallet-connect/actions'
-import { rejectSession, validateConnectionCodeUri } from '@auxiliary/wallet-connect/utils'
+import { rejectConnectionRequest, validateConnectionCodeUri } from '@auxiliary/wallet-connect/utils'
 import { get } from 'svelte/store'
 import { DrawerRoute, openDrawer } from '../../../../../../../../desktop/lib/auxiliary/drawer'
 import { dappConfigRouter } from '../../../../../../../../desktop/views/dashboard/drawers/dapp-config/dapp-config.router'
@@ -24,7 +24,7 @@ export function handleDeepLinkAddWCConnectionOperation(searchParams: URLSearchPa
             route: DrawerRoute.Dashboard,
             id: DashboardDrawerRoute.DappConfig,
             initialSubroute: DappConfigRoute.ConnectionRequest,
-            props: { onClose: rejectSession },
+            props: { onClose: rejectConnectionRequest },
         })
     } catch (err) {
         $dappConfigRouter?.reset()

From ca51ba1240021793a3631a5a042d0a903dd341d7 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Fri, 31 May 2024 13:59:52 +0200
Subject: [PATCH 03/24] update connectionrequest view

---
 .../components/UnsupportedDappHint.svelte     |  30 +--
 .../views/ConnectionRequest.svelte            | 121 +++++++++++
 .../views/ConnectionRequestDrawer.svelte      | 202 +++++++-----------
 .../views/InputConnectionCodeDrawer.svelte    |   4 +-
 4 files changed, 211 insertions(+), 146 deletions(-)
 create mode 100644 packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/components/UnsupportedDappHint.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/components/UnsupportedDappHint.svelte
index afae39ca96..04b1764856 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/UnsupportedDappHint.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/UnsupportedDappHint.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
     import { Alert, Table, TableRow, Text } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
-    import { ProposalTypes } from '@walletconnect/types'
     import { NetworkAvatarGroup } from '@ui'
     import { ALL_SUPPORTED_METHODS } from '@auxiliary/wallet-connect/constants'
     import { SupportedNetworkId, getAllNetworkIds } from '@core/network'
     import { RpcMethod } from '@auxiliary/wallet-connect/enums'
 
-    export let requiredNamespaces: ProposalTypes.RequiredNamespaces
-    export let optionalNamespaces: ProposalTypes.RequiredNamespaces
+    export let requiredNetworks: string[] = []
+    export let optionalNetworks: string[] = []
+    export let requiredMethods: string[] = []
 
     const MAX_UNSUPPORTED_METHODS = 3
     const localeKey = 'views.dashboard.drawers.dapps.connectionRequest'
@@ -19,12 +19,12 @@
         unsupportedRequiredNetworks,
         otherProfileSupportsRequiredNetworks,
         supportsAnyNetwork,
-    } = getNetworkRequirementsSummary(requiredNamespaces, optionalNamespaces))
-    $: unsupportedMethods = getUnsupportedMethods(requiredNamespaces)
+    } = getNetworkRequirementsSummary(requiredNetworks, optionalNetworks))
+    $: unsupportedMethods = getUnsupportedMethods(requiredMethods as RpcMethod[])
 
     function getNetworkRequirementsSummary(
-        _requiredNamespaces: ProposalTypes.RequiredNamespaces,
-        _optionalNamespaces: ProposalTypes.RequiredNamespaces
+        requiredNetworksByDapp: string[],
+        optionalMethods: string[]
     ): {
         supportedNetworksByProfile: string[]
         supportedNetworksByOtherProfile: string[]
@@ -34,15 +34,7 @@
     } {
         const supportedNetworksByProfile = getAllNetworkIds()
         const allSupportedNetworksByWallet: string[] = Object.values(SupportedNetworkId)
-        const requiredNetworksByDapp: string[] = Object.values(_requiredNamespaces)
-            .flatMap(({ chains }) => chains)
-            .filter(Boolean)
-        const supportedNetworksByDapp = [
-            ...requiredNetworksByDapp,
-            ...Object.values(_optionalNamespaces)
-                .flatMap(({ chains }) => chains)
-                .filter(Boolean),
-        ] as string[]
+        const supportedNetworksByDapp = [...requiredNetworksByDapp, ...optionalMethods] as string[]
 
         const unsupportedRequiredNetworks = requiredNetworksByDapp.filter(
             (networkId) => !supportedNetworksByProfile.includes(networkId)
@@ -67,10 +59,8 @@
         }
     }
 
-    function getUnsupportedMethods(_requiredNamespaces: ProposalTypes.RequiredNamespaces): RpcMethod[] {
-        const requiredMethods = Object.values(_requiredNamespaces).flatMap(({ methods }) => methods) as RpcMethod[]
-
-        return requiredMethods.filter((method) => !ALL_SUPPORTED_METHODS.includes(method))
+    function getUnsupportedMethods(_requiredMethods: RpcMethod[]): RpcMethod[] {
+        return _requiredMethods.filter((method) => !ALL_SUPPORTED_METHODS.includes(method))
     }
 </script>
 
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
new file mode 100644
index 0000000000..0942ba487b
--- /dev/null
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
@@ -0,0 +1,121 @@
+<script lang="ts">
+    import { Button, Table, TableRow, Text } from '@bloomwalletio/ui'
+    import { DappInfo } from '@ui'
+    import { localize } from '@core/i18n'
+    import { Router } from '@core/router'
+    import { DrawerTemplate } from '@components'
+    import { closeDrawer } from '@desktop/auxiliary/drawer'
+    import { SecurityWarning, UnsupportedDappHint } from '../components'
+    import { getAllNetworkIds } from '@core/network'
+    import { ALL_SUPPORTED_METHODS } from '@auxiliary/wallet-connect/constants'
+    import { rejectConnectionRequest } from '@auxiliary/wallet-connect/utils'
+    import { DappVerification, RpcMethod } from '@auxiliary/wallet-connect/enums'
+    import { Web3WalletTypes } from '@walletconnect/web3wallet'
+
+    export let drawerRouter: Router<unknown>
+    export let dappMetadata: Web3WalletTypes.Metadata
+    export let verifiedState: DappVerification
+    export let requiredNetworks: string[]
+    export let optionalNetworks: string[]
+    export let requiredMethods: RpcMethod[]
+
+    const localeKey = 'views.dashboard.drawers.dapps.connectionRequest'
+    let acceptedInsecureConnection = false
+    let flashingCheckbox = false
+
+    const fulfillsRequirements = doesFulfillsRequirements()
+    function doesFulfillsRequirements(): boolean {
+        const supportedNetworksByDapp = [...requiredNetworks, ...optionalNetworks]
+
+        return (
+            doesFulfillNetworkRequirements(requiredNetworks, supportedNetworksByDapp) &&
+            doesFulfillMethodRequirements(requiredMethods)
+        )
+    }
+
+    function doesFulfillNetworkRequirements(requiredNetworks: string[], optionalNetworks: string[]): boolean {
+        const supportedNetworksByProfile = getAllNetworkIds()
+
+        const supportsAllRequiredNetworks = requiredNetworks.every((networkId) =>
+            supportedNetworksByProfile.includes(networkId)
+        )
+        if (!supportsAllRequiredNetworks) {
+            return false
+        }
+
+        const supportsAnyNetwork = optionalNetworks.some((networkId) => supportedNetworksByProfile.includes(networkId))
+        if (!supportsAnyNetwork) {
+            return false
+        }
+
+        return true
+    }
+
+    function doesFulfillMethodRequirements(requiredMethods: RpcMethod[]): boolean {
+        return requiredMethods.every((method) => ALL_SUPPORTED_METHODS.includes(method))
+    }
+
+    function onRejectClick(): void {
+        rejectConnectionRequest()
+        closeDrawer()
+    }
+
+    function onContinueClick(): void {
+        if (verifiedState !== DappVerification.Valid && !acceptedInsecureConnection) {
+            flashingCheckbox = true
+            setTimeout(() => {
+                flashingCheckbox = false
+            }, 1500)
+            return
+        }
+
+        drawerRouter.next()
+    }
+</script>
+
+<DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter} onBack={rejectConnectionRequest}>
+    <div class="w-full h-full flex flex-col justify-between">
+        <DappInfo metadata={dappMetadata} {verifiedState} />
+        <div class="flex-grow overflow-hidden">
+            <div class="h-full overflow-scroll flex flex-col gap-5 p-6">
+                <Table
+                    items={[
+                        {
+                            key: localize('general.description'),
+                            value: dappMetadata.description,
+                        },
+                    ]}
+                    orientation="vertical"
+                >
+                    <TableRow item={{ key: localize('general.verified') }} orientation="vertical">
+                        <div slot="boundValue">
+                            <Text textColor={verifiedState === DappVerification.Valid ? 'success' : 'danger'}
+                                >{localize(`general.${verifiedState === DappVerification.Valid ? 'yes' : 'no'}`)}</Text
+                            >
+                        </div>
+                    </TableRow>
+                </Table>
+            </div>
+        </div>
+        {#if !fulfillsRequirements}
+            <div class="px-6">
+                <UnsupportedDappHint {requiredNetworks} {optionalNetworks} {requiredMethods} />
+            </div>
+        {:else if verifiedState !== DappVerification.Valid}
+            <div class="px-6">
+                <SecurityWarning {verifiedState} {flashingCheckbox} bind:acceptedInsecureConnection />
+            </div>
+        {/if}
+    </div>
+    <div class="flex flex-row gap-2" slot="footer">
+        <Button
+            width="full"
+            variant="outlined"
+            on:click={onRejectClick}
+            text={localize(`actions.${fulfillsRequirements ? 'reject' : 'cancel'}`)}
+        />
+        {#if fulfillsRequirements && verifiedState !== DappVerification.Scam}
+            <Button width="full" on:click={onContinueClick} text={localize('actions.continue')} />
+        {/if}
+    </div>
+</DrawerTemplate>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
index e1f5ac2cb9..91dc5d74fe 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
@@ -1,39 +1,24 @@
 <script lang="ts">
-    import { Button, Spinner, Table, TableRow, Text } from '@bloomwalletio/ui'
-    import { DappInfo } from '@ui'
+    import { Button, Spinner } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
     import { Router } from '@core/router'
     import { DrawerTemplate } from '@components'
-    import { sessionProposal } from '@auxiliary/wallet-connect/stores'
+    import { connectionRequest } from '@auxiliary/wallet-connect/stores'
     import { closeDrawer } from '@desktop/auxiliary/drawer'
-    import { SecurityWarning, UnsupportedDappHint } from '../components'
-    import { getAllNetworkIds } from '@core/network'
-    import { ALL_SUPPORTED_METHODS } from '@auxiliary/wallet-connect/constants'
-    import { rejectSession } from '@auxiliary/wallet-connect/utils'
+    import ConnectionRequest from './ConnectionRequest.svelte'
+    import { rejectConnectionRequest } from '@auxiliary/wallet-connect/utils'
     import { showNotification } from '@auxiliary/notification'
     import { onDestroy } from 'svelte'
     import { DappVerification, RpcMethod } from '@auxiliary/wallet-connect/enums'
-    import { ProposalTypes } from '@walletconnect/types'
+    import { Web3WalletTypes } from '@walletconnect/web3wallet'
 
     export let drawerRouter: Router<unknown>
 
     const localeKey = 'views.dashboard.drawers.dapps.connectionRequest'
-    let acceptedInsecureConnection = false
-    let flashingCheckbox = false
-    $: fulfillsRequirements =
-        !!$sessionProposal &&
-        doesFulfillNetworkRequirements(
-            $sessionProposal.params.requiredNamespaces,
-            $sessionProposal.params.optionalNamespaces
-        ) &&
-        doesFulfillMethodRequirements($sessionProposal.params.requiredNamespaces)
-    $: verifiedState = $sessionProposal?.verifyContext.verified.isScam
-        ? DappVerification.Scam
-        : ($sessionProposal?.verifyContext.verified.validation as DappVerification)
 
     let timeout: ReturnType<typeof setTimeout> | undefined
     $: {
-        if ($sessionProposal) {
+        if ($connectionRequest) {
             clearTimeout(timeout)
         } else {
             timeout = setTimeout(() => {
@@ -46,123 +31,92 @@
         }
     }
 
-    function doesFulfillNetworkRequirements(
-        requiredNamespaces: ProposalTypes.RequiredNamespaces,
-        optionalNamespaces: ProposalTypes.RequiredNamespaces
-    ): boolean {
-        const supportedNetworksByProfile = getAllNetworkIds()
-        const requiredNetworksByDapp = Object.values(requiredNamespaces)
-            .flatMap(({ chains }) => chains)
-            .filter(Boolean)
-        const supportedNetworksByDapp = [
-            ...requiredNetworksByDapp,
-            ...Object.values(optionalNamespaces)
-                .flatMap(({ chains }) => chains)
-                .filter(Boolean),
-        ] as string[]
+    type ConnectionRequestProps = {
+        dappMetadata: Web3WalletTypes.Metadata
+        verifiedState: DappVerification
+        requiredNetworks: string[]
+        optionalNetworks: string[]
+        requiredMethods: RpcMethod[]
+    }
 
-        const supportsAllRequiredNetworks = requiredNetworksByDapp.every((networkId) =>
-            supportedNetworksByProfile.includes(networkId)
-        )
+    function getConnectionRequestDataFromSessionProposal(
+        sessionProposal: Web3WalletTypes.SessionProposal
+    ): ConnectionRequestProps {
+        const dappMetadata = sessionProposal.params.proposer.metadata
+        const verifiedState = sessionProposal.verifyContext.verified.isScam
+            ? DappVerification.Scam
+            : (sessionProposal.verifyContext.verified.validation as DappVerification)
 
-        if (!supportsAllRequiredNetworks) {
-            return false
-        }
+        const requiredNetworks = Object.values(sessionProposal.params.requiredNamespaces)
+            .flatMap(({ chains }) => chains)
+            .filter(Boolean)
+        const optionalNetworks = Object.values(sessionProposal.params.optionalNamespaces)
+            .flatMap(({ chains }) => chains)
+            .filter(Boolean)
+        const requiredMethods = Object.values(sessionProposal.params.requiredNamespaces).flatMap(
+            ({ methods }) => methods
+        ) as RpcMethod[]
 
-        const supportsAnyNetwork = supportedNetworksByDapp.some((networkId) =>
-            supportedNetworksByProfile.includes(networkId)
-        )
-        if (!supportsAnyNetwork) {
-            return false
+        return {
+            dappMetadata,
+            verifiedState,
+            requiredNetworks,
+            optionalNetworks,
+            requiredMethods,
         }
-
-        return true
     }
 
-    function doesFulfillMethodRequirements(requiredNamespaces: ProposalTypes.RequiredNamespaces): boolean {
-        const requiredMethods = Object.values(requiredNamespaces).flatMap(({ methods }) => methods) as RpcMethod[]
-        const supportsAllRequiredMethods = requiredMethods.every((method) => ALL_SUPPORTED_METHODS.includes(method))
-        return supportsAllRequiredMethods
+    function getConnectionRequestDataFromSessionAuthenticate(
+        sessionAuthenticatePayload: Web3WalletTypes.SessionAuthenticate
+    ): ConnectionRequestProps {
+        return {
+            dappMetadata: sessionAuthenticatePayload.params.requester.metadata,
+            verifiedState: DappVerification.Unknown,
+            requiredNetworks: [],
+            optionalNetworks: sessionAuthenticatePayload.params.authPayload.chains,
+            requiredMethods: [],
+        }
     }
 
     function onRejectClick(): void {
-        rejectSession()
+        rejectConnectionRequest()
         closeDrawer()
     }
 
-    function onContinueClick(): void {
-        if (verifiedState !== DappVerification.Valid && !acceptedInsecureConnection) {
-            flashingCheckbox = true
-            setTimeout(() => {
-                flashingCheckbox = false
-            }, 1500)
-            return
-        }
-
-        drawerRouter.next()
-    }
-
     onDestroy(() => {
         clearTimeout(timeout)
     })
 </script>
 
-<DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter} onBack={rejectSession}>
-    <div class="w-full h-full flex flex-col justify-between">
-        {#if $sessionProposal}
-            {@const metadata = $sessionProposal.params.proposer.metadata}
-            <DappInfo {metadata} {verifiedState} />
-
-            <div class="flex-grow overflow-hidden">
-                <div class="h-full overflow-scroll flex flex-col gap-5 p-6">
-                    <Table
-                        items={[
-                            {
-                                key: localize('general.description'),
-                                value: metadata.description,
-                            },
-                        ]}
-                        orientation="vertical"
-                    >
-                        <TableRow item={{ key: localize('general.verified') }} orientation="vertical">
-                            <div slot="boundValue">
-                                <Text textColor={verifiedState === DappVerification.Valid ? 'success' : 'danger'}
-                                    >{localize(
-                                        `general.${verifiedState === DappVerification.Valid ? 'yes' : 'no'}`
-                                    )}</Text
-                                >
-                            </div>
-                        </TableRow>
-                    </Table>
-                </div>
-            </div>
-            {#if !fulfillsRequirements}
-                <div class="px-6">
-                    <UnsupportedDappHint
-                        requiredNamespaces={$sessionProposal.params.requiredNamespaces}
-                        optionalNamespaces={$sessionProposal.params.optionalNamespaces}
-                    />
-                </div>
-            {:else if verifiedState !== DappVerification.Valid}
-                <div class="px-6">
-                    <SecurityWarning {verifiedState} {flashingCheckbox} bind:acceptedInsecureConnection />
-                </div>
-            {/if}
-        {:else}
-            <div class="w-full h-full flex items-center justify-center">
-                <Spinner size="lg" />
-            </div>
-        {/if}
-    </div>
-    <div class="flex flex-row gap-2" slot="footer">
-        <Button
-            width="full"
-            variant="outlined"
-            on:click={onRejectClick}
-            text={localize(`actions.${fulfillsRequirements ? 'reject' : 'cancel'}`)}
-        />
-        {#if fulfillsRequirements && verifiedState !== DappVerification.Scam}
-            <Button width="full" on:click={onContinueClick} text={localize('actions.continue')} />
-        {/if}
-    </div>
-</DrawerTemplate>
+{#if $connectionRequest?.type === 'session_proposal'}
+    {@const { dappMetadata, verifiedState, requiredNetworks, optionalNetworks, requiredMethods } =
+        getConnectionRequestDataFromSessionProposal($connectionRequest.payload)}
+    <ConnectionRequest
+        {dappMetadata}
+        {verifiedState}
+        {requiredNetworks}
+        {optionalNetworks}
+        {requiredMethods}
+        {drawerRouter}
+    />
+{:else if $connectionRequest?.type === 'session_authenticate'}
+    {@const { dappMetadata, verifiedState, requiredNetworks, optionalNetworks, requiredMethods } =
+        getConnectionRequestDataFromSessionAuthenticate($connectionRequest.payload)}
+    <ConnectionRequest
+        {dappMetadata}
+        {verifiedState}
+        {requiredNetworks}
+        {optionalNetworks}
+        {requiredMethods}
+        {drawerRouter}
+    />
+{:else}
+    <DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter} onBack={rejectConnectionRequest}>
+        <div class="w-full h-full flex items-center justify-center">
+            <Spinner size="lg" textColor="primary" />
+        </div>
+        <div class="flex flex-row gap-2" slot="footer">
+            <Button width="full" variant="outlined" on:click={onRejectClick} text={localize('actions.cancel')} />
+        </div>
+    </DrawerTemplate>
+{/if}
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/InputConnectionCodeDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/InputConnectionCodeDrawer.svelte
index 243634ab80..3f13d79937 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/InputConnectionCodeDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/InputConnectionCodeDrawer.svelte
@@ -5,7 +5,7 @@
     import { localize } from '@core/i18n'
     import { Router } from '@core/router'
     import { onMount } from 'svelte'
-    import { rejectSession, validateConnectionCodeUri } from '@auxiliary/wallet-connect/utils'
+    import { rejectConnectionRequest, validateConnectionCodeUri } from '@auxiliary/wallet-connect/utils'
     import { updateDrawerProps } from '@desktop/auxiliary/drawer'
 
     export let drawerRouter: Router<unknown>
@@ -21,7 +21,7 @@
         if (isValid()) {
             try {
                 pairWithNewDapp(walletConnectUri)
-                updateDrawerProps({ onClose: rejectSession })
+                updateDrawerProps({ onClose: rejectConnectionRequest })
                 drawerRouter.next()
             } catch (err) {
                 error = err

From 8bede4d4675ee81cfb1da6261a09f99ab6ea9e9f Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Fri, 31 May 2024 13:59:52 +0200
Subject: [PATCH 04/24] implement one click auth flow

---
 .../views/ConfirmConnectionDrawer.svelte      | 210 ++----------------
 .../dapp-config/views/OneClickAuthFlow.svelte | 206 +++++++++++++++++
 .../views/SessionProposalFlow.svelte          | 204 +++++++++++++++++
 3 files changed, 428 insertions(+), 192 deletions(-)
 create mode 100644 packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
 create mode 100644 packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte

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 552602801f..892f360e00 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConfirmConnectionDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConfirmConnectionDrawer.svelte
@@ -1,203 +1,29 @@
 <script lang="ts">
-    import { Button, SidebarToast, Spinner, Steps } from '@bloomwalletio/ui'
-    import { DappInfo } from '@ui'
+    import { Button, Spinner } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
     import { Router } from '@core/router'
     import { DrawerTemplate } from '@components'
-    import { connectToDapp } from '@auxiliary/wallet-connect/actions'
-    import { getPersistedDappNamespacesForDapp, sessionProposal } from '@auxiliary/wallet-connect/stores'
-    import { rejectSession } from '@auxiliary/wallet-connect/utils'
-    import { AccountSelection, ConnectionSummary, NetworkSelection, PermissionSelection } from '../components'
-    import { handleError } from '@core/error/handlers'
-    import { IAccountState } from '@core/account'
-    import { DappConfigRoute } from '../dapp-config-route.enum'
+    import OneClickAuthFlow from './OneClickAuthFlow.svelte'
+    import SessionProposalFlow from './SessionProposalFlow.svelte'
+    import { connectionRequest } from '@auxiliary/wallet-connect/stores'
     import { closeDrawer } from '@desktop/auxiliary/drawer'
-    import { selectedAccount } from '@core/account/stores'
-    import { DappVerification } from '@auxiliary/wallet-connect/enums'
-    import { deepEquals } from '@core/utils/object'
-    import { ProposalTypes } from '@walletconnect/types'
-    import { IPersistedNamespaces } from '@auxiliary/wallet-connect/interface'
 
     export let drawerRouter: Router<unknown>
 
-    let loading = false
-
     const localeKey = 'views.dashboard.drawers.dapps.confirmConnection'
-    let currentStep = 0
-    const steps = [
-        localize(`${localeKey}.permissions.step`),
-        localize(`${localeKey}.networks.step`),
-        localize(`${localeKey}.accounts.step`),
-    ]
-
-    let checkedAccounts: IAccountState[] = []
-    let checkedNetworks: string[] = []
-    let checkedMethods: string[] = []
-
-    $: verifiedState = $sessionProposal?.verifyContext.verified.isScam
-        ? DappVerification.Scam
-        : ($sessionProposal?.verifyContext.verified.validation as DappVerification)
-    $: persistedNamespaces = $sessionProposal
-        ? getPersistedDappNamespacesForDapp($sessionProposal.params.proposer.metadata.url)
-        : undefined
-
-    $: isButtonDisabled =
-        loading ||
-        (!persistedNamespaces && currentStep === 0 && checkedMethods.length === 0) ||
-        (currentStep === 1 && checkedNetworks.length === 0) ||
-        (currentStep === 2 && checkedAccounts.length === 0)
-
-    $: isPreferenceSelectionRequired = $sessionProposal
-        ? preferenceSelectionRequired(
-              $sessionProposal.params.requiredNamespaces,
-              $sessionProposal.params.optionalNamespaces,
-              persistedNamespaces
-          )
-        : false
-    function preferenceSelectionRequired(
-        requiredNamespaces: ProposalTypes.RequiredNamespaces,
-        optionalNamespaces: ProposalTypes.OptionalNamespaces,
-        _persistedNamespaces?: IPersistedNamespaces
-    ): boolean {
-        if (!_persistedNamespaces || !$sessionProposal) {
-            return true
-        }
-
-        const didRequiredChange = !deepEquals(_persistedNamespaces.required, requiredNamespaces)
-        const didOptionalChange = !deepEquals(_persistedNamespaces.optional, optionalNamespaces)
-        return didRequiredChange || didOptionalChange
-    }
-
-    function onBackClick(): void {
-        if (currentStep === 0) {
-            if (drawerRouter.hasHistory()) {
-                drawerRouter.previous()
-            } else {
-                rejectSession()
-                closeDrawer()
-            }
-        } else {
-            currentStep--
-        }
-    }
-
-    function onNextClick(): void {
-        currentStep++
-    }
-
-    async function onConfirmClick(): Promise<void> {
-        if (!$sessionProposal) {
-            return
-        }
-
-        try {
-            loading = true
-            const persistedSupportedNamespaces = getPersistedDappNamespacesForDapp(
-                $sessionProposal.params.proposer.metadata.url
-            )?.supported
-
-            const selections = {
-                chains: persistedSupportedNamespaces ? undefined : checkedNetworks,
-                methods: persistedSupportedNamespaces ? undefined : checkedMethods,
-                accounts: persistedSupportedNamespaces ? undefined : checkedAccounts,
-            }
-            await connectToDapp(
-                selections,
-                persistedSupportedNamespaces,
-                $sessionProposal,
-                $selectedAccount as IAccountState
-            )
-            $sessionProposal = undefined
-
-            drawerRouter.reset()
-            drawerRouter.goTo(DappConfigRoute.ConnectedDapps)
-        } catch (error) {
-            loading = false
-            handleError(error)
-        }
-    }
 </script>
 
-<DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter}>
-    <div class="w-full h-full flex flex-col space-y-6 overflow-hidden">
-        {#if $sessionProposal}
-            {@const requiredNamespaces = $sessionProposal.params.requiredNamespaces}
-            {@const optionalNamespaces = $sessionProposal.params.optionalNamespaces}
-
-            <DappInfo metadata={$sessionProposal.params.proposer.metadata} {verifiedState} />
-
-            <div class="px-6 flex-grow overflow-hidden">
-                {#if persistedNamespaces && !isPreferenceSelectionRequired}
-                    <div class="h-full overflow-scroll">
-                        <ConnectionSummary
-                            {requiredNamespaces}
-                            editable
-                            persistedSupportedNamespaces={persistedNamespaces.supported}
-                            {drawerRouter}
-                        />
-                    </div>
-                {:else}
-                    {@const tipLocale = currentStep === 0 ? 'permissions' : currentStep === 1 ? 'networks' : 'accounts'}
-                    <div class="h-full flex flex-col gap-8">
-                        <Steps bind:currentStep {steps} />
-
-                        <div class="flex-grow overflow-hidden">
-                            <div class="h-full flex flex-col gap-8 overflow-scroll">
-                                <SidebarToast
-                                    color="green"
-                                    header={localize('general.tip')}
-                                    body={localize(`${localeKey}.${tipLocale}.tip`)}
-                                    dismissable={false}
-                                />
-                                <div class="flex-grow {currentStep === 0 ? 'visible' : 'hidden'}">
-                                    <PermissionSelection
-                                        bind:checkedMethods
-                                        {requiredNamespaces}
-                                        {optionalNamespaces}
-                                        persistedSupportedNamespaces={persistedNamespaces?.supported}
-                                    />
-                                </div>
-                                <div class="flex-grow {currentStep === 1 ? 'visible' : 'hidden'}">
-                                    <NetworkSelection
-                                        bind:checkedNetworks
-                                        {requiredNamespaces}
-                                        {optionalNamespaces}
-                                        persistedSupportedNamespaces={persistedNamespaces?.supported}
-                                    />
-                                </div>
-                                <div class="flex-grow {currentStep === 2 ? 'visible' : 'hidden'}">
-                                    <AccountSelection
-                                        bind:checkedAccounts
-                                        chainIds={checkedNetworks}
-                                        persistedSupportedNamespaces={persistedNamespaces?.supported}
-                                    />
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                {/if}
-            </div>
-        {:else}
-            <div class="w-full h-full flex items-center justify-center">
-                <Spinner size="lg" />
-            </div>
-        {/if}
-    </div>
-    <div slot="footer" class="flex flex-row gap-2">
-        <Button
-            variant="outlined"
-            width="full"
-            on:click={onBackClick}
-            disabled={loading}
-            text={localize(!drawerRouter.hasHistory() && currentStep === 0 ? 'actions.cancel' : 'actions.back')}
-        />
-        {@const isLastStep = persistedNamespaces || currentStep === steps.length - 1}
-        <Button
-            width="full"
-            on:click={isLastStep ? onConfirmClick : onNextClick}
-            disabled={isButtonDisabled}
-            busy={loading}
-            text={localize(`actions.${isLastStep ? 'confirm' : 'next'}`)}
-        />
-    </div>
-</DrawerTemplate>
+{#if $connectionRequest?.type === 'session_proposal'}
+    <SessionProposalFlow sessionProposal={$connectionRequest.payload} {drawerRouter} />
+{:else if $connectionRequest?.type === 'session_authenticate'}
+    <OneClickAuthFlow sessionProposal={$connectionRequest.payload} {drawerRouter} />
+{:else}
+    <DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter}>
+        <div class="w-full h-full flex items-center justify-center">
+            <Spinner size="lg" textColor="primary" />
+        </div>
+        <div slot="footer" class="flex flex-row gap-2">
+            <Button variant="outlined" width="full" on:click={closeDrawer} text={localize('actions.cancel')} />
+        </div>
+    </DrawerTemplate>
+{/if}
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
new file mode 100644
index 0000000000..a6284d7cbf
--- /dev/null
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
@@ -0,0 +1,206 @@
+<script lang="ts">
+    import { Button, SidebarToast, Steps } from '@bloomwalletio/ui'
+    import { DappInfo } from '@ui'
+    import { localize } from '@core/i18n'
+    import { Router } from '@core/router'
+    import { DrawerTemplate } from '@components'
+    import { rejectConnectionRequest } from '@auxiliary/wallet-connect/utils'
+    import { AccountSelection, NetworkSelection, PermissionSelection } from '../components'
+    import { handleError } from '@core/error/handlers'
+    import { IAccountState, getAddressFromAccountForNetwork } from '@core/account'
+    import { DappConfigRoute } from '../dapp-config-route.enum'
+    import { closeDrawer } from '@desktop/auxiliary/drawer'
+    import { DappVerification } from '@auxiliary/wallet-connect/enums'
+    import { Web3WalletTypes } from '@walletconnect/web3wallet'
+    import { walletClient } from '@auxiliary/wallet-connect/stores'
+    import { populateAuthPayload, buildAuthObject } from '@walletconnect/utils'
+    import { NetworkId, getEvmNetwork } from '@core/network'
+    import { AuthTypes } from '@walletconnect/types'
+    import { signMessage } from '@core/wallet'
+    import { checkActiveProfileAuth } from '@core/profile/actions'
+    import { LedgerAppName } from '@core/ledger'
+    import { GENERAL_SUPPORTED_METHODS } from '@auxiliary/wallet-connect/constants'
+
+    export let drawerRouter: Router<unknown>
+    export let sessionProposal: Web3WalletTypes.SessionAuthenticate
+
+    let loading = false
+
+    const localeKey = 'views.dashboard.drawers.dapps.confirmConnection'
+    let currentStep = 0
+    const steps = [
+        localize(`${localeKey}.permissions.step`),
+        localize(`${localeKey}.networks.step`),
+        localize(`${localeKey}.accounts.step`),
+    ]
+
+    let checkedAccounts: IAccountState[] = []
+    let checkedNetworks: string[] = []
+    let checkedMethods: string[] = []
+
+    const verifiedState = DappVerification.Unknown
+
+    const dappMetadata = sessionProposal.params.requester.metadata
+
+    const requiredNetworks = []
+    const optionalNetworks = sessionProposal.params.authPayload.chains
+
+    const requiredMethods = []
+    const optionalMethods = [
+        'eth_accounts',
+        'eth_requestAccounts',
+        'eth_sendRawTransaction',
+        'eth_sendTransaction',
+        'eth_sign',
+        'eth_signTransaction',
+        'eth_signTypedData',
+        'eth_signTypedData_v3',
+        'eth_signTypedData_v4',
+        'personal_sign',
+        'wallet_addEthereumChain',
+        'wallet_getCallsStatus',
+        'wallet_getCapabilities',
+        'wallet_getPermissions',
+        'wallet_registerOnboarding',
+        'wallet_requestPermissions',
+        'wallet_scanQRCode',
+        'wallet_sendCalls',
+        'wallet_showCallsStatus',
+        'wallet_switchEthereumChain',
+        'wallet_watchAsset',
+    ]
+
+    $: isButtonDisabled =
+        loading ||
+        (currentStep === 0 && checkedMethods.length === 0) ||
+        (currentStep === 1 && checkedNetworks.length === 0) ||
+        (currentStep === 2 && checkedAccounts.length === 0)
+
+    function onBackClick(): void {
+        if (currentStep === 0) {
+            if (drawerRouter.hasHistory()) {
+                drawerRouter.previous()
+            } else {
+                rejectConnectionRequest()
+                closeDrawer()
+            }
+        } else {
+            currentStep--
+        }
+    }
+
+    function onNextClick(): void {
+        currentStep++
+    }
+
+    async function onConfirmClick(): Promise<void> {
+        if (!$walletClient) {
+            return
+        }
+
+        loading = true
+        try {
+            await checkActiveProfileAuth(LedgerAppName.Ethereum)
+        } catch {
+            loading = false
+            return
+        }
+
+        try {
+            const allowedMethods = [...checkedMethods, ...GENERAL_SUPPORTED_METHODS]
+
+            const authPayload = populateAuthPayload({
+                authPayload: sessionProposal.params.authPayload,
+                chains: checkedNetworks,
+                methods: allowedMethods,
+            })
+
+            const auths: AuthTypes.Cacao[] = []
+            for (const chain of authPayload.chains) {
+                const network = getEvmNetwork(chain as NetworkId)
+                if (!network) {
+                    continue
+                }
+
+                for (const account of checkedAccounts) {
+                    const address = `${chain}:${getAddressFromAccountForNetwork(account, chain as NetworkId)}`
+
+                    const message = $walletClient.formatAuthMessage({
+                        request: authPayload,
+                        iss: address,
+                    })
+                    const signature = await signMessage(message, network.coinType, account)
+                    if (!signature) {
+                        continue
+                    }
+
+                    const auth = buildAuthObject(authPayload, { t: 'eip191', s: signature }, address)
+                    auths.push(auth)
+                }
+            }
+
+            await $walletClient.approveSessionAuthenticate({
+                id: sessionProposal.id,
+                auths,
+            })
+
+            drawerRouter.reset()
+            drawerRouter.goTo(DappConfigRoute.ConnectedDapps)
+            loading = false
+        } catch (error) {
+            loading = false
+            handleError(error)
+        }
+    }
+</script>
+
+<DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter}>
+    <div class="w-full h-full flex flex-col space-y-6 overflow-hidden">
+        <DappInfo metadata={dappMetadata} {verifiedState} />
+
+        <div class="px-6 flex-grow overflow-hidden">
+            <div class="h-full flex flex-col gap-8">
+                <Steps bind:currentStep {steps} />
+
+                <div class="flex-grow overflow-hidden">
+                    <div class="h-full flex flex-col gap-8 overflow-scroll">
+                        <SidebarToast
+                            color="green"
+                            header={localize('general.tip')}
+                            body={localize(
+                                `${localeKey}.${currentStep === 0 ? 'permissions' : currentStep === 1 ? 'networks' : 'accounts'}.tip`
+                            )}
+                            dismissable={false}
+                        />
+                        <div class="flex-grow {currentStep === 0 ? 'visible' : 'hidden'}">
+                            <PermissionSelection bind:checkedMethods {requiredMethods} {optionalMethods} />
+                        </div>
+                        <div class="flex-grow {currentStep === 1 ? 'visible' : 'hidden'}">
+                            <NetworkSelection bind:checkedNetworks {requiredNetworks} {optionalNetworks} />
+                        </div>
+                        <div class="flex-grow {currentStep === 2 ? 'visible' : 'hidden'}">
+                            <AccountSelection bind:checkedAccounts chainIds={checkedNetworks} />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div slot="footer" class="flex flex-row gap-2">
+        <Button
+            variant="outlined"
+            width="full"
+            on:click={onBackClick}
+            disabled={loading}
+            text={localize(!drawerRouter.hasHistory() && currentStep === 0 ? 'actions.cancel' : 'actions.back')}
+        />
+        {@const isLastStep = currentStep === steps.length - 1}
+        <Button
+            width="full"
+            on:click={isLastStep ? onConfirmClick : onNextClick}
+            disabled={isButtonDisabled}
+            busy={loading}
+            text={localize(`actions.${isLastStep ? 'confirm' : 'next'}`)}
+        />
+    </div>
+</DrawerTemplate>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
new file mode 100644
index 0000000000..2d6afc215b
--- /dev/null
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
@@ -0,0 +1,204 @@
+<script lang="ts">
+    import { Button, SidebarToast, Steps } from '@bloomwalletio/ui'
+    import { DappInfo } from '@ui'
+    import { localize } from '@core/i18n'
+    import { Router } from '@core/router'
+    import { DrawerTemplate } from '@components'
+    import { connectToDapp } from '@auxiliary/wallet-connect/actions'
+    import { getPersistedDappNamespacesForDapp } from '@auxiliary/wallet-connect/stores'
+    import { rejectConnectionRequest } from '@auxiliary/wallet-connect/utils'
+    import { AccountSelection, ConnectionSummary, NetworkSelection, PermissionSelection } from '../components'
+    import { handleError } from '@core/error/handlers'
+    import { IAccountState } from '@core/account'
+    import { DappConfigRoute } from '../dapp-config-route.enum'
+    import { closeDrawer } from '@desktop/auxiliary/drawer'
+    import { selectedAccount } from '@core/account/stores'
+    import { DappVerification, RpcMethod } from '@auxiliary/wallet-connect/enums'
+    import { deepEquals } from '@core/utils/object'
+    import { ProposalTypes } from '@walletconnect/types'
+    import { IPersistedNamespaces } from '@auxiliary/wallet-connect/interface'
+    import { Web3WalletTypes } from '@walletconnect/web3wallet'
+
+    export let drawerRouter: Router<unknown>
+    export let sessionProposal: Web3WalletTypes.SessionProposal
+
+    let loading = false
+
+    const localeKey = 'views.dashboard.drawers.dapps.confirmConnection'
+    let currentStep = 0
+    const steps = [
+        localize(`${localeKey}.permissions.step`),
+        localize(`${localeKey}.networks.step`),
+        localize(`${localeKey}.accounts.step`),
+    ]
+
+    let checkedAccounts: IAccountState[] = []
+    let checkedNetworks: string[] = []
+    let checkedMethods: string[] = []
+
+    const verifiedState = sessionProposal.verifyContext.verified.isScam
+        ? DappVerification.Scam
+        : (sessionProposal.verifyContext.verified.validation as DappVerification)
+
+    const dappMetadata = sessionProposal.params.proposer.metadata
+    const persistedNamespaces = getPersistedDappNamespacesForDapp(dappMetadata.url)
+    const requiredNamespaces = sessionProposal.params.requiredNamespaces
+    const optionalNamespaces = sessionProposal.params.optionalNamespaces
+
+    const requiredNetworks = Object.values(requiredNamespaces)
+        .flatMap(({ chains }) => chains)
+        .filter(Boolean)
+    const optionalNetworks = Object.values(optionalNamespaces)
+        .flatMap(({ chains }) => chains)
+        .filter(Boolean)
+
+    const requiredMethods = Object.values(requiredNamespaces).flatMap(({ methods }) => methods) as RpcMethod[]
+    const optionalMethods = Object.values(optionalNamespaces).flatMap(({ methods }) => methods) as RpcMethod[]
+
+    $: isButtonDisabled =
+        loading ||
+        (!persistedNamespaces &&
+            currentStep === 0 &&
+            checkedMethods.length === 0 &&
+            [...requiredMethods, ...optionalMethods].length > 0) ||
+        (currentStep === 1 && checkedNetworks.length === 0) ||
+        (currentStep === 2 && checkedAccounts.length === 0)
+
+    $: isPreferenceSelectionRequired = preferenceSelectionRequired(
+        sessionProposal.params.requiredNamespaces,
+        sessionProposal.params.optionalNamespaces,
+        persistedNamespaces
+    )
+    function preferenceSelectionRequired(
+        requiredNamespaces: ProposalTypes.RequiredNamespaces,
+        optionalNamespaces: ProposalTypes.OptionalNamespaces,
+        _persistedNamespaces?: IPersistedNamespaces
+    ): boolean {
+        if (!_persistedNamespaces || !sessionProposal) {
+            return true
+        }
+
+        const didRequiredChange = !deepEquals(_persistedNamespaces.required, requiredNamespaces)
+        const didOptionalChange = !deepEquals(_persistedNamespaces.optional, optionalNamespaces)
+        return didRequiredChange || didOptionalChange
+    }
+
+    function onBackClick(): void {
+        if (currentStep === 0) {
+            if (drawerRouter.hasHistory()) {
+                drawerRouter.previous()
+            } else {
+                rejectConnectionRequest()
+                closeDrawer()
+            }
+        } else {
+            currentStep--
+        }
+    }
+
+    function onNextClick(): void {
+        currentStep++
+    }
+
+    async function onConfirmClick(): Promise<void> {
+        try {
+            loading = true
+            const persistedSupportedNamespaces = getPersistedDappNamespacesForDapp(dappMetadata.url)?.supported
+
+            const selections = persistedSupportedNamespaces
+                ? {}
+                : {
+                      chains: checkedNetworks,
+                      methods: checkedMethods,
+                      accounts: checkedAccounts,
+                  }
+            await connectToDapp(
+                selections,
+                persistedSupportedNamespaces,
+                sessionProposal,
+                $selectedAccount as IAccountState
+            )
+
+            drawerRouter.reset()
+            drawerRouter.goTo(DappConfigRoute.ConnectedDapps)
+        } catch (error) {
+            loading = false
+            handleError(error)
+        }
+    }
+</script>
+
+<DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter}>
+    <div class="w-full h-full flex flex-col space-y-6 overflow-hidden">
+        <DappInfo metadata={dappMetadata} {verifiedState} />
+
+        <div class="px-6 flex-grow overflow-hidden">
+            {#if persistedNamespaces && !isPreferenceSelectionRequired}
+                <div class="h-full overflow-scroll">
+                    <ConnectionSummary
+                        {requiredNamespaces}
+                        editable
+                        persistedSupportedNamespaces={persistedNamespaces.supported}
+                        {drawerRouter}
+                    />
+                </div>
+            {:else}
+                {@const tipLocale = currentStep === 0 ? 'permissions' : currentStep === 1 ? 'networks' : 'accounts'}
+                <div class="h-full flex flex-col gap-8">
+                    <Steps bind:currentStep {steps} />
+
+                    <div class="flex-grow overflow-hidden">
+                        <div class="h-full flex flex-col gap-8 overflow-scroll">
+                            <SidebarToast
+                                color="green"
+                                header={localize('general.tip')}
+                                body={localize(`${localeKey}.${tipLocale}.tip`)}
+                                dismissable={false}
+                            />
+                            <div class="flex-grow {currentStep === 0 ? 'visible' : 'hidden'}">
+                                <PermissionSelection
+                                    bind:checkedMethods
+                                    {requiredMethods}
+                                    {optionalMethods}
+                                    persistedSupportedNamespaces={persistedNamespaces?.supported}
+                                />
+                            </div>
+                            <div class="flex-grow {currentStep === 1 ? 'visible' : 'hidden'}">
+                                <NetworkSelection
+                                    bind:checkedNetworks
+                                    {requiredNetworks}
+                                    {optionalNetworks}
+                                    persistedSupportedNamespaces={persistedNamespaces?.supported}
+                                />
+                            </div>
+                            <div class="flex-grow {currentStep === 2 ? 'visible' : 'hidden'}">
+                                <AccountSelection
+                                    bind:checkedAccounts
+                                    chainIds={checkedNetworks}
+                                    persistedSupportedNamespaces={persistedNamespaces?.supported}
+                                />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            {/if}
+        </div>
+    </div>
+    <div slot="footer" class="flex flex-row gap-2">
+        <Button
+            variant="outlined"
+            width="full"
+            on:click={onBackClick}
+            disabled={loading}
+            text={localize(!drawerRouter.hasHistory() && currentStep === 0 ? 'actions.cancel' : 'actions.back')}
+        />
+        {@const isLastStep = persistedNamespaces || currentStep === steps.length - 1}
+        <Button
+            width="full"
+            on:click={isLastStep ? onConfirmClick : onNextClick}
+            disabled={isButtonDisabled}
+            busy={loading}
+            text={localize(`actions.${isLastStep ? 'confirm' : 'next'}`)}
+        />
+    </div>
+</DrawerTemplate>

From 640d865d8bdda636a44fee24838c6ebc9c551c00 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Fri, 31 May 2024 13:59:53 +0200
Subject: [PATCH 05/24] move approval function into own file

---
 .../views/ConnectionRequestDrawer.svelte      |  4 +-
 .../dapp-config/views/OneClickAuthFlow.svelte | 49 ++-----------
 .../views/SessionProposalFlow.svelte          |  4 +-
 .../actions/approveSessionAuthenticate.ts     | 72 +++++++++++++++++++
 .../auxiliary/wallet-connect/actions/index.ts |  1 +
 .../auxiliary/wallet-connect/utils/index.ts   |  1 +
 .../utils/normalizeSupportedNamespace.ts      | 18 +++++
 7 files changed, 103 insertions(+), 46 deletions(-)
 create mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts
 create mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/utils/normalizeSupportedNamespace.ts

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
index 91dc5d74fe..6ca326efbd 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
@@ -48,10 +48,10 @@
             : (sessionProposal.verifyContext.verified.validation as DappVerification)
 
         const requiredNetworks = Object.values(sessionProposal.params.requiredNamespaces)
-            .flatMap(({ chains }) => chains)
+            .flatMap(({ chains }) => chains ?? [])
             .filter(Boolean)
         const optionalNetworks = Object.values(sessionProposal.params.optionalNamespaces)
-            .flatMap(({ chains }) => chains)
+            .flatMap(({ chains }) => chains ?? [])
             .filter(Boolean)
         const requiredMethods = Object.values(sessionProposal.params.requiredNamespaces).flatMap(
             ({ methods }) => methods
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
index a6284d7cbf..3ee2a9c0ea 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
@@ -7,19 +7,15 @@
     import { rejectConnectionRequest } from '@auxiliary/wallet-connect/utils'
     import { AccountSelection, NetworkSelection, PermissionSelection } from '../components'
     import { handleError } from '@core/error/handlers'
-    import { IAccountState, getAddressFromAccountForNetwork } from '@core/account'
+    import { IAccountState } from '@core/account'
     import { DappConfigRoute } from '../dapp-config-route.enum'
     import { closeDrawer } from '@desktop/auxiliary/drawer'
     import { DappVerification } from '@auxiliary/wallet-connect/enums'
     import { Web3WalletTypes } from '@walletconnect/web3wallet'
     import { walletClient } from '@auxiliary/wallet-connect/stores'
-    import { populateAuthPayload, buildAuthObject } from '@walletconnect/utils'
-    import { NetworkId, getEvmNetwork } from '@core/network'
-    import { AuthTypes } from '@walletconnect/types'
-    import { signMessage } from '@core/wallet'
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { LedgerAppName } from '@core/ledger'
-    import { GENERAL_SUPPORTED_METHODS } from '@auxiliary/wallet-connect/constants'
+    import { approveSessionAuthenticate } from '@auxiliary/wallet-connect/actions/approveSessionAuthenticate'
 
     export let drawerRouter: Router<unknown>
     export let sessionProposal: Web3WalletTypes.SessionAuthenticate
@@ -107,49 +103,18 @@
         }
 
         try {
-            const allowedMethods = [...checkedMethods, ...GENERAL_SUPPORTED_METHODS]
-
-            const authPayload = populateAuthPayload({
-                authPayload: sessionProposal.params.authPayload,
+            await approveSessionAuthenticate(sessionProposal, {
+                accounts: checkedAccounts,
                 chains: checkedNetworks,
-                methods: allowedMethods,
-            })
-
-            const auths: AuthTypes.Cacao[] = []
-            for (const chain of authPayload.chains) {
-                const network = getEvmNetwork(chain as NetworkId)
-                if (!network) {
-                    continue
-                }
-
-                for (const account of checkedAccounts) {
-                    const address = `${chain}:${getAddressFromAccountForNetwork(account, chain as NetworkId)}`
-
-                    const message = $walletClient.formatAuthMessage({
-                        request: authPayload,
-                        iss: address,
-                    })
-                    const signature = await signMessage(message, network.coinType, account)
-                    if (!signature) {
-                        continue
-                    }
-
-                    const auth = buildAuthObject(authPayload, { t: 'eip191', s: signature }, address)
-                    auths.push(auth)
-                }
-            }
-
-            await $walletClient.approveSessionAuthenticate({
-                id: sessionProposal.id,
-                auths,
+                methods: checkedMethods,
             })
 
             drawerRouter.reset()
             drawerRouter.goTo(DappConfigRoute.ConnectedDapps)
-            loading = false
         } catch (error) {
-            loading = false
             handleError(error)
+        } finally {
+            loading = false
         }
     }
 </script>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
index 2d6afc215b..6144a32c1d 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
@@ -46,10 +46,10 @@
     const optionalNamespaces = sessionProposal.params.optionalNamespaces
 
     const requiredNetworks = Object.values(requiredNamespaces)
-        .flatMap(({ chains }) => chains)
+        .flatMap(({ chains }) => chains ?? [])
         .filter(Boolean)
     const optionalNetworks = Object.values(optionalNamespaces)
-        .flatMap(({ chains }) => chains)
+        .flatMap(({ chains }) => chains ?? [])
         .filter(Boolean)
 
     const requiredMethods = Object.values(requiredNamespaces).flatMap(({ methods }) => methods) as RpcMethod[]
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts
new file mode 100644
index 0000000000..3e789aa679
--- /dev/null
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts
@@ -0,0 +1,72 @@
+import { getAddressFromAccountForNetwork } from '@core/account'
+import { clearConnectionRequest, getWalletClient, persistDapp } from '../stores'
+import { clearOldPairings } from './clearOldPairings'
+import { Web3WalletTypes } from '@walletconnect/web3wallet'
+import { DappVerification } from '../enums'
+import { GENERAL_SUPPORTED_METHODS } from '../constants'
+import { populateAuthPayload, buildAuthObject } from '@walletconnect/utils'
+import { NetworkId, getEvmNetwork } from '@core/network'
+import { AuthTypes } from '@walletconnect/types'
+import { ISelections } from '../interface'
+import { signMessage } from '@core/wallet'
+import { normalizeSessionNamespace } from '../utils'
+
+export async function approveSessionAuthenticate(
+    sessionProposal: Web3WalletTypes.SessionAuthenticate,
+    selections: ISelections
+): Promise<void> {
+    const walletClient = getWalletClient()
+    if (!walletClient) {
+        return
+    }
+
+    const allowedMethods = [...(selections.methods ?? []), ...GENERAL_SUPPORTED_METHODS]
+
+    const authPayload = populateAuthPayload({
+        authPayload: sessionProposal.params.authPayload,
+        chains: selections.chains ?? [],
+        methods: allowedMethods,
+    })
+
+    const auths: AuthTypes.Cacao[] = []
+    for (const chain of authPayload.chains) {
+        const network = getEvmNetwork(chain as NetworkId)
+        if (!network) {
+            continue
+        }
+
+        for (const account of selections.accounts ?? []) {
+            const address = `${chain}:${getAddressFromAccountForNetwork(account, network.id)}`
+
+            const message = walletClient.formatAuthMessage({
+                request: authPayload,
+                iss: address,
+            })
+            const signature = await signMessage(message, network.coinType, account)
+            if (!signature) {
+                continue
+            }
+
+            const auth = buildAuthObject(authPayload, { t: 'eip191', s: signature }, address)
+            auths.push(auth)
+        }
+    }
+
+    const { session } = await walletClient.approveSessionAuthenticate({
+        id: sessionProposal.id,
+        auths,
+    })
+
+    if (!session) {
+        throw new Error('Failed to approve session authenticate')
+    }
+
+    const dappUrl = sessionProposal.params.requester.metadata.url
+    await clearOldPairings(dappUrl)
+    persistDapp(dappUrl, DappVerification.Unknown, {
+        supported: normalizeSessionNamespace(session.namespaces),
+        required: session.requiredNamespaces,
+        optional: session.optionalNamespaces,
+    })
+    clearConnectionRequest()
+}
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/index.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/index.ts
index 87c5b73c23..2969f8bb30 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/index.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/index.ts
@@ -1,4 +1,5 @@
 export * from './approveSession'
+export * from './approveSessionAuthenticate'
 export * from './buildSupportedNamespaceFromSelections'
 export * from './clearOldPairings'
 export * from './connectToDapp'
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 2814e8ce4c..9c010c3295 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
@@ -1,6 +1,7 @@
 export * from './disconnectAllDapps'
 export * from './getBloomError'
 export * from './getPermissionForMethod'
+export * from './normalizeSupportedNamespace'
 export * from './rejectConnectionRequest'
 export * from './switchToRequiredAccount'
 export * from './updateSession'
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/normalizeSupportedNamespace.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/normalizeSupportedNamespace.ts
new file mode 100644
index 0000000000..12d064e0e2
--- /dev/null
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/normalizeSupportedNamespace.ts
@@ -0,0 +1,18 @@
+import type { SessionTypes } from '@walletconnect/types'
+import type { ISupportedNamespace } from '../types'
+
+export function normalizeSessionNamespace(
+    sessionNamespace: SessionTypes.Namespaces
+): Record<string, ISupportedNamespace> {
+    const normalizedRecord: Record<string, ISupportedNamespace> = {}
+
+    for (const key in sessionNamespace) {
+        const session = sessionNamespace[key]
+        normalizedRecord[key] = {
+            ...session,
+            chains: session.chains || [],
+        }
+    }
+
+    return normalizedRecord
+}

From f705d62931e399075763c364cfd4a68652c77c69 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Fri, 31 May 2024 13:59:54 +0200
Subject: [PATCH 06/24] fix edit drawers

---
 .../components/EditSelectionDrawer.svelte     | 127 ++++++++++++++++--
 .../views/EditNetworksDrawer.svelte           |   6 +-
 .../views/EditPermissionsDrawer.svelte        |   6 +-
 .../dapp-config/views/OneClickAuthFlow.svelte |  25 +---
 .../constants/all-evm-methods.constant.ts     |  23 ++++
 .../wallet-connect/constants/index.ts         |   1 +
 6 files changed, 148 insertions(+), 40 deletions(-)
 create mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/constants/all-evm-methods.constant.ts

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 ec54918b88..4a82aca2f2 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte
@@ -6,35 +6,138 @@
     import {
         updateSupportedDappNamespacesForDapp,
         selectedDapp,
-        sessionProposal,
+        connectionRequest,
         getPersistedDapp,
+        ConnectionRequest,
     } from '@auxiliary/wallet-connect/stores'
     import { onMount } from 'svelte'
     import { buildSupportedNamespacesFromSelections } from '@auxiliary/wallet-connect/actions'
     import { updateSession } from '@auxiliary/wallet-connect/utils'
-    import { IDappMetadata, ISelections } from '@auxiliary/wallet-connect/interface'
+    import { IConnectedDapp, IDappMetadata, ISelections } from '@auxiliary/wallet-connect/interface'
     import { DappInfo } from '@ui'
+    import { ALL_EVM_METHODS } from '@auxiliary/wallet-connect/constants'
 
     export let drawerRouter: Router<unknown>
     export let selections: ISelections
     export let titleLocale: string
     export let disableContinue: boolean
 
-    $: dappMetadata = $selectedDapp?.metadata ?? ($sessionProposal?.params.proposer.metadata as IDappMetadata)
+    const dappMetadata = getDappMetadata($selectedDapp, $connectionRequest)
+    const { requiredMethods, optionalMethods } = getMethodsForNamespaces($selectedDapp, $connectionRequest)
+    const { requiredNetworks, optionalNetworks } = getNetworksForNamespaces($selectedDapp, $connectionRequest)
+
     $: persistedDapp = dappMetadata ? getPersistedDapp(dappMetadata.url) : undefined
-    $: requiredNamespaces =
-        $selectedDapp?.session?.requiredNamespaces ?? $sessionProposal?.params.requiredNamespaces ?? {}
-    $: optionalNamespaces =
-        $selectedDapp?.session?.optionalNamespaces ?? $sessionProposal?.params.optionalNamespaces ?? {}
+
+    function getDappMetadata(
+        selectedDapp: IConnectedDapp | undefined,
+        connectionRequest: ConnectionRequest | undefined
+    ): IDappMetadata | undefined {
+        if (selectedDapp) {
+            return selectedDapp?.metadata
+        } else if (connectionRequest?.type === 'session_proposal') {
+            return connectionRequest?.payload.params.proposer.metadata as IDappMetadata
+        } else if (connectionRequest?.type === 'session_authenticate') {
+            return connectionRequest?.payload.params.requester.metadata as IDappMetadata
+        } else {
+            return undefined
+        }
+    }
+
+    function getMethodsForNamespaces(
+        selectedDapp: IConnectedDapp | undefined,
+        connectionRequest: ConnectionRequest | undefined
+    ): { requiredMethods: string[]; optionalMethods: string[] } {
+        if (selectedDapp) {
+            const { requiredNamespaces, optionalNamespaces } = selectedDapp.session ?? {
+                requiredNamespaces: [],
+                optionalNamespaces: [],
+            }
+            return {
+                requiredMethods: Object.values(requiredNamespaces)
+                    .flatMap(({ methods }) => methods ?? [])
+                    .filter(Boolean),
+                optionalMethods: Object.values(optionalNamespaces)
+                    .flatMap(({ methods }) => methods ?? [])
+                    .filter(Boolean),
+            }
+        } else if (connectionRequest?.type === 'session_proposal') {
+            const { requiredNamespaces, optionalNamespaces } = connectionRequest.payload?.params ?? {
+                requiredNamespaces: [],
+                optionalNamespaces: [],
+            }
+            return {
+                requiredMethods: Object.values(requiredNamespaces)
+                    .flatMap(({ methods }) => methods ?? [])
+                    .filter(Boolean),
+                optionalMethods: Object.values(optionalNamespaces)
+                    .flatMap(({ methods }) => methods ?? [])
+                    .filter(Boolean),
+            }
+        } else if (connectionRequest?.type === 'session_authenticate') {
+            return { requiredMethods: [], optionalMethods: ALL_EVM_METHODS }
+        } else {
+            return { requiredMethods: [], optionalMethods: [] }
+        }
+    }
+
+    function getNetworksForNamespaces(
+        selectedDapp: IConnectedDapp | undefined,
+        connectionRequest: ConnectionRequest | undefined
+    ): { requiredNetworks: string[]; optionalNetworks: string[] } {
+        if (selectedDapp) {
+            const { requiredNamespaces, optionalNamespaces } = selectedDapp.session ?? {
+                requiredNamespaces: [],
+                optionalNamespaces: [],
+            }
+            return {
+                requiredNetworks: Object.values(requiredNamespaces)
+                    .flatMap(({ chains }) => chains ?? [])
+                    .filter(Boolean),
+                optionalNetworks: Object.values(optionalNamespaces)
+                    .flatMap(({ chains }) => chains ?? [])
+                    .filter(Boolean),
+            }
+        } else if (connectionRequest?.type === 'session_proposal') {
+            const { requiredNamespaces, optionalNamespaces } = connectionRequest.payload?.params ?? {
+                requiredNamespaces: [],
+                optionalNamespaces: [],
+            }
+            return {
+                requiredNetworks: Object.values(requiredNamespaces)
+                    .flatMap(({ chains }) => chains ?? [])
+                    .filter(Boolean),
+                optionalNetworks: Object.values(optionalNamespaces)
+                    .flatMap(({ chains }) => chains ?? [])
+                    .filter(Boolean),
+            }
+        } else if (connectionRequest?.type === 'session_authenticate') {
+            // TODO: Implement this
+            return { requiredNetworks: [], optionalNetworks: [] }
+        } else {
+            return { requiredNetworks: [], optionalNetworks: [] }
+        }
+    }
 
     function onConfirmClick(): void {
+        // TODO: Implement this
+        if ($connectionRequest?.type === 'session_authenticate') {
+            return
+        }
+
+        const requiredNamespaces =
+            $selectedDapp?.session?.requiredNamespaces ?? $connectionRequest?.payload?.params.requiredNamespaces ?? {}
+        const optionalNamespaces =
+            $selectedDapp?.session?.optionalNamespaces ?? $connectionRequest?.payload?.params.optionalNamespaces ?? {}
+
         const updatedNamespace = buildSupportedNamespacesFromSelections(
             selections,
             requiredNamespaces,
             optionalNamespaces,
             persistedDapp?.namespaces.supported
         )
-        updateSupportedDappNamespacesForDapp(dappMetadata.url, updatedNamespace)
+        if (dappMetadata) {
+            updateSupportedDappNamespacesForDapp(dappMetadata.url, updatedNamespace)
+        }
         if ($selectedDapp?.session) {
             updateSession($selectedDapp.session.topic, updatedNamespace)
         }
@@ -46,7 +149,7 @@
     }
 
     onMount(() => {
-        if (!$selectedDapp && !$sessionProposal) {
+        if (!$selectedDapp && !$connectionRequest) {
             drawerRouter.previous()
         }
     })
@@ -60,8 +163,10 @@
             <div class="h-full flex flex-col gap-8 overflow-scroll">
                 <slot
                     persistedSupportedNamespaces={persistedDapp?.namespaces.supported}
-                    {requiredNamespaces}
-                    {optionalNamespaces}
+                    {requiredMethods}
+                    {optionalMethods}
+                    {requiredNetworks}
+                    {optionalNetworks}
                 />
             </div>
         </div>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/EditNetworksDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/EditNetworksDrawer.svelte
index c531df7a96..65d6af6b70 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/EditNetworksDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/EditNetworksDrawer.svelte
@@ -12,9 +12,9 @@
     titleLocale="dapps.editNetworks"
     selections={{ chains: checkedNetworks }}
     let:persistedSupportedNamespaces
-    let:requiredNamespaces
-    let:optionalNamespaces
+    let:requiredNetworks
+    let:optionalNetworks
     disableContinue={checkedNetworks.length === 0}
 >
-    <NetworkSelection bind:checkedNetworks {requiredNamespaces} {optionalNamespaces} {persistedSupportedNamespaces} />
+    <NetworkSelection bind:checkedNetworks {requiredNetworks} {optionalNetworks} {persistedSupportedNamespaces} />
 </EditSelectionDrawer>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/EditPermissionsDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/EditPermissionsDrawer.svelte
index ab85a89f90..1b2fd7a17f 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/EditPermissionsDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/EditPermissionsDrawer.svelte
@@ -12,9 +12,9 @@
     titleLocale="dapps.editPermissions"
     selections={{ methods: checkedMethods }}
     let:persistedSupportedNamespaces
-    let:requiredNamespaces
-    let:optionalNamespaces
+    let:requiredMethods
+    let:optionalMethods
     disableContinue={checkedMethods.length === 0}
 >
-    <PermissionSelection bind:checkedMethods {requiredNamespaces} {optionalNamespaces} {persistedSupportedNamespaces} />
+    <PermissionSelection bind:checkedMethods {requiredMethods} {optionalMethods} {persistedSupportedNamespaces} />
 </EditSelectionDrawer>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
index 3ee2a9c0ea..3c3932bd85 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
@@ -16,6 +16,7 @@
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { LedgerAppName } from '@core/ledger'
     import { approveSessionAuthenticate } from '@auxiliary/wallet-connect/actions/approveSessionAuthenticate'
+    import { ALL_EVM_METHODS } from '@auxiliary/wallet-connect/constants'
 
     export let drawerRouter: Router<unknown>
     export let sessionProposal: Web3WalletTypes.SessionAuthenticate
@@ -42,29 +43,7 @@
     const optionalNetworks = sessionProposal.params.authPayload.chains
 
     const requiredMethods = []
-    const optionalMethods = [
-        'eth_accounts',
-        'eth_requestAccounts',
-        'eth_sendRawTransaction',
-        'eth_sendTransaction',
-        'eth_sign',
-        'eth_signTransaction',
-        'eth_signTypedData',
-        'eth_signTypedData_v3',
-        'eth_signTypedData_v4',
-        'personal_sign',
-        'wallet_addEthereumChain',
-        'wallet_getCallsStatus',
-        'wallet_getCapabilities',
-        'wallet_getPermissions',
-        'wallet_registerOnboarding',
-        'wallet_requestPermissions',
-        'wallet_scanQRCode',
-        'wallet_sendCalls',
-        'wallet_showCallsStatus',
-        'wallet_switchEthereumChain',
-        'wallet_watchAsset',
-    ]
+    const optionalMethods = ALL_EVM_METHODS
 
     $: isButtonDisabled =
         loading ||
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/constants/all-evm-methods.constant.ts b/packages/shared/src/lib/auxiliary/wallet-connect/constants/all-evm-methods.constant.ts
new file mode 100644
index 0000000000..b060708be7
--- /dev/null
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/constants/all-evm-methods.constant.ts
@@ -0,0 +1,23 @@
+export const ALL_EVM_METHODS = [
+    'eth_accounts',
+    'eth_requestAccounts',
+    'eth_sendRawTransaction',
+    'eth_sendTransaction',
+    'eth_sign',
+    'eth_signTransaction',
+    'eth_signTypedData',
+    'eth_signTypedData_v3',
+    'eth_signTypedData_v4',
+    'personal_sign',
+    'wallet_addEthereumChain',
+    'wallet_getCallsStatus',
+    'wallet_getCapabilities',
+    'wallet_getPermissions',
+    'wallet_registerOnboarding',
+    'wallet_requestPermissions',
+    'wallet_scanQRCode',
+    'wallet_sendCalls',
+    'wallet_showCallsStatus',
+    'wallet_switchEthereumChain',
+    'wallet_watchAsset',
+]
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/constants/index.ts b/packages/shared/src/lib/auxiliary/wallet-connect/constants/index.ts
index ea6c8a12f5..b127cdfa57 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/constants/index.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/constants/index.ts
@@ -1,3 +1,4 @@
+export * from './all-evm-methods.constant'
 export * from './all-supported-methods.constant'
 export * from './general-supported-methods.constant'
 export * from './methods-for-permissions.constant'

From 109aac8ccf80de71600ccc9c0f1e2bc04349f905 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Fri, 31 May 2024 13:59:54 +0200
Subject: [PATCH 07/24] cleanup

---
 .../components/EditSelectionDrawer.svelte     | 75 +++++++------------
 .../views/ConnectionRequestDrawer.svelte      | 15 ++--
 .../views/SessionProposalFlow.svelte          | 15 +---
 .../getNetworksAndMethodsFromNamespaces.ts    | 42 +++++++++++
 .../auxiliary/wallet-connect/utils/index.ts   |  1 +
 5 files changed, 78 insertions(+), 70 deletions(-)
 create mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/utils/getNetworksAndMethodsFromNamespaces.ts

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 4a82aca2f2..05ac7e6a6b 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte
@@ -12,7 +12,7 @@
     } from '@auxiliary/wallet-connect/stores'
     import { onMount } from 'svelte'
     import { buildSupportedNamespacesFromSelections } from '@auxiliary/wallet-connect/actions'
-    import { updateSession } from '@auxiliary/wallet-connect/utils'
+    import { getNetworksAndMethodsFromNamespaces, updateSession } from '@auxiliary/wallet-connect/utils'
     import { IConnectedDapp, IDappMetadata, ISelections } from '@auxiliary/wallet-connect/interface'
     import { DappInfo } from '@ui'
     import { ALL_EVM_METHODS } from '@auxiliary/wallet-connect/constants'
@@ -48,31 +48,20 @@
         connectionRequest: ConnectionRequest | undefined
     ): { requiredMethods: string[]; optionalMethods: string[] } {
         if (selectedDapp) {
-            const { requiredNamespaces, optionalNamespaces } = selectedDapp.session ?? {
-                requiredNamespaces: [],
-                optionalNamespaces: [],
-            }
-            return {
-                requiredMethods: Object.values(requiredNamespaces)
-                    .flatMap(({ methods }) => methods ?? [])
-                    .filter(Boolean),
-                optionalMethods: Object.values(optionalNamespaces)
-                    .flatMap(({ methods }) => methods ?? [])
-                    .filter(Boolean),
-            }
+            const { requiredNamespaces, optionalNamespaces } = selectedDapp.session ?? {}
+
+            const { requiredMethods, optionalMethods } = getNetworksAndMethodsFromNamespaces(
+                requiredNamespaces ?? {},
+                optionalNamespaces ?? {}
+            )
+            return { requiredMethods, optionalMethods }
         } else if (connectionRequest?.type === 'session_proposal') {
-            const { requiredNamespaces, optionalNamespaces } = connectionRequest.payload?.params ?? {
-                requiredNamespaces: [],
-                optionalNamespaces: [],
-            }
-            return {
-                requiredMethods: Object.values(requiredNamespaces)
-                    .flatMap(({ methods }) => methods ?? [])
-                    .filter(Boolean),
-                optionalMethods: Object.values(optionalNamespaces)
-                    .flatMap(({ methods }) => methods ?? [])
-                    .filter(Boolean),
-            }
+            const { requiredNamespaces, optionalNamespaces } = connectionRequest.payload?.params ?? {}
+            const { requiredMethods, optionalMethods } = getNetworksAndMethodsFromNamespaces(
+                requiredNamespaces ?? {},
+                optionalNamespaces ?? {}
+            )
+            return { requiredMethods, optionalMethods }
         } else if (connectionRequest?.type === 'session_authenticate') {
             return { requiredMethods: [], optionalMethods: ALL_EVM_METHODS }
         } else {
@@ -85,31 +74,19 @@
         connectionRequest: ConnectionRequest | undefined
     ): { requiredNetworks: string[]; optionalNetworks: string[] } {
         if (selectedDapp) {
-            const { requiredNamespaces, optionalNamespaces } = selectedDapp.session ?? {
-                requiredNamespaces: [],
-                optionalNamespaces: [],
-            }
-            return {
-                requiredNetworks: Object.values(requiredNamespaces)
-                    .flatMap(({ chains }) => chains ?? [])
-                    .filter(Boolean),
-                optionalNetworks: Object.values(optionalNamespaces)
-                    .flatMap(({ chains }) => chains ?? [])
-                    .filter(Boolean),
-            }
+            const { requiredNamespaces, optionalNamespaces } = selectedDapp.session ?? {}
+            const { requiredNetworks, optionalNetworks } = getNetworksAndMethodsFromNamespaces(
+                requiredNamespaces ?? {},
+                optionalNamespaces ?? {}
+            )
+            return { requiredNetworks, optionalNetworks }
         } else if (connectionRequest?.type === 'session_proposal') {
-            const { requiredNamespaces, optionalNamespaces } = connectionRequest.payload?.params ?? {
-                requiredNamespaces: [],
-                optionalNamespaces: [],
-            }
-            return {
-                requiredNetworks: Object.values(requiredNamespaces)
-                    .flatMap(({ chains }) => chains ?? [])
-                    .filter(Boolean),
-                optionalNetworks: Object.values(optionalNamespaces)
-                    .flatMap(({ chains }) => chains ?? [])
-                    .filter(Boolean),
-            }
+            const { requiredNamespaces, optionalNamespaces } = connectionRequest.payload?.params ?? {}
+            const { requiredNetworks, optionalNetworks } = getNetworksAndMethodsFromNamespaces(
+                requiredNamespaces ?? {},
+                optionalNamespaces ?? {}
+            )
+            return { requiredNetworks, optionalNetworks }
         } else if (connectionRequest?.type === 'session_authenticate') {
             // TODO: Implement this
             return { requiredNetworks: [], optionalNetworks: [] }
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
index 6ca326efbd..cab03024d9 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
@@ -6,7 +6,7 @@
     import { connectionRequest } from '@auxiliary/wallet-connect/stores'
     import { closeDrawer } from '@desktop/auxiliary/drawer'
     import ConnectionRequest from './ConnectionRequest.svelte'
-    import { rejectConnectionRequest } from '@auxiliary/wallet-connect/utils'
+    import { getNetworksAndMethodsFromNamespaces, rejectConnectionRequest } from '@auxiliary/wallet-connect/utils'
     import { showNotification } from '@auxiliary/notification'
     import { onDestroy } from 'svelte'
     import { DappVerification, RpcMethod } from '@auxiliary/wallet-connect/enums'
@@ -47,15 +47,10 @@
             ? DappVerification.Scam
             : (sessionProposal.verifyContext.verified.validation as DappVerification)
 
-        const requiredNetworks = Object.values(sessionProposal.params.requiredNamespaces)
-            .flatMap(({ chains }) => chains ?? [])
-            .filter(Boolean)
-        const optionalNetworks = Object.values(sessionProposal.params.optionalNamespaces)
-            .flatMap(({ chains }) => chains ?? [])
-            .filter(Boolean)
-        const requiredMethods = Object.values(sessionProposal.params.requiredNamespaces).flatMap(
-            ({ methods }) => methods
-        ) as RpcMethod[]
+        const { requiredNetworks, optionalNetworks, requiredMethods } = getNetworksAndMethodsFromNamespaces(
+            sessionProposal.params.requiredNamespaces,
+            sessionProposal.params.optionalNamespaces
+        )
 
         return {
             dappMetadata,
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
index 6144a32c1d..d6f92ce2df 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
@@ -6,14 +6,14 @@
     import { DrawerTemplate } from '@components'
     import { connectToDapp } from '@auxiliary/wallet-connect/actions'
     import { getPersistedDappNamespacesForDapp } from '@auxiliary/wallet-connect/stores'
-    import { rejectConnectionRequest } from '@auxiliary/wallet-connect/utils'
+    import { getNetworksAndMethodsFromNamespaces, rejectConnectionRequest } from '@auxiliary/wallet-connect/utils'
     import { AccountSelection, ConnectionSummary, NetworkSelection, PermissionSelection } from '../components'
     import { handleError } from '@core/error/handlers'
     import { IAccountState } from '@core/account'
     import { DappConfigRoute } from '../dapp-config-route.enum'
     import { closeDrawer } from '@desktop/auxiliary/drawer'
     import { selectedAccount } from '@core/account/stores'
-    import { DappVerification, RpcMethod } from '@auxiliary/wallet-connect/enums'
+    import { DappVerification } from '@auxiliary/wallet-connect/enums'
     import { deepEquals } from '@core/utils/object'
     import { ProposalTypes } from '@walletconnect/types'
     import { IPersistedNamespaces } from '@auxiliary/wallet-connect/interface'
@@ -45,15 +45,8 @@
     const requiredNamespaces = sessionProposal.params.requiredNamespaces
     const optionalNamespaces = sessionProposal.params.optionalNamespaces
 
-    const requiredNetworks = Object.values(requiredNamespaces)
-        .flatMap(({ chains }) => chains ?? [])
-        .filter(Boolean)
-    const optionalNetworks = Object.values(optionalNamespaces)
-        .flatMap(({ chains }) => chains ?? [])
-        .filter(Boolean)
-
-    const requiredMethods = Object.values(requiredNamespaces).flatMap(({ methods }) => methods) as RpcMethod[]
-    const optionalMethods = Object.values(optionalNamespaces).flatMap(({ methods }) => methods) as RpcMethod[]
+    const { requiredNetworks, optionalNetworks, requiredMethods, optionalMethods } =
+        getNetworksAndMethodsFromNamespaces(requiredNamespaces, optionalNamespaces)
 
     $: isButtonDisabled =
         loading ||
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/getNetworksAndMethodsFromNamespaces.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/getNetworksAndMethodsFromNamespaces.ts
new file mode 100644
index 0000000000..18e6245527
--- /dev/null
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/getNetworksAndMethodsFromNamespaces.ts
@@ -0,0 +1,42 @@
+import type { ProposalTypes } from '@walletconnect/types'
+import { RpcMethod } from '../enums'
+
+export function getNetworksAndMethodsFromNamespaces(
+    requiredNamespaces: ProposalTypes.RequiredNamespaces,
+    optionalNamespaces: ProposalTypes.OptionalNamespaces
+): {
+    requiredNetworks: string[]
+    optionalNetworks: string[]
+    requiredMethods: RpcMethod[]
+    optionalMethods: RpcMethod[]
+} {
+    const requiredNetworks: string[] = []
+    const optionalNetworks: string[] = []
+    const requiredMethods: RpcMethod[] = []
+    const optionalMethods: RpcMethod[] = []
+
+    for (const namespace of Object.values(requiredNamespaces ?? {})) {
+        if (namespace.chains) {
+            requiredNetworks.push(...namespace.chains)
+        }
+        if (namespace.methods) {
+            requiredMethods.push(...(namespace.methods as RpcMethod[]))
+        }
+    }
+
+    for (const namespace of Object.values(optionalNamespaces ?? {})) {
+        if (namespace.chains) {
+            requiredNetworks.push(...namespace.chains)
+        }
+        if (namespace.methods) {
+            requiredMethods.push(...(namespace.methods as RpcMethod[]))
+        }
+    }
+
+    return {
+        requiredNetworks,
+        optionalNetworks,
+        requiredMethods,
+        optionalMethods,
+    }
+}
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 9c010c3295..f116495549 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
@@ -1,5 +1,6 @@
 export * from './disconnectAllDapps'
 export * from './getBloomError'
+export * from './getNetworksAndMethodsFromNamespaces'
 export * from './getPermissionForMethod'
 export * from './normalizeSupportedNamespace'
 export * from './rejectConnectionRequest'

From 463f298c7b2d24cf57afd20913c2f747b6bc3973 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Fri, 31 May 2024 14:00:12 +0200
Subject: [PATCH 08/24] update connected dapps type

---
 .../wallet-connect/actions/approveSession.ts  | 13 +----
 .../actions/clearOldPairings.ts               |  4 +-
 .../wallet-connect/actions/disconnectDapp.ts  |  4 +-
 .../actions/removeAllDisconnectedDapps.ts     |  2 +-
 .../wallet-connect/actions/removeDapp.ts      |  4 +-
 .../actions/updateAccountForConnectedDapps.ts |  4 +-
 .../actions/updateAccountForDappSession.ts    | 16 ++++--
 .../interface/connected-dapp.interface.ts     | 18 ++++--
 .../interface/session.interface.ts            | 11 +---
 .../stores/connected-dapps.store.ts           | 56 +++++++++++++++----
 10 files changed, 83 insertions(+), 49 deletions(-)

diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSession.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSession.ts
index 5604b20683..b86935dd30 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSession.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSession.ts
@@ -5,18 +5,11 @@ import { Web3WalletTypes } from '@walletconnect/web3wallet'
 import { ISession } from '../interface/session.interface'
 import { getWalletClient, setConnectedDapps } from '../stores'
 import { updateAccountForDappSession } from './updateAccountForDappSession'
+import { ISupportedNamespace } from '../types'
 
 export async function approveSession(
     sessionProposal: Web3WalletTypes.SessionProposal,
-    supportedNamespaces: Record<
-        string,
-        {
-            chains: string[]
-            methods: string[]
-            events: string[]
-            accounts: string[]
-        }
-    >,
+    supportedNamespaces: Record<string, ISupportedNamespace>,
     account: IAccountState
 ): Promise<void> {
     const { id, params } = sessionProposal
@@ -32,7 +25,7 @@ export async function approveSession(
             namespaces: approvedNamespaces,
         })) as unknown as ISession
         setConnectedDapps()
-        await updateAccountForDappSession(session, account)
+        await updateAccountForDappSession(session.topic, session.namespaces, account)
     } catch (err) {
         handleError(err)
     }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/clearOldPairings.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/clearOldPairings.ts
index c14e5d270c..85984d7dd5 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/clearOldPairings.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/clearOldPairings.ts
@@ -10,7 +10,9 @@ export async function clearOldPairings(dappOrigin: string): Promise<void> {
     try {
         const duplicatedDapp = getConnectedDapps().filter((dapp) => dapp.metadata?.url === dappOrigin)
         for (const dapp of duplicatedDapp) {
-            await client.core.pairing.disconnect({ topic: dapp.topic })
+            if (dapp.pairingTopic) {
+                await client.core.pairing.disconnect({ topic: dapp.pairingTopic })
+            }
         }
         setConnectedDapps()
     } catch (err) {
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/disconnectDapp.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/disconnectDapp.ts
index f8c1c9833e..da2b5e15d7 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/disconnectDapp.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/disconnectDapp.ts
@@ -10,9 +10,9 @@ export async function disconnectDapp(dapp: IConnectedDapp): Promise<void> {
     }
 
     try {
-        if (dapp.session) {
+        if (dapp.sessionTopic) {
             await client.disconnectSession({
-                topic: dapp.session.topic,
+                topic: dapp.sessionTopic,
                 reason: getSdkError('USER_DISCONNECTED'),
             })
         }
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 037f7330d8..a340edb725 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/removeAllDisconnectedDapps.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/removeAllDisconnectedDapps.ts
@@ -8,7 +8,7 @@ export function removeAllDisconnectedDapps(): void {
     }
 
     const connectedDappsForProfile = get(connectedDapps).filter(
-        (dapp) => !!getPersistedDapp(dapp.metadata?.url ?? '') && !dapp.session
+        (dapp) => !!getPersistedDapp(dapp.metadata?.url ?? '') && !dapp.sessionTopic
     )
 
     for (const dapp of connectedDappsForProfile) {
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 fa3fe239fc..d4b2802b47 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/removeDapp.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/removeDapp.ts
@@ -10,9 +10,9 @@ export async function removeDapp(dapp: IConnectedDapp): Promise<void> {
     }
 
     try {
-        if (dapp.session) {
+        if (dapp.sessionTopic) {
             await client.disconnectSession({
-                topic: dapp.session.topic,
+                topic: dapp.sessionTopic,
                 reason: getSdkError('USER_DISCONNECTED'),
             })
         }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/updateAccountForConnectedDapps.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/updateAccountForConnectedDapps.ts
index b4bdc49b7c..b96aa5d5ef 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/updateAccountForConnectedDapps.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/updateAccountForConnectedDapps.ts
@@ -6,8 +6,8 @@ import { updateAccountForDappSession } from './updateAccountForDappSession'
 export async function updateAccountForConnectedDapps(account: IAccountState): Promise<void> {
     const dapps = get(connectedDapps)
     for (const dapp of dapps) {
-        if (dapp.session) {
-            await updateAccountForDappSession(dapp.session, account)
+        if (dapp.sessionTopic && dapp.namespaces) {
+            await updateAccountForDappSession(dapp.sessionTopic, dapp.namespaces, account)
         }
     }
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/updateAccountForDappSession.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/updateAccountForDappSession.ts
index c1fd4a3f58..4a91b82996 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/updateAccountForDappSession.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/updateAccountForDappSession.ts
@@ -3,21 +3,25 @@ import { get } from 'svelte/store'
 import { WalletConnectEvents } from '../enums'
 import { walletClient } from '../stores'
 import { NetworkId } from '@core/network/types'
-import { ISession } from '../interface/session.interface'
+import { ISupportedNamespace } from '../types'
 
-export async function updateAccountForDappSession(dappSession: ISession, account: IAccountState): Promise<void> {
+export async function updateAccountForDappSession(
+    sessionTopic: string,
+    namespaces: Record<string, ISupportedNamespace>,
+    account: IAccountState
+): Promise<void> {
     const walletConnectClient = get(walletClient)
-    if (!walletConnectClient || !dappSession) {
+    if (!walletConnectClient) {
         return
     }
 
-    const protocols = Object.keys(dappSession.namespaces)
+    const protocols = Object.keys(namespaces ?? {})
     for (const protocol of protocols) {
-        for (const chainId of dappSession.namespaces[protocol]?.chains ?? []) {
+        for (const chainId of namespaces[protocol]?.chains ?? []) {
             const address = getAddressFromAccountForNetwork(account, chainId as NetworkId)
 
             await walletConnectClient.emitSessionEvent({
-                topic: dappSession.topic,
+                topic: sessionTopic,
                 event: {
                     name: WalletConnectEvents.AccountsChanged,
                     data: [address],
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/interface/connected-dapp.interface.ts b/packages/shared/src/lib/auxiliary/wallet-connect/interface/connected-dapp.interface.ts
index 166c855a28..b6ffd41cb5 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/interface/connected-dapp.interface.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/interface/connected-dapp.interface.ts
@@ -1,8 +1,16 @@
+import { ISupportedNamespace } from '../types'
 import { IDappMetadata } from './dapp-metadata.interface'
-import { IPairing } from './pairing.interface'
-import { ISession } from './session.interface'
+import type { ProposalTypes } from '@walletconnect/types'
 
-export interface IConnectedDapp extends Omit<IPairing, 'peerMetadata'> {
-    metadata?: IDappMetadata
-    session?: ISession
+export interface IConnectedDapp {
+    metadata: IDappMetadata
+
+    // session
+    sessionTopic?: string
+    namespaces?: Record<string, ISupportedNamespace>
+    requiredNamespaces?: ProposalTypes.RequiredNamespaces
+    optionalNamespaces?: ProposalTypes.OptionalNamespaces
+
+    // pairing {
+    pairingTopic?: string
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/interface/session.interface.ts b/packages/shared/src/lib/auxiliary/wallet-connect/interface/session.interface.ts
index b274df967f..9b2356936b 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/interface/session.interface.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/interface/session.interface.ts
@@ -1,4 +1,5 @@
 import type { ProposalTypes, RelayerTypes, SignClientTypes } from '@walletconnect/types'
+import { ISupportedNamespace } from '../types'
 
 export interface ISession {
     topic: string
@@ -7,15 +8,7 @@ export interface ISession {
     expiry: number
     acknowledged: boolean
     controller: string
-    namespaces: Record<
-        string,
-        {
-            chains?: string[]
-            accounts: string[]
-            methods: string[]
-            events: string[]
-        }
-    >
+    namespaces: Record<string, ISupportedNamespace>
     requiredNamespaces: ProposalTypes.RequiredNamespaces
     optionalNamespaces: ProposalTypes.OptionalNamespaces
     sessionProperties?: ProposalTypes.SessionProperties
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/stores/connected-dapps.store.ts b/packages/shared/src/lib/auxiliary/wallet-connect/stores/connected-dapps.store.ts
index 43d54517f3..4a4dd78459 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/stores/connected-dapps.store.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/stores/connected-dapps.store.ts
@@ -1,6 +1,8 @@
-import { Writable, get, writable } from 'svelte/store'
+import { type Writable, get, writable } from 'svelte/store'
 import { getWalletClient } from './wallet-client.store'
-import { IConnectedDapp } from '../interface/connected-dapp.interface'
+import type { IConnectedDapp } from '../interface/connected-dapp.interface'
+import type { ISupportedNamespace } from '../types'
+import type { SessionTypes } from '@walletconnect/types'
 
 export const connectedDapps: Writable<IConnectedDapp[]> = writable([])
 
@@ -8,14 +10,32 @@ export function setConnectedDapps(): void {
     const pairings = getWalletClient()?.core.pairing.getPairings() ?? []
     const sessions = getWalletClient()?.getActiveSessions() ?? {}
 
-    const dapps: IConnectedDapp[] = pairings.map((pairing) => ({
-        topic: pairing.topic,
-        expiry: pairing.expiry,
-        relay: pairing.relay,
-        active: pairing.active,
-        metadata: pairing.peerMetadata,
-        session: Object.values(sessions).find((session) => session.pairingTopic === pairing.topic),
-    }))
+    const dapps: IConnectedDapp[] = []
+    for (const session of Object.values(sessions)) {
+        dapps.push({
+            sessionTopic: session.topic,
+            pairingTopic: session.pairingTopic,
+            metadata: session.peer.metadata,
+            namespaces: normalizeSessionNamespace(session.namespaces),
+            requiredNamespaces: session.requiredNamespaces,
+            optionalNamespaces: session.optionalNamespaces,
+        })
+    }
+    for (const pairing of pairings) {
+        if (!pairing.peerMetadata) {
+            continue
+        }
+
+        const existingDapp = dapps.find((dapp) => dapp.pairingTopic === pairing.topic)
+        if (existingDapp) {
+            existingDapp.pairingTopic = pairing.topic
+        } else {
+            dapps.push({
+                pairingTopic: pairing.topic,
+                metadata: pairing.peerMetadata,
+            })
+        }
+    }
     connectedDapps.set(dapps)
 }
 
@@ -28,5 +48,19 @@ export function getConnectedDappByOrigin(origin: string): IConnectedDapp | undef
 }
 
 export function getConnectedDappBySessionTopic(sessionTopic: string): IConnectedDapp | undefined {
-    return get(connectedDapps).find((dapp) => dapp.session?.topic === sessionTopic)
+    return get(connectedDapps).find((dapp) => dapp.sessionTopic === sessionTopic)
+}
+
+function normalizeSessionNamespace(sessionNamespace: SessionTypes.Namespaces): Record<string, ISupportedNamespace> {
+    const normalizedRecord: Record<string, ISupportedNamespace> = {}
+
+    for (const key in sessionNamespace) {
+        const session = sessionNamespace[key]
+        normalizedRecord[key] = {
+            ...session,
+            chains: session.chains || [],
+        }
+    }
+
+    return normalizedRecord
 }

From 7cf778b55abb161d36cf2ee4247a10e919f64de2 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Fri, 31 May 2024 14:00:12 +0200
Subject: [PATCH 09/24] update ui components

---
 .../dapp-config/views/ConnectedDappsDrawer.svelte   | 13 ++++++++-----
 .../dapp-config/views/DappDetailsDrawer.svelte      |  4 ++--
 .../wallet-connect/stores/selected-dapp.store.ts    |  4 ++++
 3 files changed, 14 insertions(+), 7 deletions(-)

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 d2e4df094b..e6850d3293 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 { connectedDapps, persistedDapps, 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'
@@ -30,15 +35,13 @@
         (dapp) => !!$persistedDapps[$activeProfileId as string]?.[dapp.metadata?.url ?? '']
     )
     $: displayedDapps = connectedDappsForProfile.filter(
-        (dapp) => (selectedIndex === 0 && !!dapp.session) || (selectedIndex === 1 && !dapp.session)
+        (dapp) => (selectedIndex === 0 && !!dapp.sessionTopic) || (selectedIndex === 1 && !dapp.sessionTopic)
     )
 
     function onDappCardClick(connectedDapp: IConnectedDapp): void {
         setSelectedDapp(connectedDapp)
         updateDrawerProps({
-            onClose: () => {
-                setSelectedDapp(undefined)
-            },
+            onClose: () => clearSelectedDapp(),
         })
         drawerRouter.goTo(DappConfigRoute.DappDetails)
     }
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 0aa96ae125..cca57c88c5 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte
@@ -42,8 +42,8 @@
                 {/if}
                 {#if persistedDapp?.namespaces.supported}
                     <ConnectionSummary
-                        requiredNamespaces={dapp.session?.requiredNamespaces}
-                        editable={!!dapp.session}
+                        requiredNamespaces={dapp.requiredNamespaces}
+                        editable={!!dapp.sessionTopic}
                         persistedSupportedNamespaces={persistedDapp?.namespaces.supported}
                         {drawerRouter}
                     />
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/stores/selected-dapp.store.ts b/packages/shared/src/lib/auxiliary/wallet-connect/stores/selected-dapp.store.ts
index 8065c57842..e1be4820b7 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/stores/selected-dapp.store.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/stores/selected-dapp.store.ts
@@ -6,3 +6,7 @@ export const selectedDapp: Writable<IConnectedDapp | undefined> = writable(undef
 export function setSelectedDapp(dapp: IConnectedDapp): void {
     selectedDapp.set(dapp)
 }
+
+export function clearSelectedDapp(): void {
+    selectedDapp.set(undefined)
+}

From e2a16b0923c5ecce5fa5727a880bd3a571cabc9e Mon Sep 17 00:00:00 2001
From: Nicole O'Brien <nicole@bloomwallet.io>
Date: Fri, 31 May 2024 16:20:44 +0100
Subject: [PATCH 10/24] pr review comments

---
 .../components/EditSelectionDrawer.svelte     | 48 ++++++++++---------
 .../views/ConfirmConnectionDrawer.svelte      | 10 ++--
 .../views/ConnectionRequestDrawer.svelte      | 12 ++---
 .../actions/approveSessionAuthenticate.ts     |  4 +-
 .../wallet-connect/actions/connectToDapp.ts   |  4 +-
 .../handlers/onSessionAuthenticate.handler.ts | 14 ++++--
 .../handlers/onSessionProposal.handler.ts     |  6 +--
 .../interface/connected-dapp.interface.ts     |  2 +-
 .../stores/connection-request.store.ts        |  8 ++--
 .../utils/rejectConnectionRequest.ts          |  6 +--
 10 files changed, 61 insertions(+), 53 deletions(-)

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 05ac7e6a6b..610ca2f3ac 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/EditSelectionDrawer.svelte
@@ -6,9 +6,9 @@
     import {
         updateSupportedDappNamespacesForDapp,
         selectedDapp,
-        connectionRequest,
+        sessionInitiationRequest,
         getPersistedDapp,
-        ConnectionRequest,
+        SessionInitiationRequest,
     } from '@auxiliary/wallet-connect/stores'
     import { onMount } from 'svelte'
     import { buildSupportedNamespacesFromSelections } from '@auxiliary/wallet-connect/actions'
@@ -22,22 +22,22 @@
     export let titleLocale: string
     export let disableContinue: boolean
 
-    const dappMetadata = getDappMetadata($selectedDapp, $connectionRequest)
-    const { requiredMethods, optionalMethods } = getMethodsForNamespaces($selectedDapp, $connectionRequest)
-    const { requiredNetworks, optionalNetworks } = getNetworksForNamespaces($selectedDapp, $connectionRequest)
+    const dappMetadata = getDappMetadata($selectedDapp, $sessionInitiationRequest)
+    const { requiredMethods, optionalMethods } = getMethodsForNamespaces($selectedDapp, $sessionInitiationRequest)
+    const { requiredNetworks, optionalNetworks } = getNetworksForNamespaces($selectedDapp, $sessionInitiationRequest)
 
     $: persistedDapp = dappMetadata ? getPersistedDapp(dappMetadata.url) : undefined
 
     function getDappMetadata(
         selectedDapp: IConnectedDapp | undefined,
-        connectionRequest: ConnectionRequest | undefined
+        sessionInitiationRequest: SessionInitiationRequest | undefined
     ): IDappMetadata | undefined {
         if (selectedDapp) {
             return selectedDapp?.metadata
-        } else if (connectionRequest?.type === 'session_proposal') {
-            return connectionRequest?.payload.params.proposer.metadata as IDappMetadata
-        } else if (connectionRequest?.type === 'session_authenticate') {
-            return connectionRequest?.payload.params.requester.metadata as IDappMetadata
+        } else if (sessionInitiationRequest?.type === 'session_proposal') {
+            return sessionInitiationRequest?.payload.params.proposer.metadata as IDappMetadata
+        } else if (sessionInitiationRequest?.type === 'session_authenticate') {
+            return sessionInitiationRequest?.payload.params.requester.metadata as IDappMetadata
         } else {
             return undefined
         }
@@ -45,7 +45,7 @@
 
     function getMethodsForNamespaces(
         selectedDapp: IConnectedDapp | undefined,
-        connectionRequest: ConnectionRequest | undefined
+        sessionInitiationRequest: SessionInitiationRequest | undefined
     ): { requiredMethods: string[]; optionalMethods: string[] } {
         if (selectedDapp) {
             const { requiredNamespaces, optionalNamespaces } = selectedDapp.session ?? {}
@@ -55,14 +55,14 @@
                 optionalNamespaces ?? {}
             )
             return { requiredMethods, optionalMethods }
-        } else if (connectionRequest?.type === 'session_proposal') {
-            const { requiredNamespaces, optionalNamespaces } = connectionRequest.payload?.params ?? {}
+        } else if (sessionInitiationRequest?.type === 'session_proposal') {
+            const { requiredNamespaces, optionalNamespaces } = sessionInitiationRequest.payload?.params ?? {}
             const { requiredMethods, optionalMethods } = getNetworksAndMethodsFromNamespaces(
                 requiredNamespaces ?? {},
                 optionalNamespaces ?? {}
             )
             return { requiredMethods, optionalMethods }
-        } else if (connectionRequest?.type === 'session_authenticate') {
+        } else if (sessionInitiationRequest?.type === 'session_authenticate') {
             return { requiredMethods: [], optionalMethods: ALL_EVM_METHODS }
         } else {
             return { requiredMethods: [], optionalMethods: [] }
@@ -71,7 +71,7 @@
 
     function getNetworksForNamespaces(
         selectedDapp: IConnectedDapp | undefined,
-        connectionRequest: ConnectionRequest | undefined
+        sessionInitiationRequest: SessionInitiationRequest | undefined
     ): { requiredNetworks: string[]; optionalNetworks: string[] } {
         if (selectedDapp) {
             const { requiredNamespaces, optionalNamespaces } = selectedDapp.session ?? {}
@@ -80,14 +80,14 @@
                 optionalNamespaces ?? {}
             )
             return { requiredNetworks, optionalNetworks }
-        } else if (connectionRequest?.type === 'session_proposal') {
-            const { requiredNamespaces, optionalNamespaces } = connectionRequest.payload?.params ?? {}
+        } else if (sessionInitiationRequest?.type === 'session_proposal') {
+            const { requiredNamespaces, optionalNamespaces } = sessionInitiationRequest.payload?.params ?? {}
             const { requiredNetworks, optionalNetworks } = getNetworksAndMethodsFromNamespaces(
                 requiredNamespaces ?? {},
                 optionalNamespaces ?? {}
             )
             return { requiredNetworks, optionalNetworks }
-        } else if (connectionRequest?.type === 'session_authenticate') {
+        } else if (sessionInitiationRequest?.type === 'session_authenticate') {
             // TODO: Implement this
             return { requiredNetworks: [], optionalNetworks: [] }
         } else {
@@ -97,14 +97,18 @@
 
     function onConfirmClick(): void {
         // TODO: Implement this
-        if ($connectionRequest?.type === 'session_authenticate') {
+        if ($sessionInitiationRequest?.type === 'session_authenticate') {
             return
         }
 
         const requiredNamespaces =
-            $selectedDapp?.session?.requiredNamespaces ?? $connectionRequest?.payload?.params.requiredNamespaces ?? {}
+            $selectedDapp?.session?.requiredNamespaces ??
+            $sessionInitiationRequest?.payload?.params.requiredNamespaces ??
+            {}
         const optionalNamespaces =
-            $selectedDapp?.session?.optionalNamespaces ?? $connectionRequest?.payload?.params.optionalNamespaces ?? {}
+            $selectedDapp?.session?.optionalNamespaces ??
+            $sessionInitiationRequest?.payload?.params.optionalNamespaces ??
+            {}
 
         const updatedNamespace = buildSupportedNamespacesFromSelections(
             selections,
@@ -126,7 +130,7 @@
     }
 
     onMount(() => {
-        if (!$selectedDapp && !$connectionRequest) {
+        if (!$selectedDapp && !$sessionInitiationRequest) {
             drawerRouter.previous()
         }
     })
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 892f360e00..60c15adf6b 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConfirmConnectionDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConfirmConnectionDrawer.svelte
@@ -5,7 +5,7 @@
     import { DrawerTemplate } from '@components'
     import OneClickAuthFlow from './OneClickAuthFlow.svelte'
     import SessionProposalFlow from './SessionProposalFlow.svelte'
-    import { connectionRequest } from '@auxiliary/wallet-connect/stores'
+    import { sessionInitiationRequest } from '@auxiliary/wallet-connect/stores'
     import { closeDrawer } from '@desktop/auxiliary/drawer'
 
     export let drawerRouter: Router<unknown>
@@ -13,10 +13,10 @@
     const localeKey = 'views.dashboard.drawers.dapps.confirmConnection'
 </script>
 
-{#if $connectionRequest?.type === 'session_proposal'}
-    <SessionProposalFlow sessionProposal={$connectionRequest.payload} {drawerRouter} />
-{:else if $connectionRequest?.type === 'session_authenticate'}
-    <OneClickAuthFlow sessionProposal={$connectionRequest.payload} {drawerRouter} />
+{#if $sessionInitiationRequest?.type === 'session_proposal'}
+    <SessionProposalFlow sessionProposal={$sessionInitiationRequest.payload} {drawerRouter} />
+{:else if $sessionInitiationRequest?.type === 'session_authenticate'}
+    <OneClickAuthFlow sessionProposal={$sessionInitiationRequest.payload} {drawerRouter} />
 {:else}
     <DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter}>
         <div class="w-full h-full flex items-center justify-center">
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
index cab03024d9..8230eed6b5 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
@@ -3,7 +3,7 @@
     import { localize } from '@core/i18n'
     import { Router } from '@core/router'
     import { DrawerTemplate } from '@components'
-    import { connectionRequest } from '@auxiliary/wallet-connect/stores'
+    import { sessionInitiationRequest } from '@auxiliary/wallet-connect/stores'
     import { closeDrawer } from '@desktop/auxiliary/drawer'
     import ConnectionRequest from './ConnectionRequest.svelte'
     import { getNetworksAndMethodsFromNamespaces, rejectConnectionRequest } from '@auxiliary/wallet-connect/utils'
@@ -18,7 +18,7 @@
 
     let timeout: ReturnType<typeof setTimeout> | undefined
     $: {
-        if ($connectionRequest) {
+        if ($sessionInitiationRequest) {
             clearTimeout(timeout)
         } else {
             timeout = setTimeout(() => {
@@ -83,9 +83,9 @@
     })
 </script>
 
-{#if $connectionRequest?.type === 'session_proposal'}
+{#if $sessionInitiationRequest?.type === 'session_proposal'}
     {@const { dappMetadata, verifiedState, requiredNetworks, optionalNetworks, requiredMethods } =
-        getConnectionRequestDataFromSessionProposal($connectionRequest.payload)}
+        getConnectionRequestDataFromSessionProposal($sessionInitiationRequest.payload)}
     <ConnectionRequest
         {dappMetadata}
         {verifiedState}
@@ -94,9 +94,9 @@
         {requiredMethods}
         {drawerRouter}
     />
-{:else if $connectionRequest?.type === 'session_authenticate'}
+{:else if $sessionInitiationRequest?.type === 'session_authenticate'}
     {@const { dappMetadata, verifiedState, requiredNetworks, optionalNetworks, requiredMethods } =
-        getConnectionRequestDataFromSessionAuthenticate($connectionRequest.payload)}
+        getConnectionRequestDataFromSessionAuthenticate($sessionInitiationRequest.payload)}
     <ConnectionRequest
         {dappMetadata}
         {verifiedState}
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts
index 3e789aa679..d8339e05ee 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts
@@ -1,5 +1,5 @@
 import { getAddressFromAccountForNetwork } from '@core/account'
-import { clearConnectionRequest, getWalletClient, persistDapp } from '../stores'
+import { clearSessionInitiationRequest, getWalletClient, persistDapp } from '../stores'
 import { clearOldPairings } from './clearOldPairings'
 import { Web3WalletTypes } from '@walletconnect/web3wallet'
 import { DappVerification } from '../enums'
@@ -68,5 +68,5 @@ export async function approveSessionAuthenticate(
         required: session.requiredNamespaces,
         optional: session.optionalNamespaces,
     })
-    clearConnectionRequest()
+    clearSessionInitiationRequest()
 }
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 6ec190a495..939a114c72 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/connectToDapp.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/connectToDapp.ts
@@ -1,5 +1,5 @@
 import { IAccountState } from '@core/account'
-import { clearConnectionRequest, persistDapp } from '../stores'
+import { clearSessionInitiationRequest, persistDapp } from '../stores'
 import { approveSession } from './approveSession'
 import { buildSupportedNamespacesFromSelections } from './buildSupportedNamespaceFromSelections'
 import { clearOldPairings } from './clearOldPairings'
@@ -33,5 +33,5 @@ export async function connectToDapp(
         verificationState.isScam ? DappVerification.Scam : (verificationState.validation as DappVerification),
         { supported: supportedNamespaces, required: requiredNamespaces, optional: optionalNamespaces }
     )
-    clearConnectionRequest()
+    clearSessionInitiationRequest()
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionAuthenticate.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionAuthenticate.handler.ts
index 8f42a570ec..fe2ff72bc0 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionAuthenticate.handler.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionAuthenticate.handler.ts
@@ -1,12 +1,16 @@
+import { getSdkError } from '@walletconnect/utils'
 import { Web3WalletTypes } from '@walletconnect/web3wallet'
-import { connectionRequest } from '../stores'
 import { get } from 'svelte/store'
-import { rejectConnectionRequest } from '../utils'
+import { getWalletClient, sessionInitiationRequest } from '../stores'
 
 export function onSessionAuthenticate(event: Web3WalletTypes.SessionAuthenticate): void {
-    if (get(connectionRequest)) {
-        void rejectConnectionRequest()
+    if (get(sessionInitiationRequest)) {
+        // TODO: should we reject the existing one and set the new one, while resetting the flow for the user?
+        void getWalletClient()?.rejectSessionAuthenticate({
+            id: event.id,
+            reason: getSdkError('USER_REJECTED'),
+        })
     } else {
-        connectionRequest.set({ type: 'session_authenticate', payload: event })
+        sessionInitiationRequest.set({ type: 'session_authenticate', payload: event })
     }
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionProposal.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionProposal.handler.ts
index 109488c5b6..02591509ba 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionProposal.handler.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionProposal.handler.ts
@@ -1,12 +1,12 @@
 import { Web3WalletTypes } from '@walletconnect/web3wallet'
-import { connectionRequest } from '../stores'
+import { sessionInitiationRequest } from '../stores'
 import { get } from 'svelte/store'
 import { rejectConnectionRequest } from '../utils'
 
 export function onSessionProposal(_sessionProposal: Web3WalletTypes.SessionProposal): void {
-    if (get(connectionRequest)) {
+    if (get(sessionInitiationRequest)) {
         void rejectConnectionRequest()
     } else {
-        connectionRequest.set({ type: 'session_proposal', payload: _sessionProposal })
+        sessionInitiationRequest.set({ type: 'session_proposal', payload: _sessionProposal })
     }
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/interface/connected-dapp.interface.ts b/packages/shared/src/lib/auxiliary/wallet-connect/interface/connected-dapp.interface.ts
index b6ffd41cb5..aa513b807e 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/interface/connected-dapp.interface.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/interface/connected-dapp.interface.ts
@@ -11,6 +11,6 @@ export interface IConnectedDapp {
     requiredNamespaces?: ProposalTypes.RequiredNamespaces
     optionalNamespaces?: ProposalTypes.OptionalNamespaces
 
-    // pairing {
+    // pairing
     pairingTopic?: string
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/stores/connection-request.store.ts b/packages/shared/src/lib/auxiliary/wallet-connect/stores/connection-request.store.ts
index 1277d5db86..5c7f831940 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/stores/connection-request.store.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/stores/connection-request.store.ts
@@ -1,7 +1,7 @@
 import { Writable, writable } from 'svelte/store'
 import { Web3WalletTypes } from '@walletconnect/web3wallet'
 
-export type ConnectionRequest =
+export type SessionInitiationRequest =
     | {
           type: 'session_proposal'
           payload: Web3WalletTypes.SessionProposal
@@ -11,8 +11,8 @@ export type ConnectionRequest =
           payload: Web3WalletTypes.SessionAuthenticate
       }
 
-export const connectionRequest: Writable<ConnectionRequest | undefined> = writable(undefined)
+export const sessionInitiationRequest: Writable<SessionInitiationRequest | undefined> = writable(undefined)
 
-export function clearConnectionRequest(): void {
-    connectionRequest.set(undefined)
+export function clearSessionInitiationRequest(): void {
+    sessionInitiationRequest.set(undefined)
 }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectConnectionRequest.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectConnectionRequest.ts
index 9341eef637..849555a363 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectConnectionRequest.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectConnectionRequest.ts
@@ -1,15 +1,15 @@
 import { getSdkError } from '@walletconnect/utils'
-import { getWalletClient, connectionRequest } from '../stores'
+import { getWalletClient, sessionInitiationRequest } from '../stores'
 import { get } from 'svelte/store'
 import { handleError } from '@core/error/handlers'
 
 export async function rejectConnectionRequest(): Promise<void> {
-    const _connectionRequest = get(connectionRequest)
+    const _connectionRequest = get(sessionInitiationRequest)
     if (!_connectionRequest) {
         return
     }
 
-    connectionRequest.set(undefined)
+    sessionInitiationRequest.set(undefined)
     try {
         if (_connectionRequest.type === 'session_proposal') {
             await getWalletClient()?.rejectSession({

From 7c91d6a49aeb1bef5851198108f7aa54a8c1566e Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Thu, 20 Jun 2024 13:51:36 +0200
Subject: [PATCH 11/24] Merge conflicts

---
 .../views/ConnectionRequest.svelte            |  27 +-
 .../views/SessionProposalFlow.svelte          | 311 ++++++++++--------
 2 files changed, 196 insertions(+), 142 deletions(-)

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
index 0942ba487b..f98eaea870 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
@@ -5,12 +5,15 @@
     import { Router } from '@core/router'
     import { DrawerTemplate } from '@components'
     import { closeDrawer } from '@desktop/auxiliary/drawer'
-    import { SecurityWarning, UnsupportedDappHint } from '../components'
+    import { ConnectionRequestExpirationAlert, SecurityWarning, UnsupportedDappHint } from '../components'
     import { getAllNetworkIds } from '@core/network'
     import { ALL_SUPPORTED_METHODS } from '@auxiliary/wallet-connect/constants'
     import { rejectConnectionRequest } from '@auxiliary/wallet-connect/utils'
     import { DappVerification, RpcMethod } from '@auxiliary/wallet-connect/enums'
     import { Web3WalletTypes } from '@walletconnect/web3wallet'
+    import { onMount } from 'svelte'
+    import { MILLISECONDS_PER_SECOND } from '@core/utils'
+    import { time } from '@core/app/stores'
 
     export let drawerRouter: Router<unknown>
     export let dappMetadata: Web3WalletTypes.Metadata
@@ -18,11 +21,14 @@
     export let requiredNetworks: string[]
     export let optionalNetworks: string[]
     export let requiredMethods: RpcMethod[]
+    export let expiryTimestamp: number | undefined
 
     const localeKey = 'views.dashboard.drawers.dapps.connectionRequest'
     let acceptedInsecureConnection = false
     let flashingCheckbox = false
 
+    $: hasRequestExpired = expiryTimestamp ? expiryTimestamp - $time.getTime() / MILLISECONDS_PER_SECOND <= 0 : false
+
     const fulfillsRequirements = doesFulfillsRequirements()
     function doesFulfillsRequirements(): boolean {
         const supportedNetworksByDapp = [...requiredNetworks, ...optionalNetworks]
@@ -71,11 +77,24 @@
 
         drawerRouter.next()
     }
+
+    onMount(() => {
+        const fulfillsRequirements =
+            doesFulfillNetworkRequirements(requiredNetworks, optionalNetworks) &&
+            doesFulfillMethodRequirements(requiredMethods)
+
+        if (fulfillsRequirements && verifiedState === DappVerification.Valid) {
+            drawerRouter.next()
+        }
+    })
 </script>
 
-<DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter} onBack={rejectConnectionRequest}>
+<DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter} showBack={false}>
     <div class="w-full h-full flex flex-col justify-between">
-        <DappInfo metadata={dappMetadata} {verifiedState} />
+        <div>
+            <DappInfo metadata={dappMetadata} {verifiedState} />
+            <ConnectionRequestExpirationAlert {expiryTimestamp} />
+        </div>
         <div class="flex-grow overflow-hidden">
             <div class="h-full overflow-scroll flex flex-col gap-5 p-6">
                 <Table
@@ -112,7 +131,7 @@
             width="full"
             variant="outlined"
             on:click={onRejectClick}
-            text={localize(`actions.${fulfillsRequirements ? 'reject' : 'cancel'}`)}
+            text={localize(`actions.${fulfillsRequirements && !hasRequestExpired ? 'reject' : 'cancel'}`)}
         />
         {#if fulfillsRequirements && verifiedState !== DappVerification.Scam}
             <Button width="full" on:click={onContinueClick} text={localize('actions.continue')} />
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
index d6f92ce2df..13c99e4d7d 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
@@ -1,22 +1,35 @@
 <script lang="ts">
-    import { Button, SidebarToast, Steps } from '@bloomwalletio/ui'
-    import { DappInfo } from '@ui'
-    import { localize } from '@core/i18n'
-    import { Router } from '@core/router'
-    import { DrawerTemplate } from '@components'
-    import { connectToDapp } from '@auxiliary/wallet-connect/actions'
+    import { buildSupportedNamespacesFromSelections, connectToDapp } from '@auxiliary/wallet-connect/actions'
+    import { ALL_SUPPORTED_METHODS, SUPPORTED_EVENTS } from '@auxiliary/wallet-connect/constants'
+    import { DappVerification } from '@auxiliary/wallet-connect/enums'
     import { getPersistedDappNamespacesForDapp } from '@auxiliary/wallet-connect/stores'
-    import { getNetworksAndMethodsFromNamespaces, rejectConnectionRequest } from '@auxiliary/wallet-connect/utils'
-    import { AccountSelection, ConnectionSummary, NetworkSelection, PermissionSelection } from '../components'
-    import { handleError } from '@core/error/handlers'
+    import { ISupportedNamespace, SupportedNamespaces } from '@auxiliary/wallet-connect/types'
+    import {
+        getCaip10AddressForAccount,
+        getNetworksAndMethodsFromNamespaces,
+        rejectConnectionRequest,
+    } from '@auxiliary/wallet-connect/utils'
+    import { Button } from '@bloomwalletio/ui'
+    import { DrawerTemplate } from '@components'
     import { IAccountState } from '@core/account'
-    import { DappConfigRoute } from '../dapp-config-route.enum'
-    import { closeDrawer } from '@desktop/auxiliary/drawer'
     import { selectedAccount } from '@core/account/stores'
-    import { DappVerification } from '@auxiliary/wallet-connect/enums'
-    import { deepEquals } from '@core/utils/object'
-    import { ProposalTypes } from '@walletconnect/types'
-    import { IPersistedNamespaces } from '@auxiliary/wallet-connect/interface'
+    import { time } from '@core/app/stores'
+    import { handleError } from '@core/error/handlers'
+    import { localize } from '@core/i18n'
+    import { getEvmNetworks } from '@core/network'
+    import { activeAccounts } from '@core/profile/stores'
+    import { Router } from '@core/router'
+    import { MILLISECONDS_PER_SECOND } from '@core/utils'
+    import { closeDrawer } from '@desktop/auxiliary/drawer'
+    import { DappInfo } from '@ui'
+    import {
+        AccountSelection,
+        ConnectionSummary,
+        NetworkSelection,
+        PermissionSelection,
+        ConnectionRequestExpirationAlert,
+    } from '../components'
+    import { DappConfigRoute } from '../dapp-config-route.enum'
     import { Web3WalletTypes } from '@walletconnect/web3wallet'
 
     export let drawerRouter: Router<unknown>
@@ -24,93 +37,108 @@
 
     let loading = false
 
-    const localeKey = 'views.dashboard.drawers.dapps.confirmConnection'
-    let currentStep = 0
-    const steps = [
-        localize(`${localeKey}.permissions.step`),
-        localize(`${localeKey}.networks.step`),
-        localize(`${localeKey}.accounts.step`),
-    ]
+    enum Selection {
+        Summary = 'summary',
+        Accounts = 'accounts',
+        Permissions = 'permissions',
+        Networks = 'networks',
+    }
 
-    let checkedAccounts: IAccountState[] = []
-    let checkedNetworks: string[] = []
-    let checkedMethods: string[] = []
+    let activeSelection: Selection = Selection.Summary
+    const localeKey = 'views.dashboard.drawers.dapps.confirmConnection'
 
-    const verifiedState = sessionProposal.verifyContext.verified.isScam
+    $: verifiedState = sessionProposal?.verifyContext.verified.isScam
         ? DappVerification.Scam
         : (sessionProposal.verifyContext.verified.validation as DappVerification)
 
-    const dappMetadata = sessionProposal.params.proposer.metadata
-    const persistedNamespaces = getPersistedDappNamespacesForDapp(dappMetadata.url)
+    $: hasRequestExpired = sessionProposal.params.expiryTimestamp
+        ? sessionProposal.params.expiryTimestamp - $time.getTime() / MILLISECONDS_PER_SECOND <= 0
+        : false
+
+    let checkedAccounts: IAccountState[] = []
+    let checkedNetworks: string[] = []
+    let checkedMethods: string[] = []
     const requiredNamespaces = sessionProposal.params.requiredNamespaces
     const optionalNamespaces = sessionProposal.params.optionalNamespaces
-
     const { requiredNetworks, optionalNetworks, requiredMethods, optionalMethods } =
         getNetworksAndMethodsFromNamespaces(requiredNamespaces, optionalNamespaces)
 
-    $: isButtonDisabled =
-        loading ||
-        (!persistedNamespaces &&
-            currentStep === 0 &&
-            checkedMethods.length === 0 &&
-            [...requiredMethods, ...optionalMethods].length > 0) ||
-        (currentStep === 1 && checkedNetworks.length === 0) ||
-        (currentStep === 2 && checkedAccounts.length === 0)
-
-    $: isPreferenceSelectionRequired = preferenceSelectionRequired(
-        sessionProposal.params.requiredNamespaces,
-        sessionProposal.params.optionalNamespaces,
-        persistedNamespaces
-    )
-    function preferenceSelectionRequired(
-        requiredNamespaces: ProposalTypes.RequiredNamespaces,
-        optionalNamespaces: ProposalTypes.OptionalNamespaces,
-        _persistedNamespaces?: IPersistedNamespaces
-    ): boolean {
-        if (!_persistedNamespaces || !sessionProposal) {
-            return true
+    let supportedNamespaces = initSupportedNamespaces()
+    function initSupportedNamespaces(): SupportedNamespaces {
+        if (!sessionProposal) {
+            return {}
         }
 
-        const didRequiredChange = !deepEquals(_persistedNamespaces.required, requiredNamespaces)
-        const didOptionalChange = !deepEquals(_persistedNamespaces.optional, optionalNamespaces)
-        return didRequiredChange || didOptionalChange
-    }
+        const persistedNamespaces = sessionProposal
+            ? getPersistedDappNamespacesForDapp(sessionProposal.params.proposer.metadata.url)
+            : undefined
+
+        if (persistedNamespaces) {
+            return persistedNamespaces.supported
+        }
+
+        const { requiredNamespaces, optionalNamespaces } = sessionProposal.params
 
-    function onBackClick(): void {
-        if (currentStep === 0) {
-            if (drawerRouter.hasHistory()) {
-                drawerRouter.previous()
-            } else {
-                rejectConnectionRequest()
-                closeDrawer()
+        const allChainids = [...Object.values(requiredNamespaces), ...Object.values(optionalNamespaces)]
+            .flatMap(({ chains }) => chains)
+            .filter(Boolean)
+
+        const namespace: Record<string, ISupportedNamespace> = {}
+        for (const network of getEvmNetworks()) {
+            if (!allChainids.includes(network.id)) {
+                continue
+            }
+
+            if (!namespace[network.namespace]) {
+                const accounts = $activeAccounts
+                    .map((account) => getCaip10AddressForAccount(account, network.id) as string)
+                    .filter(Boolean)
+
+                namespace[network.namespace] = {
+                    chains: [],
+                    methods: ALL_SUPPORTED_METHODS,
+                    events: SUPPORTED_EVENTS,
+                    accounts,
+                }
             }
-        } else {
-            currentStep--
+
+            namespace[network.namespace].chains.push(network.id)
+        }
+        return namespace
+    }
+
+    function updateSupportedNamespaces(): void {
+        if (activeSelection === Selection.Summary) {
+            return
+        }
+
+        const { requiredNamespaces, optionalNamespaces } = sessionProposal.params
+
+        const selections = {
+            chains: checkedNetworks,
+            methods: checkedMethods,
+            accounts: checkedAccounts,
         }
+
+        supportedNamespaces = buildSupportedNamespacesFromSelections(
+            selections,
+            requiredNamespaces,
+            optionalNamespaces,
+            supportedNamespaces
+        )
     }
 
-    function onNextClick(): void {
-        currentStep++
+    function onCancelClick(): void {
+        if (!hasRequestExpired) {
+            rejectConnectionRequest()
+        }
+        closeDrawer()
     }
 
     async function onConfirmClick(): Promise<void> {
         try {
             loading = true
-            const persistedSupportedNamespaces = getPersistedDappNamespacesForDapp(dappMetadata.url)?.supported
-
-            const selections = persistedSupportedNamespaces
-                ? {}
-                : {
-                      chains: checkedNetworks,
-                      methods: checkedMethods,
-                      accounts: checkedAccounts,
-                  }
-            await connectToDapp(
-                selections,
-                persistedSupportedNamespaces,
-                sessionProposal,
-                $selectedAccount as IAccountState
-            )
+            await connectToDapp(supportedNamespaces, sessionProposal, $selectedAccount as IAccountState)
 
             drawerRouter.reset()
             drawerRouter.goTo(DappConfigRoute.ConnectedDapps)
@@ -121,77 +149,84 @@
     }
 </script>
 
-<DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter}>
+<DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter} showBack={false}>
     <div class="w-full h-full flex flex-col space-y-6 overflow-hidden">
-        <DappInfo metadata={dappMetadata} {verifiedState} />
+        <div>
+            <DappInfo metadata={sessionProposal.params.proposer.metadata} {verifiedState} />
+            <ConnectionRequestExpirationAlert expiryTimestamp={sessionProposal.params.expiryTimestamp} />
+        </div>
 
         <div class="px-6 flex-grow overflow-hidden">
-            {#if persistedNamespaces && !isPreferenceSelectionRequired}
-                <div class="h-full overflow-scroll">
+            {#if activeSelection === Selection.Summary}
+                <div class="h-full overflow-auto">
                     <ConnectionSummary
                         {requiredNamespaces}
                         editable
-                        persistedSupportedNamespaces={persistedNamespaces.supported}
-                        {drawerRouter}
+                        {supportedNamespaces}
+                        onEditPermissionsClick={() =>
+                            !loading || !hasRequestExpired ? (activeSelection = Selection.Permissions) : undefined}
+                        onEditNetworksClick={() =>
+                            !loading || !hasRequestExpired ? (activeSelection = Selection.Networks) : undefined}
+                        onEditAccountsClick={() =>
+                            !loading || !hasRequestExpired ? (activeSelection = Selection.Accounts) : undefined}
                     />
                 </div>
             {:else}
-                {@const tipLocale = currentStep === 0 ? 'permissions' : currentStep === 1 ? 'networks' : 'accounts'}
-                <div class="h-full flex flex-col gap-8">
-                    <Steps bind:currentStep {steps} />
-
-                    <div class="flex-grow overflow-hidden">
-                        <div class="h-full flex flex-col gap-8 overflow-scroll">
-                            <SidebarToast
-                                color="green"
-                                header={localize('general.tip')}
-                                body={localize(`${localeKey}.${tipLocale}.tip`)}
-                                dismissable={false}
-                            />
-                            <div class="flex-grow {currentStep === 0 ? 'visible' : 'hidden'}">
-                                <PermissionSelection
-                                    bind:checkedMethods
-                                    {requiredMethods}
-                                    {optionalMethods}
-                                    persistedSupportedNamespaces={persistedNamespaces?.supported}
-                                />
-                            </div>
-                            <div class="flex-grow {currentStep === 1 ? 'visible' : 'hidden'}">
-                                <NetworkSelection
-                                    bind:checkedNetworks
-                                    {requiredNetworks}
-                                    {optionalNetworks}
-                                    persistedSupportedNamespaces={persistedNamespaces?.supported}
-                                />
-                            </div>
-                            <div class="flex-grow {currentStep === 2 ? 'visible' : 'hidden'}">
-                                <AccountSelection
-                                    bind:checkedAccounts
-                                    chainIds={checkedNetworks}
-                                    persistedSupportedNamespaces={persistedNamespaces?.supported}
-                                />
-                            </div>
-                        </div>
-                    </div>
+                <div class="flex-grow {activeSelection === Selection.Permissions ? 'visible' : 'hidden'}">
+                    <PermissionSelection
+                        bind:checkedMethods
+                        {requiredMethods}
+                        {optionalMethods}
+                        {supportedNamespaces}
+                    />
+                </div>
+                <div class="flex-grow {activeSelection === Selection.Networks ? 'visible' : 'hidden'}">
+                    <NetworkSelection
+                        bind:checkedNetworks
+                        {requiredNetworks}
+                        {optionalNetworks}
+                        {supportedNamespaces}
+                    />
+                </div>
+                <div class="flex-grow {activeSelection === Selection.Accounts ? 'visible' : 'hidden'}">
+                    <AccountSelection bind:checkedAccounts chainIds={checkedNetworks} {supportedNamespaces} />
                 </div>
             {/if}
         </div>
     </div>
     <div slot="footer" class="flex flex-row gap-2">
-        <Button
-            variant="outlined"
-            width="full"
-            on:click={onBackClick}
-            disabled={loading}
-            text={localize(!drawerRouter.hasHistory() && currentStep === 0 ? 'actions.cancel' : 'actions.back')}
-        />
-        {@const isLastStep = persistedNamespaces || currentStep === steps.length - 1}
-        <Button
-            width="full"
-            on:click={isLastStep ? onConfirmClick : onNextClick}
-            disabled={isButtonDisabled}
-            busy={loading}
-            text={localize(`actions.${isLastStep ? 'confirm' : 'next'}`)}
-        />
+        {#if activeSelection === Selection.Summary}
+            <Button
+                variant="outlined"
+                width="full"
+                on:click={onCancelClick}
+                disabled={loading}
+                text={hasRequestExpired ? localize('actions.cancel') : localize('actions.reject')}
+            />
+            {#if !hasRequestExpired}
+                <Button
+                    width="full"
+                    on:click={onConfirmClick}
+                    disabled={loading}
+                    busy={loading}
+                    text={localize('actions.confirm')}
+                />
+            {/if}
+        {:else}
+            <Button
+                variant="outlined"
+                width="full"
+                on:click={() => (activeSelection = Selection.Summary)}
+                text={localize('actions.back')}
+            />
+            <Button
+                width="full"
+                on:click={() => {
+                    updateSupportedNamespaces()
+                    activeSelection = Selection.Summary
+                }}
+                text={localize('actions.apply')}
+            />
+        {/if}
     </div>
 </DrawerTemplate>

From e03f70b69b81c66bbc7b236e25c701774837e48c Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Thu, 20 Jun 2024 13:52:41 +0200
Subject: [PATCH 12/24] fix

---
 .../drawers/dapp-config/views/ConnectionRequest.svelte        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
index f98eaea870..bca0eb88c6 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
@@ -62,7 +62,9 @@
     }
 
     function onRejectClick(): void {
-        rejectConnectionRequest()
+        if (!hasRequestExpired) {
+            rejectConnectionRequest()
+        }
         closeDrawer()
     }
 

From 8101eb96c55b335267fdc61093a06357f42f5580 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Sun, 23 Jun 2024 14:22:49 +0200
Subject: [PATCH 13/24] fixes

---
 .../utils/getNetworksAndMethodsFromNamespaces.ts              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/getNetworksAndMethodsFromNamespaces.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/getNetworksAndMethodsFromNamespaces.ts
index 18e6245527..9881454702 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/getNetworksAndMethodsFromNamespaces.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/getNetworksAndMethodsFromNamespaces.ts
@@ -26,10 +26,10 @@ export function getNetworksAndMethodsFromNamespaces(
 
     for (const namespace of Object.values(optionalNamespaces ?? {})) {
         if (namespace.chains) {
-            requiredNetworks.push(...namespace.chains)
+            optionalNetworks.push(...namespace.chains)
         }
         if (namespace.methods) {
-            requiredMethods.push(...(namespace.methods as RpcMethod[]))
+            optionalMethods.push(...(namespace.methods as RpcMethod[]))
         }
     }
 

From c18df818216496f6988d9a5f286ef6932fd0cba6 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Tue, 25 Jun 2024 08:49:19 +0200
Subject: [PATCH 14/24] merge fixes

---
 .../views/SessionProposalFlow.svelte           |  9 ++++-----
 .../stores/connection-request.store.ts         | 18 ------------------
 .../stores/session-initiation-request.store.ts | 12 +++++++++++-
 3 files changed, 15 insertions(+), 24 deletions(-)
 delete mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/stores/connection-request.store.ts

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
index 5c2f3f65cd..8addfa6cb2 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
@@ -2,12 +2,12 @@
     import { buildSupportedNamespacesFromSelections, connectToDapp } from '@auxiliary/wallet-connect/actions'
     import { ALL_SUPPORTED_METHODS, SUPPORTED_EVENTS } from '@auxiliary/wallet-connect/constants'
     import { DappVerification } from '@auxiliary/wallet-connect/enums'
-    import { getPersistedDappNamespacesForDapp } from '@auxiliary/wallet-connect/stores'
+    import { clearSessionInitiationRequest, getPersistedDappNamespacesForDapp } from '@auxiliary/wallet-connect/stores'
     import { ISupportedNamespace, SupportedNamespaces } from '@auxiliary/wallet-connect/types'
     import {
         getCaip10AddressForAccount,
         getNetworksAndMethodsFromNamespaces,
-        rejectConnectionRequest,
+        rejectAndClearSessionInitiationRequest,
     } from '@auxiliary/wallet-connect/utils'
     import { Button, Table } from '@bloomwalletio/ui'
     import { DrawerTemplate } from '@components'
@@ -129,9 +129,7 @@
     }
 
     function onCancelClick(): void {
-        if (!hasRequestExpired) {
-            rejectConnectionRequest()
-        }
+        void rejectAndClearSessionInitiationRequest()
         closeDrawer()
     }
 
@@ -139,6 +137,7 @@
         try {
             loading = true
             await connectToDapp(supportedNamespaces, sessionProposal, $selectedAccount as IAccountState)
+            clearSessionInitiationRequest()
 
             drawerRouter.reset()
             drawerRouter.goTo(DappConfigRoute.ConnectedDapps)
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/stores/connection-request.store.ts b/packages/shared/src/lib/auxiliary/wallet-connect/stores/connection-request.store.ts
deleted file mode 100644
index 5c7f831940..0000000000
--- a/packages/shared/src/lib/auxiliary/wallet-connect/stores/connection-request.store.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Writable, writable } from 'svelte/store'
-import { Web3WalletTypes } from '@walletconnect/web3wallet'
-
-export type SessionInitiationRequest =
-    | {
-          type: 'session_proposal'
-          payload: Web3WalletTypes.SessionProposal
-      }
-    | {
-          type: 'session_authenticate'
-          payload: Web3WalletTypes.SessionAuthenticate
-      }
-
-export const sessionInitiationRequest: Writable<SessionInitiationRequest | undefined> = writable(undefined)
-
-export function clearSessionInitiationRequest(): void {
-    sessionInitiationRequest.set(undefined)
-}
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/stores/session-initiation-request.store.ts b/packages/shared/src/lib/auxiliary/wallet-connect/stores/session-initiation-request.store.ts
index 0a2a0b0ccf..5c7f831940 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/stores/session-initiation-request.store.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/stores/session-initiation-request.store.ts
@@ -1,7 +1,17 @@
 import { Writable, writable } from 'svelte/store'
 import { Web3WalletTypes } from '@walletconnect/web3wallet'
 
-export const sessionInitiationRequest: Writable<Web3WalletTypes.SessionProposal | undefined> = writable(undefined)
+export type SessionInitiationRequest =
+    | {
+          type: 'session_proposal'
+          payload: Web3WalletTypes.SessionProposal
+      }
+    | {
+          type: 'session_authenticate'
+          payload: Web3WalletTypes.SessionAuthenticate
+      }
+
+export const sessionInitiationRequest: Writable<SessionInitiationRequest | undefined> = writable(undefined)
 
 export function clearSessionInitiationRequest(): void {
     sessionInitiationRequest.set(undefined)

From a6be4636809fa2f933b0f6cf44acc6673e915ae5 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Tue, 25 Jun 2024 09:52:35 +0200
Subject: [PATCH 15/24] merge fixes

---
 .../views/ConnectionRequest.svelte            |  6 ++--
 .../views/ConnectionRequestDrawer.svelte      |  6 +++-
 .../dapp-config/views/OneClickAuthFlow.svelte |  4 +--
 .../utils/rejectConnectionRequest.ts          | 28 -------------------
 .../utils/rejectSessionInitiationRequest.ts   | 20 +++++++++----
 5 files changed, 24 insertions(+), 40 deletions(-)
 delete mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectConnectionRequest.ts

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
index 2cb5fb9ee2..c8f4de054f 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
@@ -8,12 +8,12 @@
     import { ConnectionRequestExpirationAlert, SecurityWarning, UnsupportedDappHint } from '../components'
     import { getAllNetworkIds } from '@core/network'
     import { ALL_SUPPORTED_METHODS } from '@auxiliary/wallet-connect/constants'
-    import { rejectConnectionRequest } from '@auxiliary/wallet-connect/utils'
     import { DappVerification, RpcMethod } from '@auxiliary/wallet-connect/enums'
     import { Web3WalletTypes } from '@walletconnect/web3wallet'
     import { onMount } from 'svelte'
     import { MILLISECONDS_PER_SECOND } from '@core/utils'
     import { time } from '@core/app/stores'
+    import { rejectAndClearSessionInitiationRequest } from '@auxiliary/wallet-connect/utils'
 
     export let drawerRouter: Router<unknown>
     export let dappMetadata: Web3WalletTypes.Metadata
@@ -62,9 +62,7 @@
     }
 
     function onRejectClick(): void {
-        if (!hasRequestExpired) {
-            rejectConnectionRequest()
-        }
+        void rejectAndClearSessionInitiationRequest()
         closeDrawer()
     }
 
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
index 8f066e2121..63e703cde5 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
@@ -111,7 +111,11 @@
         expiryTimestamp={$sessionInitiationRequest.payload.params.expiryTimestamp}
     />
 {:else}
-    <DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter} onBack={rejectConnectionRequest}>
+    <DrawerTemplate
+        title={localize(`${localeKey}.title`)}
+        {drawerRouter}
+        onBack={() => void rejectAndClearSessionInitiationRequest()}
+    >
         <div class="w-full h-full flex items-center justify-center">
             <Spinner size="lg" textColor="primary" />
         </div>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
index 3c3932bd85..7f7c7f9930 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
@@ -4,7 +4,7 @@
     import { localize } from '@core/i18n'
     import { Router } from '@core/router'
     import { DrawerTemplate } from '@components'
-    import { rejectConnectionRequest } from '@auxiliary/wallet-connect/utils'
+    import { rejectAndClearSessionInitiationRequest } from '@auxiliary/wallet-connect/utils'
     import { AccountSelection, NetworkSelection, PermissionSelection } from '../components'
     import { handleError } from '@core/error/handlers'
     import { IAccountState } from '@core/account'
@@ -56,7 +56,7 @@
             if (drawerRouter.hasHistory()) {
                 drawerRouter.previous()
             } else {
-                rejectConnectionRequest()
+                rejectAndClearSessionInitiationRequest()
                 closeDrawer()
             }
         } else {
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectConnectionRequest.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectConnectionRequest.ts
deleted file mode 100644
index 849555a363..0000000000
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectConnectionRequest.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { getSdkError } from '@walletconnect/utils'
-import { getWalletClient, sessionInitiationRequest } from '../stores'
-import { get } from 'svelte/store'
-import { handleError } from '@core/error/handlers'
-
-export async function rejectConnectionRequest(): Promise<void> {
-    const _connectionRequest = get(sessionInitiationRequest)
-    if (!_connectionRequest) {
-        return
-    }
-
-    sessionInitiationRequest.set(undefined)
-    try {
-        if (_connectionRequest.type === 'session_proposal') {
-            await getWalletClient()?.rejectSession({
-                id: _connectionRequest.payload.id,
-                reason: getSdkError('USER_REJECTED'),
-            })
-        } else if (_connectionRequest.type === 'session_authenticate') {
-            await getWalletClient()?.rejectSessionAuthenticate({
-                id: _connectionRequest.payload.id,
-                reason: getSdkError('USER_REJECTED'),
-            })
-        }
-    } catch (err) {
-        handleError(err)
-    }
-}
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectSessionInitiationRequest.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectSessionInitiationRequest.ts
index 05e9f204b6..1df64341a6 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectSessionInitiationRequest.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectSessionInitiationRequest.ts
@@ -2,12 +2,22 @@ import { getSdkError } from '@walletconnect/utils'
 import { getWalletClient } from '../stores'
 import { handleError } from '@core/error/handlers'
 
-export async function rejectSessionInitiationRequest(sessionId: number): Promise<void> {
+export async function rejectSessionInitiationRequest(
+    sessionId: number,
+    connectionType: 'session_proposal' | 'session_authenticate'
+): Promise<void> {
     try {
-        await getWalletClient()?.rejectSession({
-            id: sessionId,
-            reason: getSdkError('USER_REJECTED'),
-        })
+        if (connectionType === 'session_proposal') {
+            await getWalletClient()?.rejectSession({
+                id: sessionId,
+                reason: getSdkError('USER_REJECTED'),
+            })
+        } else if (connectionType === 'session_authenticate') {
+            await getWalletClient()?.rejectSessionAuthenticate({
+                id: sessionId,
+                reason: getSdkError('USER_REJECTED'),
+            })
+        }
     } catch (err) {
         handleError(err)
     }

From 625b2cd60fdc968133aafb2b4b78a774c982fb10 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Tue, 25 Jun 2024 11:36:50 +0200
Subject: [PATCH 16/24] create shared connection flow component

Co-authored-by: Nicole O'Brien <nicole-obrien@users.noreply.github.com>
---
 .../views/SessionProposalFlow.svelte          | 190 ++----------------
 .../views/SessionProposalFlowShared.svelte    | 190 ++++++++++++++++++
 .../drawers/dapp-config/views/index.ts        |   3 +
 3 files changed, 210 insertions(+), 173 deletions(-)
 create mode 100644 packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlowShared.svelte

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
index 8addfa6cb2..7024a6bd59 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
@@ -1,69 +1,29 @@
 <script lang="ts">
-    import { buildSupportedNamespacesFromSelections, connectToDapp } from '@auxiliary/wallet-connect/actions'
+    import { connectToDapp } from '@auxiliary/wallet-connect/actions'
     import { ALL_SUPPORTED_METHODS, SUPPORTED_EVENTS } from '@auxiliary/wallet-connect/constants'
     import { DappVerification } from '@auxiliary/wallet-connect/enums'
-    import { clearSessionInitiationRequest, getPersistedDappNamespacesForDapp } from '@auxiliary/wallet-connect/stores'
+    import { getPersistedDappNamespacesForDapp } from '@auxiliary/wallet-connect/stores'
     import { ISupportedNamespace, SupportedNamespaces } from '@auxiliary/wallet-connect/types'
-    import {
-        getCaip10AddressForAccount,
-        getNetworksAndMethodsFromNamespaces,
-        rejectAndClearSessionInitiationRequest,
-    } from '@auxiliary/wallet-connect/utils'
-    import { Button, Table } from '@bloomwalletio/ui'
-    import { DrawerTemplate } from '@components'
+    import { getCaip10AddressForAccount } from '@auxiliary/wallet-connect/utils'
     import { IAccountState } from '@core/account'
     import { selectedAccount } from '@core/account/stores'
-    import { time } from '@core/app/stores'
-    import { handleError } from '@core/error/handlers'
-    import { localize } from '@core/i18n'
     import { getEvmNetworks } from '@core/network'
     import { activeAccounts } from '@core/profile/stores'
     import { Router } from '@core/router'
-    import { MILLISECONDS_PER_SECOND } from '@core/utils'
-    import { closeDrawer } from '@desktop/auxiliary/drawer'
-    import { DappInfo } from '@ui'
-    import {
-        AccountSelection,
-        ConnectionSummary,
-        NetworkSelection,
-        PermissionSelection,
-        ConnectionRequestExpirationAlert,
-    } from '../components'
-    import { DappConfigRoute } from '../dapp-config-route.enum'
     import { Web3WalletTypes } from '@walletconnect/web3wallet'
+    import { SessionProposalFlowShared } from '.'
 
     export let drawerRouter: Router<unknown>
     export let sessionProposal: Web3WalletTypes.SessionProposal
 
-    let loading = false
-
-    enum Selection {
-        Summary = 'summary',
-        Accounts = 'accounts',
-        Permissions = 'permissions',
-        Networks = 'networks',
-    }
-
-    let activeSelection: Selection = Selection.Summary
-    const localeKey = 'views.dashboard.drawers.dapps.confirmConnection'
-
     $: verifiedState = sessionProposal?.verifyContext.verified.isScam
         ? DappVerification.Scam
         : (sessionProposal.verifyContext.verified.validation as DappVerification)
 
-    $: hasRequestExpired = sessionProposal.params.expiryTimestamp
-        ? sessionProposal.params.expiryTimestamp - $time.getTime() / MILLISECONDS_PER_SECOND <= 0
-        : false
-
-    let checkedAccounts: IAccountState[] = []
-    let checkedNetworks: string[] = []
-    let checkedMethods: string[] = []
     const requiredNamespaces = sessionProposal.params.requiredNamespaces
     const optionalNamespaces = sessionProposal.params.optionalNamespaces
-    const { requiredNetworks, optionalNetworks, requiredMethods, optionalMethods } =
-        getNetworksAndMethodsFromNamespaces(requiredNamespaces, optionalNamespaces)
 
-    let supportedNamespaces = initSupportedNamespaces()
+    const supportedNamespaces = initSupportedNamespaces()
     function initSupportedNamespaces(): SupportedNamespaces {
         if (!sessionProposal) {
             return {}
@@ -107,134 +67,18 @@
         return namespace
     }
 
-    function updateSupportedNamespaces(): void {
-        if (activeSelection === Selection.Summary) {
-            return
-        }
-
-        const { requiredNamespaces, optionalNamespaces } = sessionProposal.params
-
-        const selections = {
-            chains: checkedNetworks,
-            methods: checkedMethods,
-            accounts: checkedAccounts,
-        }
-
-        supportedNamespaces = buildSupportedNamespacesFromSelections(
-            selections,
-            requiredNamespaces,
-            optionalNamespaces,
-            supportedNamespaces
-        )
-    }
-
-    function onCancelClick(): void {
-        void rejectAndClearSessionInitiationRequest()
-        closeDrawer()
-    }
-
-    async function onConfirmClick(): Promise<void> {
-        try {
-            loading = true
-            await connectToDapp(supportedNamespaces, sessionProposal, $selectedAccount as IAccountState)
-            clearSessionInitiationRequest()
-
-            drawerRouter.reset()
-            drawerRouter.goTo(DappConfigRoute.ConnectedDapps)
-        } catch (error) {
-            loading = false
-            handleError(error)
-        }
+    async function onConfirm(supportedNamespaces: SupportedNamespaces): Promise<void> {
+        await connectToDapp(supportedNamespaces, sessionProposal, $selectedAccount as IAccountState)
     }
 </script>
 
-<DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter} showBack={false}>
-    <div class="w-full h-full flex flex-col space-y-6 overflow-hidden">
-        <div>
-            <DappInfo metadata={sessionProposal.params.proposer.metadata} {verifiedState} />
-            <ConnectionRequestExpirationAlert expiryTimestamp={sessionProposal.params.expiryTimestamp} />
-        </div>
-
-        <div class="px-6 flex-grow overflow-hidden">
-            {#if activeSelection === Selection.Summary}
-                <div class="h-full overflow-auto space-y-6">
-                    <Table
-                        items={[
-                            {
-                                key: localize('general.description'),
-                                value: sessionProposal.params.proposer.metadata.description,
-                            },
-                        ]}
-                        orientation="vertical"
-                    />
-                    <ConnectionSummary
-                        {requiredNamespaces}
-                        editable
-                        {supportedNamespaces}
-                        onEditPermissionsClick={() =>
-                            !loading || !hasRequestExpired ? (activeSelection = Selection.Permissions) : undefined}
-                        onEditNetworksClick={() =>
-                            !loading || !hasRequestExpired ? (activeSelection = Selection.Networks) : undefined}
-                        onEditAccountsClick={() =>
-                            !loading || !hasRequestExpired ? (activeSelection = Selection.Accounts) : undefined}
-                    />
-                </div>
-            {:else}
-                <div class="flex-grow {activeSelection === Selection.Permissions ? 'visible' : 'hidden'}">
-                    <PermissionSelection
-                        bind:checkedMethods
-                        {requiredMethods}
-                        {optionalMethods}
-                        {supportedNamespaces}
-                    />
-                </div>
-                <div class="flex-grow {activeSelection === Selection.Networks ? 'visible' : 'hidden'}">
-                    <NetworkSelection
-                        bind:checkedNetworks
-                        {requiredNetworks}
-                        {optionalNetworks}
-                        {supportedNamespaces}
-                    />
-                </div>
-                <div class="flex-grow {activeSelection === Selection.Accounts ? 'visible' : 'hidden'}">
-                    <AccountSelection bind:checkedAccounts chainIds={checkedNetworks} {supportedNamespaces} />
-                </div>
-            {/if}
-        </div>
-    </div>
-    <div slot="footer" class="flex flex-row gap-2">
-        {#if activeSelection === Selection.Summary}
-            <Button
-                variant="outlined"
-                width="full"
-                on:click={onCancelClick}
-                disabled={loading}
-                text={hasRequestExpired ? localize('actions.cancel') : localize('actions.reject')}
-            />
-            {#if !hasRequestExpired}
-                <Button
-                    width="full"
-                    on:click={onConfirmClick}
-                    disabled={loading}
-                    busy={loading}
-                    text={localize('actions.confirm')}
-                />
-            {/if}
-        {:else}
-            <Button
-                variant="outlined"
-                width="full"
-                on:click={() => (activeSelection = Selection.Summary)}
-                text={localize('actions.back')}
-            />
-            <Button
-                width="full"
-                on:click={() => {
-                    updateSupportedNamespaces()
-                    activeSelection = Selection.Summary
-                }}
-                text={localize('actions.apply')}
-            />
-        {/if}
-    </div>
-</DrawerTemplate>
+<SessionProposalFlowShared
+    {drawerRouter}
+    dappMetadata={sessionProposal.params.proposer.metadata}
+    {verifiedState}
+    expiryTimestamp={sessionProposal.params.expiryTimestamp}
+    {requiredNamespaces}
+    {optionalNamespaces}
+    {supportedNamespaces}
+    {onConfirm}
+/>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlowShared.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlowShared.svelte
new file mode 100644
index 0000000000..dea5286468
--- /dev/null
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlowShared.svelte
@@ -0,0 +1,190 @@
+<script lang="ts">
+    import { buildSupportedNamespacesFromSelections } from '@auxiliary/wallet-connect/actions'
+    import { DappVerification } from '@auxiliary/wallet-connect/enums'
+    import { clearSessionInitiationRequest } from '@auxiliary/wallet-connect/stores'
+    import { SupportedNamespaces } from '@auxiliary/wallet-connect/types'
+    import {
+        getNetworksAndMethodsFromNamespaces,
+        rejectAndClearSessionInitiationRequest,
+    } from '@auxiliary/wallet-connect/utils'
+    import { Button, Table } from '@bloomwalletio/ui'
+    import { DrawerTemplate } from '@components'
+    import { IAccountState } from '@core/account'
+    import { time } from '@core/app/stores'
+    import { handleError } from '@core/error/handlers'
+    import { localize } from '@core/i18n'
+    import { Router } from '@core/router'
+    import { MILLISECONDS_PER_SECOND } from '@core/utils'
+    import { closeDrawer } from '@desktop/auxiliary/drawer'
+    import { DappInfo } from '@ui'
+    import {
+        AccountSelection,
+        ConnectionSummary,
+        NetworkSelection,
+        PermissionSelection,
+        ConnectionRequestExpirationAlert,
+    } from '../components'
+    import { DappConfigRoute } from '../dapp-config-route.enum'
+    import { CoreTypes, ProposalTypes } from '@walletconnect/types'
+    import { IDappMetadata } from '@auxiliary/wallet-connect/interface'
+
+    export let drawerRouter: Router<unknown>
+    export let dappMetadata: CoreTypes.Metadata | IDappMetadata
+    export let verifiedState: DappVerification
+    export let expiryTimestamp: number
+    export let requiredNamespaces: ProposalTypes.RequiredNamespaces
+    export let optionalNamespaces: ProposalTypes.OptionalNamespaces
+    export let supportedNamespaces: SupportedNamespaces
+
+    export let onConfirm: (supportedNamespaces: SupportedNamespaces) => Promise<void>
+
+    let loading = false
+
+    enum Selection {
+        Summary = 'summary',
+        Accounts = 'accounts',
+        Permissions = 'permissions',
+        Networks = 'networks',
+    }
+
+    let activeSelection: Selection = Selection.Summary
+    const localeKey = 'views.dashboard.drawers.dapps.confirmConnection'
+
+    $: hasRequestExpired = expiryTimestamp ? expiryTimestamp - $time.getTime() / MILLISECONDS_PER_SECOND <= 0 : false
+
+    let checkedAccounts: IAccountState[] = []
+    let checkedNetworks: string[] = []
+    let checkedMethods: string[] = []
+    const { requiredNetworks, optionalNetworks, requiredMethods, optionalMethods } =
+        getNetworksAndMethodsFromNamespaces(requiredNamespaces, optionalNamespaces)
+
+    function updateSupportedNamespaces(): void {
+        if (activeSelection === Selection.Summary) {
+            return
+        }
+
+        const selections = {
+            chains: checkedNetworks,
+            methods: checkedMethods,
+            accounts: checkedAccounts,
+        }
+
+        supportedNamespaces = buildSupportedNamespacesFromSelections(
+            selections,
+            requiredNamespaces,
+            optionalNamespaces,
+            supportedNamespaces
+        )
+    }
+
+    function onCancelClick(): void {
+        void rejectAndClearSessionInitiationRequest()
+        closeDrawer()
+    }
+
+    async function onConfirmClick(): Promise<void> {
+        try {
+            loading = true
+            await onConfirm(supportedNamespaces)
+
+            clearSessionInitiationRequest()
+
+            drawerRouter.reset()
+            drawerRouter.goTo(DappConfigRoute.ConnectedDapps)
+        } catch (error) {
+            loading = false
+            handleError(error)
+        }
+    }
+</script>
+
+<DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter} showBack={false}>
+    <div class="w-full h-full flex flex-col space-y-6 overflow-hidden">
+        <div>
+            <DappInfo metadata={dappMetadata} {verifiedState} />
+            <ConnectionRequestExpirationAlert {expiryTimestamp} />
+        </div>
+
+        <div class="px-6 flex-grow overflow-hidden">
+            {#if activeSelection === Selection.Summary}
+                <div class="h-full overflow-auto space-y-6">
+                    <Table
+                        items={[
+                            {
+                                key: localize('general.description'),
+                                value: dappMetadata.description,
+                            },
+                        ]}
+                        orientation="vertical"
+                    />
+                    <ConnectionSummary
+                        {requiredNamespaces}
+                        editable
+                        {supportedNamespaces}
+                        onEditPermissionsClick={() =>
+                            !loading || !hasRequestExpired ? (activeSelection = Selection.Permissions) : undefined}
+                        onEditNetworksClick={() =>
+                            !loading || !hasRequestExpired ? (activeSelection = Selection.Networks) : undefined}
+                        onEditAccountsClick={() =>
+                            !loading || !hasRequestExpired ? (activeSelection = Selection.Accounts) : undefined}
+                    />
+                </div>
+            {:else}
+                <div class="flex-grow {activeSelection === Selection.Permissions ? 'visible' : 'hidden'}">
+                    <PermissionSelection
+                        bind:checkedMethods
+                        {requiredMethods}
+                        {optionalMethods}
+                        {supportedNamespaces}
+                    />
+                </div>
+                <div class="flex-grow {activeSelection === Selection.Networks ? 'visible' : 'hidden'}">
+                    <NetworkSelection
+                        bind:checkedNetworks
+                        {requiredNetworks}
+                        {optionalNetworks}
+                        {supportedNamespaces}
+                    />
+                </div>
+                <div class="flex-grow {activeSelection === Selection.Accounts ? 'visible' : 'hidden'}">
+                    <AccountSelection bind:checkedAccounts chainIds={checkedNetworks} {supportedNamespaces} />
+                </div>
+            {/if}
+        </div>
+    </div>
+    <div slot="footer" class="flex flex-row gap-2">
+        {#if activeSelection === Selection.Summary}
+            <Button
+                variant="outlined"
+                width="full"
+                on:click={onCancelClick}
+                disabled={loading}
+                text={hasRequestExpired ? localize('actions.cancel') : localize('actions.reject')}
+            />
+            {#if !hasRequestExpired}
+                <Button
+                    width="full"
+                    on:click={onConfirmClick}
+                    disabled={loading}
+                    busy={loading}
+                    text={localize('actions.confirm')}
+                />
+            {/if}
+        {:else}
+            <Button
+                variant="outlined"
+                width="full"
+                on:click={() => (activeSelection = Selection.Summary)}
+                text={localize('actions.back')}
+            />
+            <Button
+                width="full"
+                on:click={() => {
+                    updateSupportedNamespaces()
+                    activeSelection = Selection.Summary
+                }}
+                text={localize('actions.apply')}
+            />
+        {/if}
+    </div>
+</DrawerTemplate>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/index.ts b/packages/desktop/views/dashboard/drawers/dapp-config/views/index.ts
index e0223130de..c949672304 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/index.ts
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/index.ts
@@ -6,3 +6,6 @@ export { default as InputConnectionCodeDrawer } from './InputConnectionCodeDrawe
 export { default as EditAccountsDrawer } from './EditAccountsDrawer.svelte'
 export { default as EditNetworksDrawer } from './EditNetworksDrawer.svelte'
 export { default as EditPermissionsDrawer } from './EditPermissionsDrawer.svelte'
+export { default as OneClickAuthFlow } from './OneClickAuthFlow.svelte'
+export { default as SessionProposalFlow } from './SessionProposalFlow.svelte'
+export { default as SessionProposalFlowShared } from './SessionProposalFlowShared.svelte'

From 86ccc8e01c0c89395549180b672cf6498a195346 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Tue, 25 Jun 2024 13:42:14 +0200
Subject: [PATCH 17/24] use shared connection comp for one click auth

---
 .../dapp-config/views/OneClickAuthFlow.svelte | 182 ++++++------------
 .../views/SessionProposalFlow.svelte          |  54 +++---
 .../views/SessionProposalFlowShared.svelte    |  16 +-
 .../utils/buildDefaultNamespaces.ts           |  30 +++
 .../auxiliary/wallet-connect/utils/index.ts   |   1 +
 5 files changed, 127 insertions(+), 156 deletions(-)
 create mode 100644 packages/shared/src/lib/auxiliary/wallet-connect/utils/buildDefaultNamespaces.ts

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
index 7f7c7f9930..cbdc055e42 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
@@ -1,150 +1,96 @@
 <script lang="ts">
-    import { Button, SidebarToast, Steps } from '@bloomwalletio/ui'
-    import { DappInfo } from '@ui'
-    import { localize } from '@core/i18n'
     import { Router } from '@core/router'
-    import { DrawerTemplate } from '@components'
-    import { rejectAndClearSessionInitiationRequest } from '@auxiliary/wallet-connect/utils'
-    import { AccountSelection, NetworkSelection, PermissionSelection } from '../components'
-    import { handleError } from '@core/error/handlers'
-    import { IAccountState } from '@core/account'
-    import { DappConfigRoute } from '../dapp-config-route.enum'
-    import { closeDrawer } from '@desktop/auxiliary/drawer'
+    import { buildDefaultNamespaces } from '@auxiliary/wallet-connect/utils'
+    import { getAddressFromAccountForNetwork } from '@core/account'
     import { DappVerification } from '@auxiliary/wallet-connect/enums'
     import { Web3WalletTypes } from '@walletconnect/web3wallet'
-    import { walletClient } from '@auxiliary/wallet-connect/stores'
+    import { getPersistedDappNamespacesForDapp } from '@auxiliary/wallet-connect/stores'
     import { checkActiveProfileAuth } from '@core/profile/actions'
     import { LedgerAppName } from '@core/ledger'
     import { approveSessionAuthenticate } from '@auxiliary/wallet-connect/actions/approveSessionAuthenticate'
-    import { ALL_EVM_METHODS } from '@auxiliary/wallet-connect/constants'
+    import { ALL_EVM_METHODS, SUPPORTED_EVENTS } from '@auxiliary/wallet-connect/constants'
+    import SessionProposalFlowShared from './SessionProposalFlowShared.svelte'
+    import { SupportedNamespaces } from '@auxiliary/wallet-connect/types'
+    import { EvmNetworkId } from '@core/network'
+    import { activeAccounts } from '@core/profile/stores'
 
     export let drawerRouter: Router<unknown>
     export let sessionProposal: Web3WalletTypes.SessionAuthenticate
 
-    let loading = false
-
-    const localeKey = 'views.dashboard.drawers.dapps.confirmConnection'
-    let currentStep = 0
-    const steps = [
-        localize(`${localeKey}.permissions.step`),
-        localize(`${localeKey}.networks.step`),
-        localize(`${localeKey}.accounts.step`),
-    ]
-
-    let checkedAccounts: IAccountState[] = []
-    let checkedNetworks: string[] = []
-    let checkedMethods: string[] = []
-
     const verifiedState = DappVerification.Unknown
 
     const dappMetadata = sessionProposal.params.requester.metadata
 
-    const requiredNetworks = []
-    const optionalNetworks = sessionProposal.params.authPayload.chains
-
-    const requiredMethods = []
-    const optionalMethods = ALL_EVM_METHODS
+    const requiredNamespaces = {}
+    const optionalNamespaces = {
+        eip155: {
+            chains: sessionProposal.params.authPayload.chains,
+            methods: ALL_EVM_METHODS,
+            events: SUPPORTED_EVENTS,
+        },
+    }
 
-    $: isButtonDisabled =
-        loading ||
-        (currentStep === 0 && checkedMethods.length === 0) ||
-        (currentStep === 1 && checkedNetworks.length === 0) ||
-        (currentStep === 2 && checkedAccounts.length === 0)
+    const supportedNamespaces = initSupportedNamespaces()
+    function initSupportedNamespaces(): SupportedNamespaces {
+        if (!sessionProposal) {
+            return {}
+        }
 
-    function onBackClick(): void {
-        if (currentStep === 0) {
-            if (drawerRouter.hasHistory()) {
-                drawerRouter.previous()
-            } else {
-                rejectAndClearSessionInitiationRequest()
-                closeDrawer()
-            }
-        } else {
-            currentStep--
+        const persistedNamespaces = getPersistedDappNamespacesForDapp(dappMetadata.url)
+        if (persistedNamespaces) {
+            return persistedNamespaces.supported
         }
-    }
 
-    function onNextClick(): void {
-        currentStep++
-    }
+        const defaultNamespaces = buildDefaultNamespaces()
 
-    async function onConfirmClick(): Promise<void> {
-        if (!$walletClient) {
-            return
+        for (const namespace of Object.keys(defaultNamespaces)) {
+            const supportedMethodsByDapp = ALL_EVM_METHODS
+            defaultNamespaces[namespace].methods = defaultNamespaces[namespace].methods.filter((method) =>
+                supportedMethodsByDapp.includes(method)
+            )
+
+            const supportedNetworksByDapp = sessionProposal.params.authPayload.chains
+            defaultNamespaces[namespace].chains = defaultNamespaces[namespace].chains.filter((chain) =>
+                supportedNetworksByDapp.includes(chain)
+            )
         }
 
-        loading = true
+        return defaultNamespaces
+    }
+    async function onConfirm(supportedNamespaces: SupportedNamespaces): Promise<boolean> {
         try {
             await checkActiveProfileAuth(LedgerAppName.Ethereum)
         } catch {
-            loading = false
-            return
+            return false
         }
 
-        try {
-            await approveSessionAuthenticate(sessionProposal, {
-                accounts: checkedAccounts,
-                chains: checkedNetworks,
-                methods: checkedMethods,
+        const checkedAccounts = $activeAccounts.filter((account) =>
+            supportedNamespaces.eip155.accounts.some((caipAddress) => {
+                const [namespace, chainId, address] = caipAddress.split(':')
+                return getAddressFromAccountForNetwork(account, `${namespace}:${chainId}` as EvmNetworkId) === address
             })
+        )
+        const checkedNetworks = supportedNamespaces.eip155.chains
+        const checkedMethods = supportedNamespaces.eip155.methods
 
-            drawerRouter.reset()
-            drawerRouter.goTo(DappConfigRoute.ConnectedDapps)
-        } catch (error) {
-            handleError(error)
-        } finally {
-            loading = false
-        }
+        await approveSessionAuthenticate(sessionProposal, {
+            accounts: checkedAccounts,
+            chains: checkedNetworks,
+            methods: checkedMethods,
+        })
+
+        return true
     }
 </script>
 
-<DrawerTemplate title={localize(`${localeKey}.title`)} {drawerRouter}>
-    <div class="w-full h-full flex flex-col space-y-6 overflow-hidden">
-        <DappInfo metadata={dappMetadata} {verifiedState} />
-
-        <div class="px-6 flex-grow overflow-hidden">
-            <div class="h-full flex flex-col gap-8">
-                <Steps bind:currentStep {steps} />
-
-                <div class="flex-grow overflow-hidden">
-                    <div class="h-full flex flex-col gap-8 overflow-scroll">
-                        <SidebarToast
-                            color="green"
-                            header={localize('general.tip')}
-                            body={localize(
-                                `${localeKey}.${currentStep === 0 ? 'permissions' : currentStep === 1 ? 'networks' : 'accounts'}.tip`
-                            )}
-                            dismissable={false}
-                        />
-                        <div class="flex-grow {currentStep === 0 ? 'visible' : 'hidden'}">
-                            <PermissionSelection bind:checkedMethods {requiredMethods} {optionalMethods} />
-                        </div>
-                        <div class="flex-grow {currentStep === 1 ? 'visible' : 'hidden'}">
-                            <NetworkSelection bind:checkedNetworks {requiredNetworks} {optionalNetworks} />
-                        </div>
-                        <div class="flex-grow {currentStep === 2 ? 'visible' : 'hidden'}">
-                            <AccountSelection bind:checkedAccounts chainIds={checkedNetworks} />
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div slot="footer" class="flex flex-row gap-2">
-        <Button
-            variant="outlined"
-            width="full"
-            on:click={onBackClick}
-            disabled={loading}
-            text={localize(!drawerRouter.hasHistory() && currentStep === 0 ? 'actions.cancel' : 'actions.back')}
-        />
-        {@const isLastStep = currentStep === steps.length - 1}
-        <Button
-            width="full"
-            on:click={isLastStep ? onConfirmClick : onNextClick}
-            disabled={isButtonDisabled}
-            busy={loading}
-            text={localize(`actions.${isLastStep ? 'confirm' : 'next'}`)}
-        />
-    </div>
-</DrawerTemplate>
+<SessionProposalFlowShared
+    {drawerRouter}
+    dappMetadata={sessionProposal.params.requester.metadata}
+    {verifiedState}
+    expiryTimestamp={sessionProposal.params.expiryTimestamp}
+    {requiredNamespaces}
+    {optionalNamespaces}
+    {supportedNamespaces}
+    confirmButtonLocaleKey="general.signUp"
+    {onConfirm}
+/>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
index 7024a6bd59..2b54d4e4f6 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
@@ -1,14 +1,11 @@
 <script lang="ts">
     import { connectToDapp } from '@auxiliary/wallet-connect/actions'
-    import { ALL_SUPPORTED_METHODS, SUPPORTED_EVENTS } from '@auxiliary/wallet-connect/constants'
     import { DappVerification } from '@auxiliary/wallet-connect/enums'
     import { getPersistedDappNamespacesForDapp } from '@auxiliary/wallet-connect/stores'
-    import { ISupportedNamespace, SupportedNamespaces } from '@auxiliary/wallet-connect/types'
-    import { getCaip10AddressForAccount } from '@auxiliary/wallet-connect/utils'
+    import { SupportedNamespaces } from '@auxiliary/wallet-connect/types'
+    import { buildDefaultNamespaces } from '@auxiliary/wallet-connect/utils'
     import { IAccountState } from '@core/account'
     import { selectedAccount } from '@core/account/stores'
-    import { getEvmNetworks } from '@core/network'
-    import { activeAccounts } from '@core/profile/stores'
     import { Router } from '@core/router'
     import { Web3WalletTypes } from '@walletconnect/web3wallet'
     import { SessionProposalFlowShared } from '.'
@@ -37,38 +34,32 @@
             return persistedNamespaces.supported
         }
 
-        const { requiredNamespaces, optionalNamespaces } = sessionProposal.params
+        const defaultNamespaces = buildDefaultNamespaces()
 
-        const allChainids = [...Object.values(requiredNamespaces), ...Object.values(optionalNamespaces)]
-            .flatMap(({ chains }) => chains)
-            .filter(Boolean)
+        for (const namespace of Object.keys(defaultNamespaces)) {
+            const supportedMethodsByDapp = [
+                ...(requiredNamespaces[namespace]?.methods || []),
+                ...(optionalNamespaces[namespace]?.methods || []),
+            ]
+            defaultNamespaces[namespace].methods = defaultNamespaces[namespace].methods.filter((method) =>
+                supportedMethodsByDapp.includes(method)
+            )
 
-        const namespace: Record<string, ISupportedNamespace> = {}
-        for (const network of getEvmNetworks()) {
-            if (!allChainids.includes(network.id)) {
-                continue
-            }
-
-            if (!namespace[network.namespace]) {
-                const accounts = $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)
+            const supportedNetworksByDapp = [
+                ...(requiredNamespaces[namespace]?.chains || []),
+                ...(optionalNamespaces[namespace]?.chains || []),
+            ]
+            defaultNamespaces[namespace].chains = defaultNamespaces[namespace].chains.filter((chain) =>
+                supportedNetworksByDapp.includes(chain)
+            )
         }
-        return namespace
+
+        return defaultNamespaces
     }
 
-    async function onConfirm(supportedNamespaces: SupportedNamespaces): Promise<void> {
+    async function onConfirm(supportedNamespaces: SupportedNamespaces): Promise<boolean> {
         await connectToDapp(supportedNamespaces, sessionProposal, $selectedAccount as IAccountState)
+        return true
     }
 </script>
 
@@ -80,5 +71,6 @@
     {requiredNamespaces}
     {optionalNamespaces}
     {supportedNamespaces}
+    confirmButtonLocaleKey="general.confirm"
     {onConfirm}
 />
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlowShared.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlowShared.svelte
index dea5286468..6d53da36ae 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlowShared.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlowShared.svelte
@@ -36,7 +36,8 @@
     export let optionalNamespaces: ProposalTypes.OptionalNamespaces
     export let supportedNamespaces: SupportedNamespaces
 
-    export let onConfirm: (supportedNamespaces: SupportedNamespaces) => Promise<void>
+    export let confirmButtonLocaleKey: string
+    export let onConfirm: (supportedNamespaces: SupportedNamespaces) => Promise<boolean>
 
     let loading = false
 
@@ -85,12 +86,13 @@
     async function onConfirmClick(): Promise<void> {
         try {
             loading = true
-            await onConfirm(supportedNamespaces)
+            const successful = await onConfirm(supportedNamespaces)
+            if (successful) {
+                clearSessionInitiationRequest()
 
-            clearSessionInitiationRequest()
-
-            drawerRouter.reset()
-            drawerRouter.goTo(DappConfigRoute.ConnectedDapps)
+                drawerRouter.reset()
+                drawerRouter.goTo(DappConfigRoute.ConnectedDapps)
+            }
         } catch (error) {
             loading = false
             handleError(error)
@@ -167,7 +169,7 @@
                     on:click={onConfirmClick}
                     disabled={loading}
                     busy={loading}
-                    text={localize('actions.confirm')}
+                    text={localize(confirmButtonLocaleKey)}
                 />
             {/if}
         {:else}
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/buildDefaultNamespaces.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/buildDefaultNamespaces.ts
new file mode 100644
index 0000000000..2101cefc2c
--- /dev/null
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/buildDefaultNamespaces.ts
@@ -0,0 +1,30 @@
+import { getAllNetworkIds, 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'
+
+export function buildDefaultNamespaces(): SupportedNamespaces {
+    const allChainIds = getAllNetworkIds()
+
+    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 dcbd0a71f7..79dd22b9b9 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/index.ts
@@ -1,4 +1,5 @@
 export * from './buildCaip10Address'
+export * from './buildDefaultNamespaces'
 export * from './disconnectAllDapps'
 export * from './doesNamespaceSupportEvent'
 export * from './getBloomError'

From 3bb90c37ee253569324ecddc3a5fd334b819ddcc Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Tue, 25 Jun 2024 13:48:19 +0200
Subject: [PATCH 18/24] fix locale

---
 .../dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte | 2 +-
 .../drawers/dapp-config/views/SessionProposalFlow.svelte        | 2 +-
 packages/shared/src/locales/en.json                             | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
index cbdc055e42..e0b217c4bb 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
@@ -91,6 +91,6 @@
     {requiredNamespaces}
     {optionalNamespaces}
     {supportedNamespaces}
-    confirmButtonLocaleKey="general.signUp"
+    confirmButtonLocaleKey="actions.signIn"
     {onConfirm}
 />
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
index 2b54d4e4f6..064af5c8a8 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
@@ -71,6 +71,6 @@
     {requiredNamespaces}
     {optionalNamespaces}
     {supportedNamespaces}
-    confirmButtonLocaleKey="general.confirm"
+    confirmButtonLocaleKey="actions.confirm"
     {onConfirm}
 />
diff --git a/packages/shared/src/locales/en.json b/packages/shared/src/locales/en.json
index 703af9153c..700b71f7bc 100644
--- a/packages/shared/src/locales/en.json
+++ b/packages/shared/src/locales/en.json
@@ -1491,6 +1491,7 @@
         "testDeepLink": "Test deep link",
         "delete": "Delete",
         "remove": "Remove",
+        "signIn": "Sign in",
         "getStarted": "Get started",
         "vote": "Vote",
         "addProposal": "Add proposal",

From 49f18828cb5a39c9314d5fb1b1787851750f46ef Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Tue, 25 Jun 2024 14:19:11 +0200
Subject: [PATCH 19/24] fix types

---
 .../auxiliary/wallet-connect/actions/approveSession.ts |  3 ++-
 .../handlers/onSessionAuthenticate.handler.ts          | 10 +++-------
 .../handlers/onSessionProposal.handler.ts              |  2 +-
 .../utils/rejectAndClearSessionInitiationRequest.ts    |  4 ++--
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSession.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSession.ts
index b86935dd30..9dfc4e71aa 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSession.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSession.ts
@@ -6,6 +6,7 @@ import { ISession } from '../interface/session.interface'
 import { getWalletClient, setConnectedDapps } from '../stores'
 import { updateAccountForDappSession } from './updateAccountForDappSession'
 import { ISupportedNamespace } from '../types'
+import { normalizeSessionNamespace } from '../utils'
 
 export async function approveSession(
     sessionProposal: Web3WalletTypes.SessionProposal,
@@ -25,7 +26,7 @@ export async function approveSession(
             namespaces: approvedNamespaces,
         })) as unknown as ISession
         setConnectedDapps()
-        await updateAccountForDappSession(session.topic, session.namespaces, account)
+        await updateAccountForDappSession(session.topic, normalizeSessionNamespace(session.namespaces), account)
     } catch (err) {
         handleError(err)
     }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionAuthenticate.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionAuthenticate.handler.ts
index fe2ff72bc0..43b188cbe4 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionAuthenticate.handler.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionAuthenticate.handler.ts
@@ -1,15 +1,11 @@
-import { getSdkError } from '@walletconnect/utils'
 import { Web3WalletTypes } from '@walletconnect/web3wallet'
 import { get } from 'svelte/store'
-import { getWalletClient, sessionInitiationRequest } from '../stores'
+import { sessionInitiationRequest } from '../stores'
+import { rejectSessionInitiationRequest } from '../utils'
 
 export function onSessionAuthenticate(event: Web3WalletTypes.SessionAuthenticate): void {
     if (get(sessionInitiationRequest)) {
-        // TODO: should we reject the existing one and set the new one, while resetting the flow for the user?
-        void getWalletClient()?.rejectSessionAuthenticate({
-            id: event.id,
-            reason: getSdkError('USER_REJECTED'),
-        })
+        void rejectSessionInitiationRequest(event.id, 'session_authenticate')
     } else {
         sessionInitiationRequest.set({ type: 'session_authenticate', payload: event })
     }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionProposal.handler.ts b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionProposal.handler.ts
index ba59291c3e..ebc659cbe7 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionProposal.handler.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/handlers/onSessionProposal.handler.ts
@@ -5,7 +5,7 @@ import { rejectSessionInitiationRequest } from '../utils'
 
 export function onSessionProposal(_sessionProposal: Web3WalletTypes.SessionProposal): void {
     if (get(sessionInitiationRequest)) {
-        void rejectSessionInitiationRequest(_sessionProposal.id)
+        void rejectSessionInitiationRequest(_sessionProposal.id, 'session_proposal')
     } else {
         sessionInitiationRequest.set({ type: 'session_proposal', payload: _sessionProposal })
     }
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectAndClearSessionInitiationRequest.ts b/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectAndClearSessionInitiationRequest.ts
index fee1d92df8..965cab1096 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectAndClearSessionInitiationRequest.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/utils/rejectAndClearSessionInitiationRequest.ts
@@ -9,11 +9,11 @@ export async function rejectAndClearSessionInitiationRequest(): Promise<void> {
         return
     }
 
-    const { id, params } = _sessionInitiationRequest
+    const { id, params } = _sessionInitiationRequest.payload
 
     const isExpired = (params.expiryTimestamp - Date.now()) / MILLISECONDS_PER_SECOND <= 0
     if (!isExpired) {
-        await rejectSessionInitiationRequest(id)
+        await rejectSessionInitiationRequest(id, _sessionInitiationRequest.type)
     }
     clearSessionInitiationRequest()
 }

From f3ccc00b7eb52d9f7b61ea98d56cdbac899507c1 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Tue, 25 Jun 2024 16:37:10 +0200
Subject: [PATCH 20/24] fix authenticate approval

---
 .../drawers/dapp-config/views/OneClickAuthFlow.svelte     | 6 +++++-
 .../wallet-connect/actions/approveSessionAuthenticate.ts  | 8 +++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
index e0b217c4bb..5df0b6a7ed 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
@@ -57,6 +57,7 @@
 
         return defaultNamespaces
     }
+
     async function onConfirm(supportedNamespaces: SupportedNamespaces): Promise<boolean> {
         try {
             await checkActiveProfileAuth(LedgerAppName.Ethereum)
@@ -67,7 +68,10 @@
         const checkedAccounts = $activeAccounts.filter((account) =>
             supportedNamespaces.eip155.accounts.some((caipAddress) => {
                 const [namespace, chainId, address] = caipAddress.split(':')
-                return getAddressFromAccountForNetwork(account, `${namespace}:${chainId}` as EvmNetworkId) === address
+                return (
+                    getAddressFromAccountForNetwork(account, `${namespace}:${chainId}` as EvmNetworkId) ===
+                    address.toLowerCase()
+                )
             })
         )
         const checkedNetworks = supportedNamespaces.eip155.chains
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts
index d8339e05ee..f5d382b67d 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts
@@ -1,4 +1,3 @@
-import { getAddressFromAccountForNetwork } from '@core/account'
 import { clearSessionInitiationRequest, getWalletClient, persistDapp } from '../stores'
 import { clearOldPairings } from './clearOldPairings'
 import { Web3WalletTypes } from '@walletconnect/web3wallet'
@@ -9,7 +8,7 @@ import { NetworkId, getEvmNetwork } from '@core/network'
 import { AuthTypes } from '@walletconnect/types'
 import { ISelections } from '../interface'
 import { signMessage } from '@core/wallet'
-import { normalizeSessionNamespace } from '../utils'
+import { getCaip10AddressForAccount, normalizeSessionNamespace } from '../utils'
 
 export async function approveSessionAuthenticate(
     sessionProposal: Web3WalletTypes.SessionAuthenticate,
@@ -36,7 +35,10 @@ export async function approveSessionAuthenticate(
         }
 
         for (const account of selections.accounts ?? []) {
-            const address = `${chain}:${getAddressFromAccountForNetwork(account, network.id)}`
+            const address = getCaip10AddressForAccount(account, network.id)
+            if (!address) {
+                continue
+            }
 
             const message = walletClient.formatAuthMessage({
                 request: authPayload,

From 14842f107d85612247714404fd6bcd2841c7e06b Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Tue, 25 Jun 2024 17:29:47 +0200
Subject: [PATCH 21/24] cleanup session

---
 .../actions/approveSessionAuthenticate.ts         | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts b/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts
index f5d382b67d..bbd364d293 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/actions/approveSessionAuthenticate.ts
@@ -5,10 +5,11 @@ import { DappVerification } from '../enums'
 import { GENERAL_SUPPORTED_METHODS } from '../constants'
 import { populateAuthPayload, buildAuthObject } from '@walletconnect/utils'
 import { NetworkId, getEvmNetwork } from '@core/network'
-import { AuthTypes } from '@walletconnect/types'
+import { AuthTypes, SessionTypes } from '@walletconnect/types'
 import { ISelections } from '../interface'
 import { signMessage } from '@core/wallet'
 import { getCaip10AddressForAccount, normalizeSessionNamespace } from '../utils'
+import { SupportedNamespaces } from '../types'
 
 export async function approveSessionAuthenticate(
     sessionProposal: Web3WalletTypes.SessionAuthenticate,
@@ -66,9 +67,19 @@ export async function approveSessionAuthenticate(
     const dappUrl = sessionProposal.params.requester.metadata.url
     await clearOldPairings(dappUrl)
     persistDapp(dappUrl, DappVerification.Unknown, {
-        supported: normalizeSessionNamespace(session.namespaces),
+        supported: cleanupNamespaces(session.namespaces),
         required: session.requiredNamespaces,
         optional: session.optionalNamespaces,
     })
     clearSessionInitiationRequest()
 }
+
+// This is needed because the returned namespaces from the wallet connect client can contain duplicated chains
+function cleanupNamespaces(namespaces: SessionTypes.Namespaces): SupportedNamespaces {
+    const normalizedNamespaces = normalizeSessionNamespace(namespaces)
+    for (const key in normalizedNamespaces) {
+        const namespace = normalizedNamespaces[key]
+        namespace.chains = [...new Set(namespace.chains)]
+    }
+    return normalizedNamespaces
+}

From da99aae8bc668979cadc4a33b2705a16064a9470 Mon Sep 17 00:00:00 2001
From: Mark Nardi <nardimark7@gmail.com>
Date: Wed, 26 Jun 2024 09:23:16 +0200
Subject: [PATCH 22/24] show different description

---
 .../views/ConnectionRequest.svelte            | 12 ++-------
 .../views/ConnectionRequestDrawer.svelte      | 26 ++++++++++++++++---
 .../dapp-config/views/OneClickAuthFlow.svelte | 16 ++++++++++--
 .../views/SessionProposalFlow.svelte          | 17 ++++++++++--
 .../views/SessionProposalFlowShared.svelte    | 12 ++-------
 5 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
index c8f4de054f..7b947845f3 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, Table } from '@bloomwalletio/ui'
+    import { Button } from '@bloomwalletio/ui'
     import { DappInfo } from '@ui'
     import { localize } from '@core/i18n'
     import { Router } from '@core/router'
@@ -97,15 +97,7 @@
         </div>
         <div class="flex-grow overflow-hidden">
             <div class="h-full overflow-scroll flex flex-col gap-5 p-6">
-                <Table
-                    items={[
-                        {
-                            key: localize('general.description'),
-                            value: dappMetadata.description,
-                        },
-                    ]}
-                    orientation="vertical"
-                />
+                <slot />
             </div>
         </div>
         {#if !fulfillsRequirements}
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
index 63e703cde5..0e087e17b5 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequestDrawer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button, Spinner } from '@bloomwalletio/ui'
+    import { Button, Spinner, Table } from '@bloomwalletio/ui'
     import { sessionInitiationRequest } from '@auxiliary/wallet-connect/stores'
     import {
         getNetworksAndMethodsFromNamespaces,
@@ -97,7 +97,17 @@
         {requiredMethods}
         {drawerRouter}
         expiryTimestamp={$sessionInitiationRequest.payload.params.expiryTimestamp}
-    />
+    >
+        <Table
+            items={[
+                {
+                    key: localize('general.description'),
+                    value: dappMetadata.description,
+                },
+            ]}
+            orientation="vertical"
+        />
+    </ConnectionRequest>
 {:else if $sessionInitiationRequest?.type === 'session_authenticate'}
     {@const { dappMetadata, verifiedState, requiredNetworks, optionalNetworks, requiredMethods } =
         getConnectionRequestDataFromSessionAuthenticate($sessionInitiationRequest.payload)}
@@ -109,7 +119,17 @@
         {requiredMethods}
         {drawerRouter}
         expiryTimestamp={$sessionInitiationRequest.payload.params.expiryTimestamp}
-    />
+    >
+        <Table
+            items={[
+                {
+                    key: localize('general.message'),
+                    value: $sessionInitiationRequest.payload.params.authPayload.statement,
+                },
+            ]}
+            orientation="vertical"
+        />
+    </ConnectionRequest>
 {:else}
     <DrawerTemplate
         title={localize(`${localeKey}.title`)}
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
index 5df0b6a7ed..45582d077b 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/OneClickAuthFlow.svelte
@@ -13,6 +13,8 @@
     import { SupportedNamespaces } from '@auxiliary/wallet-connect/types'
     import { EvmNetworkId } from '@core/network'
     import { activeAccounts } from '@core/profile/stores'
+    import { Table } from '@bloomwalletio/ui'
+    import { localize } from '@core/i18n'
 
     export let drawerRouter: Router<unknown>
     export let sessionProposal: Web3WalletTypes.SessionAuthenticate
@@ -89,7 +91,7 @@
 
 <SessionProposalFlowShared
     {drawerRouter}
-    dappMetadata={sessionProposal.params.requester.metadata}
+    {dappMetadata}
     {verifiedState}
     expiryTimestamp={sessionProposal.params.expiryTimestamp}
     {requiredNamespaces}
@@ -97,4 +99,14 @@
     {supportedNamespaces}
     confirmButtonLocaleKey="actions.signIn"
     {onConfirm}
-/>
+>
+    <Table
+        items={[
+            {
+                key: localize('general.message'),
+                value: sessionProposal.params.authPayload.statement,
+            },
+        ]}
+        orientation="vertical"
+    />
+</SessionProposalFlowShared>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
index 064af5c8a8..8780bdd9d8 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlow.svelte
@@ -9,6 +9,8 @@
     import { Router } from '@core/router'
     import { Web3WalletTypes } from '@walletconnect/web3wallet'
     import { SessionProposalFlowShared } from '.'
+    import { Table } from '@bloomwalletio/ui'
+    import { localize } from '@core/i18n'
 
     export let drawerRouter: Router<unknown>
     export let sessionProposal: Web3WalletTypes.SessionProposal
@@ -17,6 +19,7 @@
         ? DappVerification.Scam
         : (sessionProposal.verifyContext.verified.validation as DappVerification)
 
+    const dappMetadata = sessionProposal.params.proposer.metadata
     const requiredNamespaces = sessionProposal.params.requiredNamespaces
     const optionalNamespaces = sessionProposal.params.optionalNamespaces
 
@@ -65,7 +68,7 @@
 
 <SessionProposalFlowShared
     {drawerRouter}
-    dappMetadata={sessionProposal.params.proposer.metadata}
+    {dappMetadata}
     {verifiedState}
     expiryTimestamp={sessionProposal.params.expiryTimestamp}
     {requiredNamespaces}
@@ -73,4 +76,14 @@
     {supportedNamespaces}
     confirmButtonLocaleKey="actions.confirm"
     {onConfirm}
-/>
+>
+    <Table
+        items={[
+            {
+                key: localize('general.description'),
+                value: dappMetadata.description,
+            },
+        ]}
+        orientation="vertical"
+    />
+</SessionProposalFlowShared>
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlowShared.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlowShared.svelte
index 6d53da36ae..e065459129 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlowShared.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/SessionProposalFlowShared.svelte
@@ -7,7 +7,7 @@
         getNetworksAndMethodsFromNamespaces,
         rejectAndClearSessionInitiationRequest,
     } from '@auxiliary/wallet-connect/utils'
-    import { Button, Table } from '@bloomwalletio/ui'
+    import { Button } from '@bloomwalletio/ui'
     import { DrawerTemplate } from '@components'
     import { IAccountState } from '@core/account'
     import { time } from '@core/app/stores'
@@ -110,15 +110,7 @@
         <div class="px-6 flex-grow overflow-hidden">
             {#if activeSelection === Selection.Summary}
                 <div class="h-full overflow-auto space-y-6">
-                    <Table
-                        items={[
-                            {
-                                key: localize('general.description'),
-                                value: dappMetadata.description,
-                            },
-                        ]}
-                        orientation="vertical"
-                    />
+                    <slot />
                     <ConnectionSummary
                         {requiredNamespaces}
                         editable

From 00f4466ae2ee699a60a1fce3ae31745beeff494e Mon Sep 17 00:00:00 2001
From: Nicole O'Brien <nicole@bloomwallet.io>
Date: Wed, 26 Jun 2024 10:02:39 +0100
Subject: [PATCH 23/24] pr review comments

Co-authored-by: Mark Nardi <nardimark7@gmail.com>
---
 .../views/ConnectionRequest.svelte            | 26 +++++++++----------
 .../stores/connected-dapps.store.ts           | 21 +++------------
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
index 7b947845f3..e2a3e43763 100644
--- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
+++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectionRequest.svelte
@@ -29,17 +29,17 @@
 
     $: hasRequestExpired = expiryTimestamp ? expiryTimestamp - $time.getTime() / MILLISECONDS_PER_SECOND <= 0 : false
 
-    const fulfillsRequirements = doesFulfillsRequirements()
-    function doesFulfillsRequirements(): boolean {
+    const fulfilsRequirements = doesFulfilsRequirements()
+    function doesFulfilsRequirements(): boolean {
         const supportedNetworksByDapp = [...requiredNetworks, ...optionalNetworks]
 
         return (
-            doesFulfillNetworkRequirements(requiredNetworks, supportedNetworksByDapp) &&
-            doesFulfillMethodRequirements(requiredMethods)
+            doesFulfilNetworkRequirements(requiredNetworks, supportedNetworksByDapp) &&
+            doesFulfilMethodRequirements(requiredMethods)
         )
     }
 
-    function doesFulfillNetworkRequirements(requiredNetworks: string[], optionalNetworks: string[]): boolean {
+    function doesFulfilNetworkRequirements(requiredNetworks: string[], optionalNetworks: string[]): boolean {
         const supportedNetworksByProfile = getAllNetworkIds()
 
         const supportsAllRequiredNetworks = requiredNetworks.every((networkId) =>
@@ -57,7 +57,7 @@
         return true
     }
 
-    function doesFulfillMethodRequirements(requiredMethods: RpcMethod[]): boolean {
+    function doesFulfilMethodRequirements(requiredMethods: RpcMethod[]): boolean {
         return requiredMethods.every((method) => ALL_SUPPORTED_METHODS.includes(method))
     }
 
@@ -79,11 +79,11 @@
     }
 
     onMount(() => {
-        const fulfillsRequirements =
-            doesFulfillNetworkRequirements(requiredNetworks, optionalNetworks) &&
-            doesFulfillMethodRequirements(requiredMethods)
+        const fulfilsRequirements =
+            doesFulfilNetworkRequirements(requiredNetworks, optionalNetworks) &&
+            doesFulfilMethodRequirements(requiredMethods)
 
-        if (fulfillsRequirements && verifiedState === DappVerification.Valid) {
+        if (fulfilsRequirements && verifiedState === DappVerification.Valid) {
             drawerRouter.next()
         }
     })
@@ -100,7 +100,7 @@
                 <slot />
             </div>
         </div>
-        {#if !fulfillsRequirements}
+        {#if !fulfilsRequirements}
             <div class="px-6">
                 <UnsupportedDappHint {requiredNetworks} {optionalNetworks} {requiredMethods} />
             </div>
@@ -115,9 +115,9 @@
             width="full"
             variant="outlined"
             on:click={onRejectClick}
-            text={localize(`actions.${fulfillsRequirements && !hasRequestExpired ? 'reject' : 'cancel'}`)}
+            text={localize(`actions.${fulfilsRequirements && !hasRequestExpired ? 'reject' : 'cancel'}`)}
         />
-        {#if fulfillsRequirements && verifiedState !== DappVerification.Scam}
+        {#if fulfilsRequirements && verifiedState !== DappVerification.Scam}
             <Button width="full" on:click={onContinueClick} text={localize('actions.continue')} />
         {/if}
     </div>
diff --git a/packages/shared/src/lib/auxiliary/wallet-connect/stores/connected-dapps.store.ts b/packages/shared/src/lib/auxiliary/wallet-connect/stores/connected-dapps.store.ts
index 4a4dd78459..4dd11c8d42 100644
--- a/packages/shared/src/lib/auxiliary/wallet-connect/stores/connected-dapps.store.ts
+++ b/packages/shared/src/lib/auxiliary/wallet-connect/stores/connected-dapps.store.ts
@@ -1,8 +1,7 @@
-import { type Writable, get, writable } from 'svelte/store'
-import { getWalletClient } from './wallet-client.store'
+import { get, writable, type Writable } from 'svelte/store'
 import type { IConnectedDapp } from '../interface/connected-dapp.interface'
-import type { ISupportedNamespace } from '../types'
-import type { SessionTypes } from '@walletconnect/types'
+import { normalizeSessionNamespace } from '../utils'
+import { getWalletClient } from './wallet-client.store'
 
 export const connectedDapps: Writable<IConnectedDapp[]> = writable([])
 
@@ -50,17 +49,3 @@ export function getConnectedDappByOrigin(origin: string): IConnectedDapp | undef
 export function getConnectedDappBySessionTopic(sessionTopic: string): IConnectedDapp | undefined {
     return get(connectedDapps).find((dapp) => dapp.sessionTopic === sessionTopic)
 }
-
-function normalizeSessionNamespace(sessionNamespace: SessionTypes.Namespaces): Record<string, ISupportedNamespace> {
-    const normalizedRecord: Record<string, ISupportedNamespace> = {}
-
-    for (const key in sessionNamespace) {
-        const session = sessionNamespace[key]
-        normalizedRecord[key] = {
-            ...session,
-            chains: session.chains || [],
-        }
-    }
-
-    return normalizedRecord
-}

From 9f446af17da5816621cc0280937386fe3f21cbb1 Mon Sep 17 00:00:00 2001
From: Nicole O'Brien <nicole@bloomwallet.io>
Date: Wed, 26 Jun 2024 10:13:47 +0100
Subject: [PATCH 24/24] type issues

---
 packages/desktop/components/menus/DappActionsMenu.svelte        | 2 +-
 .../dashboard/drawers/dapp-config/components/DappCard.svelte    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/desktop/components/menus/DappActionsMenu.svelte b/packages/desktop/components/menus/DappActionsMenu.svelte
index 74ea11a42d..e933fa6ff9 100644
--- a/packages/desktop/components/menus/DappActionsMenu.svelte
+++ b/packages/desktop/components/menus/DappActionsMenu.svelte
@@ -35,7 +35,7 @@
     ]
 
     $: dappName = dapp.metadata?.name ?? localize('general.unknown')
-    $: hasActiveSession = !!dapp.session
+    $: hasActiveSession = !!dapp.sessionTopic
 
     function onRemoveClick(): void {
         openPopup({
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 0ecea8e1ae..55bc76db15 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 ?? '')?.supported ?? {}
+        dapp.namespaces ?? getPersistedDappNamespacesForDapp(dapp.metadata?.url ?? '')?.supported ?? {}
     ).flatMap((namespace) => namespace.chains as NetworkId[])
 
     $: verifiedState = $activeProfileId