From 6dabfe2ebf7ab6666c698a4db562fb4ee37cce42 Mon Sep 17 00:00:00 2001
From: dafuga <danielfugere28@gmail.com>
Date: Thu, 31 Aug 2023 23:23:35 -0700
Subject: [PATCH] enhancement: calculating fee every time an input changes

---
 src/pages/transfer/confirm.svelte |  1 -
 src/pages/transfer/form.svelte    |  2 +-
 src/pages/transfer/index.svelte   | 11 +++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

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}
                     />
                 </div>
-                {#if receivedAmount && receivedAmount.value > 0}
+                {#if receivedAmount && receivedAmount.value > 0 && feeAmount && feeAmount.value > 0}
                     <div class="label-container">
                         <Label align="left" >Amount Received:  {String(receivedAmount)}</Label>
                     </div>  
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<Asset | void> {
+    async function estimateTransferFee(): Promise<Asset | undefined> {
+        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()
+        }
+    }
 </script>
 
 <style type="scss">