diff --git a/packages/desktop/components/evm-transactions/EvmDappRequestHeader.svelte b/packages/desktop/components/evm-transactions/EvmDappRequestHeader.svelte
new file mode 100644
index 0000000000..f6fdd047ed
--- /dev/null
+++ b/packages/desktop/components/evm-transactions/EvmDappRequestHeader.svelte
@@ -0,0 +1,17 @@
+<script lang="ts">
+    import { WCRequestInfo } from '@auxiliary/wallet-connect/types'
+    import { DappInfo } from '@ui'
+    import { RequestExpirationAlert } from '@views/dashboard/drawers/dapp-config/components'
+
+    export let requestInfo: WCRequestInfo
+</script>
+
+{#if requestInfo.dapp}
+    <DappInfo
+        metadata={requestInfo.dapp.metadata}
+        verifiedState={requestInfo.verifiedState}
+        showLink={false}
+        classes="bg-surface-1 dark:bg-surface-1-dark pb-4"
+    />
+    <RequestExpirationAlert expiryTimestamp={requestInfo.expiryTimestamp} />
+{/if}
diff --git a/packages/desktop/components/evm-transactions/index.ts b/packages/desktop/components/evm-transactions/index.ts
index b500a4327a..15f14fa34e 100644
--- a/packages/desktop/components/evm-transactions/index.ts
+++ b/packages/desktop/components/evm-transactions/index.ts
@@ -1,3 +1,6 @@
+export { default as EvmDappRequestHeader } from './EvmDappRequestHeader.svelte'
 export { default as EvmSmartContractAlert } from './EvmSmartContractAlert.svelte'
 export { default as EvmTokenApprovalAlert } from './EvmTokenApprovalAlert.svelte'
 export { default as EvmTransactionAlert } from './EvmTransactionAlert.svelte'
+
+export * from './transaction-views'
diff --git a/packages/desktop/components/evm-transactions/transaction-views/EvmBaseCoinTransferView.svelte b/packages/desktop/components/evm-transactions/transaction-views/EvmBaseCoinTransferView.svelte
new file mode 100644
index 0000000000..74b18cb992
--- /dev/null
+++ b/packages/desktop/components/evm-transactions/transaction-views/EvmBaseCoinTransferView.svelte
@@ -0,0 +1,40 @@
+<script lang="ts">
+    import { RpcMethod } from '@auxiliary/wallet-connect/enums'
+    import { localize } from '@core/i18n'
+    import { TransactionAssetSection } from '@ui'
+    import PopupTemplate, { ButtonProps } from '@components/popup/PopupTemplate.svelte'
+    import { Subject, TokenTransferData } from '@core/wallet'
+    import { getNameFromSubject } from '@core/activity/utils'
+
+    export let baseCoinTransfer: TokenTransferData
+    export let method: RpcMethod.EthSendTransaction | RpcMethod.EthSignTransaction | RpcMethod.EthSendRawTransaction
+    export let recipient: Subject
+    export let continueButton: ButtonProps
+    export let backButton: ButtonProps
+    export let busy = false
+
+    $: localeKey = method === RpcMethod.EthSignTransaction ? 'signTransaction' : 'sendTransaction'
+</script>
+
+<PopupTemplate
+    title={localize(`popups.${localeKey}.title`, {
+        asset: baseCoinTransfer.token?.metadata?.name,
+        recipient: getNameFromSubject(recipient),
+    })}
+    {backButton}
+    continueButton={{
+        ...continueButton,
+        text: localize(`popups.${localeKey}.action`),
+    }}
+    {busy}
+>
+    <svelte:fragment slot="banner">
+        {#if $$slots.dappHeader}
+            <slot name="dappHeader" />
+        {/if}
+    </svelte:fragment>
+    <div class="flex flex-col space-y-5">
+        <TransactionAssetSection {baseCoinTransfer} />
+        <slot name="transactionDetails" />
+    </div>
+</PopupTemplate>
diff --git a/packages/desktop/components/evm-transactions/transaction-views/EvmNftTransferView.svelte b/packages/desktop/components/evm-transactions/transaction-views/EvmNftTransferView.svelte
new file mode 100644
index 0000000000..a2ffe237c7
--- /dev/null
+++ b/packages/desktop/components/evm-transactions/transaction-views/EvmNftTransferView.svelte
@@ -0,0 +1,45 @@
+<script lang="ts">
+    import { RpcMethod } from '@auxiliary/wallet-connect/enums'
+    import PopupTemplate, { ButtonProps } from '@components/popup/PopupTemplate.svelte'
+    import { selectedAccount } from '@core/account/stores'
+    import { getNameFromSubject } from '@core/activity'
+    import { localize } from '@core/i18n'
+    import { getNftByIdForAccount } from '@core/nfts/stores'
+    import { Subject, TokenTransferData } from '@core/wallet/types'
+    import { TransactionAssetSection } from '@ui'
+
+    export let baseCoinTransfer: TokenTransferData
+    export let nftId: string
+    export let recipient: Subject
+    export let method: RpcMethod.EthSendTransaction | RpcMethod.EthSignTransaction | RpcMethod.EthSendRawTransaction
+    export let continueButton: ButtonProps
+    export let backButton: ButtonProps
+    export let busy = false
+
+    $: nft = getNftByIdForAccount($selectedAccount?.index, nftId)
+
+    $: localeKey = method === RpcMethod.EthSignTransaction ? 'signTransaction' : 'sendTransaction'
+</script>
+
+<PopupTemplate
+    title={localize(`popups.${localeKey}.title`, {
+        asset: nft?.metadata?.name,
+        recipient: getNameFromSubject(recipient),
+    })}
+    {backButton}
+    continueButton={{
+        ...continueButton,
+        text: localize(`popups.${localeKey}.action`),
+    }}
+    {busy}
+>
+    <svelte:fragment slot="banner">
+        {#if $$slots.dappHeader}
+            <slot name="dappHeader" />
+        {/if}
+    </svelte:fragment>
+    <div class="flex flex-col space-y-5">
+        <TransactionAssetSection {baseCoinTransfer} {nft} />
+        <slot name="transactionDetails" />
+    </div>
+</PopupTemplate>
diff --git a/packages/desktop/components/evm-transactions/transaction-views/EvmSmartContractView.svelte b/packages/desktop/components/evm-transactions/transaction-views/EvmSmartContractView.svelte
new file mode 100644
index 0000000000..1c172eb1a4
--- /dev/null
+++ b/packages/desktop/components/evm-transactions/transaction-views/EvmSmartContractView.svelte
@@ -0,0 +1,42 @@
+<script lang="ts">
+    import { localize } from '@core/i18n'
+    import { TransactionAssetSection } from '@ui'
+    import { EvmNetworkId } from '@core/network'
+    import PopupTemplate, { ButtonProps } from '@components/popup/PopupTemplate.svelte'
+    import { TokenTransferData } from '@core/wallet/types'
+    import EvmSmartContractAlert from '../EvmSmartContractAlert.svelte'
+    import { IParsedSmartContractData } from '@core/layer-2/interfaces'
+    import { truncateString } from '@core/utils/string'
+
+    export let baseCoinTransfer: TokenTransferData
+
+    export let parsedData: IParsedSmartContractData
+    export let contractAddress: string
+    export let networkId: EvmNetworkId
+    export let continueButton: ButtonProps
+    export let backButton: ButtonProps
+    export let busy = false
+
+    const localeKey = 'popups.smartContractCall'
+</script>
+
+<PopupTemplate
+    title={localize(`${localeKey}.title`, { contractAddress: truncateString(contractAddress, 6, 6) })}
+    {backButton}
+    continueButton={{
+        ...continueButton,
+        text: localize(`${localeKey}.action`),
+    }}
+    {busy}
+>
+    <svelte:fragment slot="banner">
+        {#if $$slots.dappHeader}
+            <slot name="dappHeader" />
+        {/if}
+    </svelte:fragment>
+    <div class="flex flex-col space-y-5">
+        <TransactionAssetSection {baseCoinTransfer} />
+        <EvmSmartContractAlert parsedSmartContract={parsedData} {networkId} />
+        <slot name="transactionDetails" />
+    </div>
+</PopupTemplate>
diff --git a/packages/desktop/components/evm-transactions/transaction-views/EvmTokenApprovalView.svelte b/packages/desktop/components/evm-transactions/transaction-views/EvmTokenApprovalView.svelte
new file mode 100644
index 0000000000..ae55defc14
--- /dev/null
+++ b/packages/desktop/components/evm-transactions/transaction-views/EvmTokenApprovalView.svelte
@@ -0,0 +1,68 @@
+<script lang="ts">
+    import { localize } from '@core/i18n'
+    import PopupTemplate, { ButtonProps } from '@components/popup/PopupTemplate.svelte'
+    import EvmTokenApprovalAlert from '../EvmTokenApprovalAlert.svelte'
+    import { EvmNetworkId } from '@core/network/types'
+    import { IParsedTokenApproval } from '@core/layer-2'
+    import { TokenTransferData } from '@core/wallet'
+    import { TransactionAssetSection } from '@ui'
+    import { Alert, Checkbox } from '@bloomwalletio/ui'
+    import { truncateString } from '@core/utils'
+    import { getTokenFromSelectedAccountTokens, selectedAccountTokens } from '@core/token/stores'
+    import { ITokenWithBalance } from '@core/token'
+
+    export let parsedTokenApproval: IParsedTokenApproval
+    export let baseCoinTransfer: TokenTransferData
+    export let dappName: string | undefined
+    export let continueButton: ButtonProps
+    export let backButton: ButtonProps
+    export let networkId: EvmNetworkId
+    export let busy = false
+
+    let bypassSecurityWarning = false
+
+    $: tokens = [
+        $selectedAccountTokens?.[networkId]?.baseCoin,
+        ...($selectedAccountTokens?.[networkId]?.nativeTokens ?? []),
+    ].filter(Boolean) as ITokenWithBalance[]
+    $: tokenBalance = tokens.find((token) => token.id === parsedTokenApproval.tokenId)?.balance.available ?? BigInt(0)
+    $: hasSecurityWarning = baseCoinTransfer.rawAmount > BigInt(0) || parsedTokenApproval.rawAmount > tokenBalance
+
+    const token = getTokenFromSelectedAccountTokens(parsedTokenApproval.tokenId, networkId)
+    const localeKey = 'popups.tokenApproval'
+</script>
+
+<PopupTemplate
+    title={localize(`${localeKey}.title`, {
+        dappName: dappName ?? parsedTokenApproval.spender,
+        assetName: token?.metadata?.name ?? truncateString(parsedTokenApproval.tokenId, 6, 6),
+    })}
+    {backButton}
+    continueButton={{
+        ...continueButton,
+        text: localize(`${localeKey}.action`),
+        disabled: continueButton.disabled || (hasSecurityWarning && !bypassSecurityWarning),
+    }}
+    {busy}
+>
+    <svelte:fragment slot="banner">
+        {#if $$slots.dappHeader}
+            <slot name="dappHeader" />
+        {/if}
+    </svelte:fragment>
+    <div class="flex flex-col space-y-5">
+        <TransactionAssetSection {baseCoinTransfer} />
+        <EvmTokenApprovalAlert {parsedTokenApproval} {networkId} />
+        <slot name="transactionDetails" />
+        {#if baseCoinTransfer.rawAmount > BigInt(0)}
+            <!-- Display alert if token approval is also trying to consume value -->
+            <Alert variant="danger" text="Beware this approval transaction is also trying to consume base tokens!" />
+        {:else if parsedTokenApproval.rawAmount > tokenBalance}
+            <Alert variant="warning" text={localize(`${localeKey}.approveMoreThanBalanceWarning`)}>
+                <checkbox-container slot="body">
+                    <Checkbox label={localize(`${localeKey}.accept`)} bind:checked={bypassSecurityWarning} />
+                </checkbox-container>
+            </Alert>
+        {/if}
+    </div>
+</PopupTemplate>
diff --git a/packages/desktop/components/evm-transactions/transaction-views/EvmTokenTransferView.svelte b/packages/desktop/components/evm-transactions/transaction-views/EvmTokenTransferView.svelte
new file mode 100644
index 0000000000..7fe86e4728
--- /dev/null
+++ b/packages/desktop/components/evm-transactions/transaction-views/EvmTokenTransferView.svelte
@@ -0,0 +1,47 @@
+<script lang="ts">
+    import { RpcMethod } from '@auxiliary/wallet-connect/enums'
+    import PopupTemplate, { ButtonProps } from '@components/popup/PopupTemplate.svelte'
+    import { getNameFromSubject } from '@core/activity/utils'
+    import { localize } from '@core/i18n'
+    import { IEvmNetwork } from '@core/network'
+    import { getTokenFromSelectedAccountTokens } from '@core/token/stores'
+    import { Subject, TokenTransferData } from '@core/wallet/types'
+    import { TransactionAssetSection } from '@ui'
+
+    export let baseCoinTransfer: TokenTransferData
+    export let tokenId: string
+    export let rawAmount: bigint
+    export let recipient: Subject
+    export let method: RpcMethod.EthSendTransaction | RpcMethod.EthSignTransaction | RpcMethod.EthSendRawTransaction
+    export let evmNetwork: IEvmNetwork
+    export let continueButton: ButtonProps
+    export let backButton: ButtonProps
+    export let busy = false
+
+    $: token = getTokenFromSelectedAccountTokens(tokenId, evmNetwork.id)
+
+    $: localeKey = method === RpcMethod.EthSignTransaction ? 'signTransaction' : 'sendTransaction'
+</script>
+
+<PopupTemplate
+    title={localize(`popups.${localeKey}.title`, {
+        asset: token?.metadata?.name,
+        recipient: getNameFromSubject(recipient),
+    })}
+    {backButton}
+    continueButton={{
+        ...continueButton,
+        text: localize(`popups.${localeKey}.action`),
+    }}
+    {busy}
+>
+    <svelte:fragment slot="banner">
+        {#if $$slots.dappHeader}
+            <slot name="dappHeader" />
+        {/if}
+    </svelte:fragment>
+    <div class="flex flex-col space-y-5">
+        <TransactionAssetSection {baseCoinTransfer} tokenTransfer={{ token, rawAmount }} />
+        <slot name="transactionDetails" />
+    </div>
+</PopupTemplate>
diff --git a/packages/desktop/components/evm-transactions/transaction-views/index.ts b/packages/desktop/components/evm-transactions/transaction-views/index.ts
new file mode 100644
index 0000000000..a36aba41c8
--- /dev/null
+++ b/packages/desktop/components/evm-transactions/transaction-views/index.ts
@@ -0,0 +1,5 @@
+export { default as EvmBaseCoinTransferView } from './EvmBaseCoinTransferView.svelte'
+export { default as EvmNftTransferView } from './EvmNftTransferView.svelte'
+export { default as EvmSmartContractView } from './EvmSmartContractView.svelte'
+export { default as EvmTokenApprovalView } from './EvmTokenApprovalView.svelte'
+export { default as EvmTokenTransferView } from './EvmTokenTransferView.svelte'
diff --git a/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte b/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte
index 639772f2c0..69166b766c 100644
--- a/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte
+++ b/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
     import { RpcMethod } from '@auxiliary/wallet-connect/enums'
     import { WCRequestInfo } from '@auxiliary/wallet-connect/types'
-    import { EvmTokenApprovalAlert } from '@components'
-    import { EvmSmartContractAlert } from '@components/evm-transactions'
+    import { EvmTokenApprovalView, EvmBaseCoinTransferView, EvmDappRequestHeader } from '@components'
     import { IAccountState } from '@core/account'
     import { getSelectedAccount, selectedAccount } from '@core/account/stores'
     import { handleError } from '@core/error/handlers'
@@ -26,12 +25,11 @@
     import { sendAndPersistTransactionFromEvm, signEvmTransaction } from '@core/wallet/actions'
     import { PopupId, closePopup, modifyPopupState, openPopup } from '@desktop/auxiliary/popup'
     import { LegacyTransaction } from '@ethereumjs/tx'
-    import { DappInfo, TransactionAssetSection } from '@ui'
     import { EvmTransactionDetails } from '@views/dashboard/send-flow/views/components'
     import { onDestroy, onMount } from 'svelte'
-    import PopupTemplate from '../PopupTemplate.svelte'
-    import { RequestExpirationAlert } from '@views/dashboard/drawers/dapp-config/components'
     import { time } from '@core/app/stores'
+    import { EvmNftTransferView, EvmSmartContractView, EvmTokenTransferView } from '@components/evm-transactions'
+    import { getSubjectFromAddress } from '@core/wallet'
 
     export let preparedTransaction: EvmTransactionData
     export let requestInfo: WCRequestInfo
@@ -39,7 +37,7 @@
 
     let busy = false
 
-    const { dapp, responseCallback, verifiedState, evmNetwork, expiryTimestamp } = requestInfo
+    const { dapp, responseCallback, evmNetwork, expiryTimestamp } = requestInfo
     let parsedData: ParsedSmartContractData | undefined
 
     let selectedGasSpeed = GasSpeed.Required
@@ -55,7 +53,7 @@
     $: preparedTransaction.gasPrice = Converter.bigIntToHex(gasPrices?.[selectedGasSpeed] ?? gasPrices.required)
     $: baseCoinTransfer = {
         token: getTokenFromSelectedAccountTokens(BASE_TOKEN_ID, evmNetwork.id),
-        rawAmount: Converter.bigIntLikeToBigInt(preparedTransaction.value),
+        rawAmount: Converter.bigIntLikeToBigInt(preparedTransaction.value ?? 0),
     }
     $: hasExpired =
         expiryTimestamp === undefined ? false : expiryTimestamp * MILLISECONDS_PER_SECOND - $time.getTime() <= 0
@@ -76,39 +74,6 @@
         )
     }
 
-    $: localeKey = getLocalKey(parsedData?.type)
-    function getLocalKey(type?: ParsedSmartContractType): string {
-        if (method === RpcMethod.EthSignTransaction) {
-            return 'signTransaction'
-        }
-        switch (type) {
-            case ParsedSmartContractType.CoinTransfer:
-            case ParsedSmartContractType.TokenTransfer:
-            case ParsedSmartContractType.NftTransfer:
-                return 'sendTransaction'
-            case ParsedSmartContractType.TokenApproval:
-                return 'tokenApproval'
-            case ParsedSmartContractType.SmartContract:
-            default:
-                return 'smartContractCall'
-        }
-    }
-
-    $: title = getTitle(parsedData)
-    function getTitle(data?: ParsedSmartContractData): string {
-        const locale = `popups.${localeKey}.title`
-
-        if (data?.type === ParsedSmartContractType.TokenApproval) {
-            const token = getTokenFromSelectedAccountTokens(data.tokenId, evmNetwork.id)
-            return localize(locale, {
-                dappName: dapp?.metadata?.name ?? data.spender,
-                assetName: token?.metadata?.name ?? truncateString(data.tokenId, 6, 6),
-            })
-        }
-
-        return localize(locale, { contractAddress: truncateString(String(preparedTransaction.to), 6, 6) })
-    }
-
     async function getSignedTransaction(account: IAccountState): Promise<string> {
         if (preparedTransaction?.v && preparedTransaction?.s && preparedTransaction?.r) {
             const transaction = LegacyTransaction.fromTxData(preparedTransaction)
@@ -153,10 +118,7 @@
             modifyPopupState({ preventClose: false }, true)
             busy = false
 
-            const successMessage = localize(`popups.${localeKey}.success`, {
-                recipient: truncateString(String(preparedTransaction.to), 6, 6),
-                assetName: getAssetName(),
-            })
+            const successMessage = getSuccessMessage(parsedData)
             if (dapp) {
                 openPopup({
                     id: PopupId.SuccessfulDappInteraction,
@@ -175,17 +137,44 @@
         }
     }
 
-    function getAssetName(): string {
+    function getSuccessMessage(parsedData: ParsedSmartContractData | undefined): string {
+        let localeKey = ''
+        if (method === RpcMethod.EthSignTransaction) {
+            localeKey = 'popups.signTransaction'
+        } else {
+            switch (parsedData?.type) {
+                case ParsedSmartContractType.CoinTransfer:
+                case ParsedSmartContractType.TokenTransfer:
+                case ParsedSmartContractType.NftTransfer:
+                    localeKey = 'popups.sendTransaction'
+                    break
+                case ParsedSmartContractType.TokenApproval:
+                    localeKey = 'popups.tokenApproval'
+                    break
+                case ParsedSmartContractType.SmartContract:
+                default:
+                    localeKey = 'popups.smartContractCall'
+                    break
+            }
+        }
+
+        let assetName = ''
         switch (parsedData?.type) {
             case ParsedSmartContractType.CoinTransfer:
-                return getTokenFromSelectedAccountTokens(BASE_TOKEN_ID, evmNetwork.id)?.metadata?.name ?? ''
+                assetName = getTokenFromSelectedAccountTokens(BASE_TOKEN_ID, evmNetwork.id)?.metadata?.name ?? ''
+                break
             case ParsedSmartContractType.TokenTransfer:
-                return getTokenFromSelectedAccountTokens(parsedData.tokenId, evmNetwork.id)?.metadata?.name ?? ''
+                assetName = getTokenFromSelectedAccountTokens(parsedData.tokenId, evmNetwork.id)?.metadata?.name ?? ''
+                break
             case ParsedSmartContractType.NftTransfer:
-                return getNftByIdForAccount($selectedAccount?.index, parsedData.nftId)?.metadata?.name ?? ''
+                assetName = getNftByIdForAccount($selectedAccount?.index, parsedData.nftId)?.metadata?.name ?? ''
+                break
             default:
-                return ''
+                assetName = ''
         }
+
+        const recipient = truncateString(String(preparedTransaction.to), 6, 6)
+        return localize(`${localeKey}.success`, { recipient, assetName })
     }
 
     function onCancelClick(): void {
@@ -201,61 +190,136 @@
     onDestroy(() => {
         clearInterval(intervalId)
     })
-</script>
 
-<PopupTemplate
-    {title}
-    backButton={{
+    const backButton = {
         text: localize('actions.cancel'),
         onClick: onCancelClick,
-    }}
-    continueButton={{
-        text: localize(`popups.${localeKey}.action`),
+    }
+
+    $: continueButton = {
+        text: 'REPLACED BY CHILD',
         onClick: onConfirmClick,
         disabled: hasExpired,
-    }}
-    {busy}
->
-    <svelte:fragment slot="banner">
-        {#if dapp}
-            <DappInfo
-                metadata={dapp.metadata}
-                {verifiedState}
-                showLink={false}
-                classes="bg-surface-1 dark:bg-surface-1-dark pb-4"
-            />
-            <RequestExpirationAlert {expiryTimestamp} />
-        {/if}
-    </svelte:fragment>
-    <div class="space-y-5">
-        {#if preparedTransaction.value}
-            <TransactionAssetSection {baseCoinTransfer} />
-        {/if}
-        {#if parsedData?.type === ParsedSmartContractType.CoinTransfer}
-            {@const baseCoinTransfer = {
-                token: getTokenFromSelectedAccountTokens(BASE_TOKEN_ID, evmNetwork.id),
-                rawAmount: parsedData.rawAmount,
-            }}
-            <TransactionAssetSection {baseCoinTransfer} />
-        {:else if parsedData?.type === ParsedSmartContractType.TokenTransfer}
-            {@const tokenTransfer = {
-                token: getTokenFromSelectedAccountTokens(parsedData.tokenId, evmNetwork.id),
-                rawAmount: parsedData.rawAmount,
-            }}
-            <TransactionAssetSection {tokenTransfer} />
-        {:else if parsedData?.type === ParsedSmartContractType.NftTransfer}
-            {@const nft = getNftByIdForAccount($selectedAccount?.index, parsedData.nftId)}
-            <TransactionAssetSection {nft} />
-        {:else if parsedData?.type === ParsedSmartContractType.TokenApproval}
-            <div class="flex flex-col gap-3">
-                <EvmTokenApprovalAlert parsedTokenApproval={parsedData} networkId={evmNetwork.id} />
-            </div>
-        {:else if parsedData?.type === ParsedSmartContractType.SmartContract}
-            <div class="flex flex-col gap-3">
-                <EvmSmartContractAlert parsedSmartContract={parsedData} networkId={evmNetwork.id} />
-            </div>
-        {/if}
+    }
+</script>
+
+<!-- Base Coin Transfers -->
+{#if (preparedTransaction.value && !parsedData) || parsedData?.type === ParsedSmartContractType.CoinTransfer}
+    {@const potentialAdditionalRawAmount =
+        parsedData?.type === ParsedSmartContractType.CoinTransfer ? parsedData?.rawAmount : BigInt(0)}
+    {@const recipientAddress =
+        parsedData?.type === ParsedSmartContractType.CoinTransfer
+            ? parsedData.recipientAddress
+            : String(preparedTransaction.to)}
+    {@const recipient = getSubjectFromAddress(recipientAddress, evmNetwork.id)}
+    <EvmBaseCoinTransferView
+        baseCoinTransfer={{ ...baseCoinTransfer, rawAmount: baseCoinTransfer.rawAmount + potentialAdditionalRawAmount }}
+        {method}
+        {evmNetwork}
+        {recipient}
+        {backButton}
+        {continueButton}
+        {busy}
+    >
+        <EvmDappRequestHeader slot="dappHeader" {requestInfo} />
+        <EvmTransactionDetails
+            slot="transactionDetails"
+            bind:selectedGasSpeed
+            sourceNetwork={evmNetwork}
+            destinationNetworkId={evmNetwork.id}
+            transaction={preparedTransaction}
+            {recipient}
+            {gasPrices}
+            {busy}
+        />
+    </EvmBaseCoinTransferView>
+    <!-- Evm Token Transfer -->
+{:else if parsedData?.type === ParsedSmartContractType.TokenTransfer}
+    {@const recipient = getSubjectFromAddress(parsedData.recipientAddress, evmNetwork.id)}
+    <EvmTokenTransferView
+        tokenId={parsedData.tokenId}
+        rawAmount={parsedData.rawAmount}
+        {baseCoinTransfer}
+        {recipient}
+        {method}
+        {evmNetwork}
+        {backButton}
+        {continueButton}
+        {busy}
+    >
+        <EvmDappRequestHeader slot="dappHeader" {requestInfo} />
+        <EvmTransactionDetails
+            slot="transactionDetails"
+            bind:selectedGasSpeed
+            sourceNetwork={evmNetwork}
+            destinationNetworkId={evmNetwork.id}
+            transaction={preparedTransaction}
+            {recipient}
+            {gasPrices}
+            {busy}
+        />
+    </EvmTokenTransferView>
+    <!-- Evm Nft Transfer -->
+{:else if parsedData?.type === ParsedSmartContractType.NftTransfer}
+    {@const recipient = getSubjectFromAddress(parsedData.recipientAddress, evmNetwork.id)}
+
+    <EvmNftTransferView
+        nftId={parsedData.nftId}
+        {baseCoinTransfer}
+        {recipient}
+        {method}
+        {backButton}
+        {continueButton}
+        {busy}
+    >
+        <EvmDappRequestHeader slot="dappHeader" {requestInfo} />
+        <EvmTransactionDetails
+            slot="transactionDetails"
+            bind:selectedGasSpeed
+            sourceNetwork={evmNetwork}
+            destinationNetworkId={evmNetwork.id}
+            transaction={preparedTransaction}
+            {gasPrices}
+            {busy}
+            {recipient}
+        />
+    </EvmNftTransferView>
+    <!-- Evm Token Approval -->
+{:else if parsedData?.type === ParsedSmartContractType.TokenApproval}
+    <EvmTokenApprovalView
+        {baseCoinTransfer}
+        parsedTokenApproval={parsedData}
+        networkId={evmNetwork.id}
+        dappName={dapp?.metadata?.name}
+        {backButton}
+        {continueButton}
+        {busy}
+    >
+        <EvmDappRequestHeader slot="dappHeader" {requestInfo} />
+        <EvmTransactionDetails
+            slot="transactionDetails"
+            bind:selectedGasSpeed
+            sourceNetwork={evmNetwork}
+            destinationNetworkId={evmNetwork.id}
+            transaction={preparedTransaction}
+            {gasPrices}
+            {busy}
+        />
+    </EvmTokenApprovalView>
+    <!-- Evm SmartContract -->
+{:else if parsedData?.type === ParsedSmartContractType.SmartContract}
+    <EvmSmartContractView
+        {baseCoinTransfer}
+        {parsedData}
+        networkId={evmNetwork.id}
+        {backButton}
+        {continueButton}
+        contractAddress={String(preparedTransaction.to ?? '')}
+        {busy}
+    >
+        <EvmDappRequestHeader slot="dappHeader" {requestInfo} />
         <EvmTransactionDetails
+            slot="transactionDetails"
             bind:selectedGasSpeed
             sourceNetwork={evmNetwork}
             destinationNetworkId={evmNetwork.id}
@@ -263,5 +327,5 @@
             {gasPrices}
             {busy}
         />
-    </div>
-</PopupTemplate>
+    </EvmSmartContractView>
+{/if}
diff --git a/packages/desktop/views/dashboard/send-flow/views/components/EvmTransactionDetails.svelte b/packages/desktop/views/dashboard/send-flow/views/components/EvmTransactionDetails.svelte
index 7bd5113d8a..b6567cfe3e 100644
--- a/packages/desktop/views/dashboard/send-flow/views/components/EvmTransactionDetails.svelte
+++ b/packages/desktop/views/dashboard/send-flow/views/components/EvmTransactionDetails.svelte
@@ -1,16 +1,18 @@
 <script lang="ts">
-    import { BigIntLike } from '@ethereumjs/util'
     import { Table, TableRow } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
     import { EvmTransactionData, GasSpeed, IGasPricesBySpeed } from '@core/layer-2'
-    import { IEvmNetwork, NetworkId, calculateGasFee } from '@core/network'
+    import { calculateGasFee, IEvmNetwork, NetworkId } from '@core/network'
+    import { formatTokenAmount } from '@core/token/utils'
+    import { Subject } from '@core/wallet'
+    import { BigIntLike } from '@ethereumjs/util'
     import { NetworkLabel } from '@ui'
     import SetTransactionFeeMenu from './SetTransactionFeeMenu.svelte'
-    import { formatTokenAmount } from '@core/token/utils'
 
     export let selectedGasSpeed: GasSpeed = GasSpeed.Required
     export let sourceNetwork: IEvmNetwork
     export let destinationNetworkId: NetworkId | undefined = undefined
+    export let recipient: Subject | undefined = undefined
     export let transaction: EvmTransactionData
     export let gasPrices: IGasPricesBySpeed
     export let storageDeposit: bigint = BigInt(0)
@@ -35,6 +37,15 @@
                 },
             },
         },
+        {
+            key: localize('general.recipient'),
+            value: recipient?.address,
+            copyable: true,
+            truncate: {
+                firstCharCount: 10,
+                endCharCount: 10,
+            },
+        },
         {
             key: localize('general.estimatedFee'),
             value: estimatedGas ? formatGasFee(estimatedGas, gasPrices[selectedGasSpeed]) : undefined,
diff --git a/packages/shared/src/components/molecules/TransactionAssetSection.svelte b/packages/shared/src/components/molecules/TransactionAssetSection.svelte
index 1fe9628604..b211bfdad3 100644
--- a/packages/shared/src/components/molecules/TransactionAssetSection.svelte
+++ b/packages/shared/src/components/molecules/TransactionAssetSection.svelte
@@ -20,7 +20,7 @@
         : undefined
 </script>
 
-{#if baseCoinTransfer || tokenTransfer || nft || aliasId}
+{#if Number(baseCoinTransfer?.rawAmount) > 0 || tokenTransfer || nft || aliasId}
     <asset-section class="w-full flex flex-row gap-2 justify-between overflow-hidden">
         {#if tokenTransfer?.token && tokenWithBalance}
             <div class="flex-grow overflow-hidden">
diff --git a/packages/shared/src/locales/en.json b/packages/shared/src/locales/en.json
index c546045489..c383397a0b 100644
--- a/packages/shared/src/locales/en.json
+++ b/packages/shared/src/locales/en.json
@@ -1113,10 +1113,12 @@
             "hint": "{address} is requesting approval to spend {assetName}",
             "warning": "You don't own any of the approved tokens. Only approve tokens you trust.",
             "action": "Approve",
+            "approveMoreThanBalanceWarning": "This dapp is asking you to approve spending more tokens that you currently own.",
+            "accept": "I understand and wish to proceed",
             "success": "Successfully approved"
         },
         "sendTransaction": {
-            "title": "Send transaction",
+            "title": "Send {asset} to {recipient}",
             "action": "Send",
             "success": "Sent {assetName} to {recipient}"
         },