diff --git a/src/pages/transfer/confirm.svelte b/src/pages/transfer/confirm.svelte
index 30397d48..c4463a04 100644
--- a/src/pages/transfer/confirm.svelte
+++ b/src/pages/transfer/confirm.svelte
@@ -23,7 +23,6 @@
text-align: center;
border: 1px solid #ddd;
border-radius: 30px;
-
.top-section {
margin-bottom: 2em;
diff --git a/src/pages/transfer/form.svelte b/src/pages/transfer/form.svelte
index d306a3b3..dc6fae9d 100644
--- a/src/pages/transfer/form.svelte
+++ b/src/pages/transfer/form.svelte
@@ -191,7 +191,7 @@
tokenOptions={toOptions}
/>
- {#if receivedAmount && receivedAmount.value > 0}
+ {#if receivedAmount && receivedAmount.value > 0 && feeAmount && feeAmount.value > 0}
diff --git a/src/pages/transfer/index.svelte b/src/pages/transfer/index.svelte
index 645903c8..41448f58 100644
--- a/src/pages/transfer/index.svelte
+++ b/src/pages/transfer/index.svelte
@@ -73,12 +73,13 @@
async function submitForm() {
step = 'confirm'
- const transferFee = await estimateTransferFee()
+ await estimateTransferFee()
deposit = (parseFloat(received) + parseFloat(transferFee?.value.toFixed(4) || '')).toFixed(4)
}
- async function estimateTransferFee(): Promise {
+ async function estimateTransferFee(): Promise {
+ console.log({from, to, deposit})
if (!$evmAccount) {
errorMessage = 'An evm session is required.'
return
@@ -159,6 +160,12 @@
connectInterval = window.setInterval(connectEvmWallet, 3000)
connectEvmWallet()
+
+ $: {
+ if (from && to && deposit !== '') {
+ estimateTransferFee()
+ }
+ }