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>