fix: handling useEntireBalance case gracefully

greymass · Aug 14, 2023 · f7f1bb2 · f7f1bb2
1 parent 01e3bcb
commit f7f1bb2
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 17 deletions.
diff --git a/src/lib/evm.ts b/src/lib/evm.ts
@@ -133,10 +133,12 @@ export async function estimateGas({nativeSession, evmAccount, amount}: TransferP
 
     const gasPrice = await provider.getGasPrice()
 
+    const reducedAmount = String(Number(amount) - 0.005)
+
     const gas = await provider.estimateGas({
         from: evmAccount.address,
         to: targetEvmAddress,
-        value: ethers.utils.parseEther(amount),
+        value: ethers.utils.parseEther(reducedAmount),
         gasPrice,
         data: ethers.utils.formatBytes32String(''),
     })

diff --git a/src/pages/transfer/confirm.svelte b/src/pages/transfer/confirm.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import {Asset} from '@greymass/eosio'
+    import type {Asset} from '@greymass/eosio'
     import Button from '~/components/elements/button.svelte'
 
     import {evmAccount, activeSession} from '~/store'
@@ -8,6 +8,7 @@
     export let from: Token
     export let to: Token
     export let depositAmount: Asset
+    export let receivedAmount: Asset
     export let feeAmount: Asset | undefined
     export let handleConfirm: () => void
     export let handleBack: () => void
@@ -90,11 +91,11 @@
         </tr>
         <tr>
             <td>Fee Amount</td>
-            <td>{feeAmount}</td>
+            <td>{feeAmount || '0.0000 EOS' }</td>
         </tr>
         <tr>
             <td>Received Amount</td>
-            <td>{feeAmount ? Asset.from(depositAmount.value - feeAmount.value, '4,EOS') : '0 EOS'}</td>
+            <td>{receivedAmount}</td>
         </tr>
     </table>
     <div class="bottom-section">

diff --git a/src/pages/transfer/index.svelte b/src/pages/transfer/index.svelte
@@ -14,7 +14,8 @@
     import type {Token} from '~/stores/tokens'
 
     let step = 'form'
-    let amount: string = ''
+    let deposit: string = ''
+    let received: string = ''
     let errorMessage: string | undefined
     let from: Token | undefined
     let to: Token | undefined
@@ -32,13 +33,13 @@
                 nativeTransactResult = await transferNativeToEvm({
                     nativeSession: $activeSession!,
                     evmAccount: $evmAccount,
-                    amount,
+                    amount: received,
                 })
             } else {
                 evmTransactResult = await transferEvmToNative({
                     nativeSession: $activeSession!,
                     evmAccount: $evmAccount,
-                    amount,
+                    amount: received,
                 })
             }
         } catch (error) {
@@ -55,21 +56,30 @@
         errorMessage = undefined
         nativeTransactResult = undefined
         evmTransactResult = undefined
-        amount = ''
+        deposit = ''
+        received = ''
     }
 
     async function submitForm() {
         if (!$evmAccount) {
             return (errorMessage = 'An evm session is required.')
         }
-        
+
         step = 'confirm'
 
-        transferFee = await getGasAmount({
-            nativeSession: $activeSession!,
-            evmAccount: $evmAccount,
-            amount,
-        })
+        try {
+            transferFee = await getGasAmount({
+                nativeSession: $activeSession!,
+                evmAccount: $evmAccount,
+                amount: deposit,
+            })
+        } catch (error) {
+            return (errorMessage = `Could not estimate gas. Error: ${
+                JSON.stringify(error) === '{}' ? error.message : JSON.stringify(error)
+            }`)
+        }
+       
+        received = (parseFloat(deposit) - parseFloat(transferFee.value.toFixed(4))).toFixed(4)
     }
 
     let connectInterval: number | undefined
@@ -120,10 +130,18 @@
     <div class="container">
         {#if errorMessage}
             <Error error={errorMessage} {handleBack} />
-        {:else if step === 'form' || !from || !to || !amount}
-            <Form handleContinue={submitForm} bind:amount bind:from bind:to />
+        {:else if step === 'form' || !from || !to || !deposit || !received}
+            <Form handleContinue={submitForm} bind:amount={deposit} bind:from bind:to />
         {:else if step === 'confirm'}
-            <Confirm depositAmount={Asset.from(Number(amount), '4,EOS')} feeAmount={transferFee} {from} {to} handleConfirm={transfer} {handleBack} />
+            <Confirm
+                depositAmount={Asset.from(Number(deposit), '4,EOS')}
+                receivedAmount={Asset.from(Number(received), '4,EOS')}
+                feeAmount={transferFee}
+                {from}
+                {to}
+                handleConfirm={transfer}
+                {handleBack}
+            />
         {:else if (step === 'success' && nativeTransactResult) || evmTransactResult}
             <Success {from} {to} {nativeTransactResult} {evmTransactResult} {handleBack} />
         {/if}