fix: disabled withdraw state, address not found message

telosnetwork · Jan 8, 2024 · 6caf314 · 6caf314
1 parent 29f573c
commit 6caf314
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/i18n/en-us/index.js b/src/i18n/en-us/index.js
@@ -489,6 +489,7 @@ export default {
         dont_send_to_exchanges: 'DO NOT SEND TO EXCHANGE ADDRESS (e.g. KuCoin, Gate.io etc.). THIS ' +
         'WILL RESULT IN A LOSS OF FUNDS. RATHER SEND TO YOUR OWN METAMASK ' +
         'ADDRESS THEN TRANSFER TO THE EXCHANGE ADDRESS.',
+        evm_address_not_found: 'No linked Telos EVM address found, click below to generate one.',
         evm_address_disclaimer: 'THIS ADDRESS IS ONLY FOR SENDING \'TLOS\' ON THE TELOS EVM. DO NOT SEND ANY OTHER TOKEN TO THIS ADDRESS. DO NOT SEND ANY TOKEN FROM ANOTHER NETWORK. THERE ARE NO PRIVATE KEYS AND FUNDS WILL BE LOST FOREVER.',
         evm_disclaimer_confirmation: 'I Understand',
         create_evm_for: 'Create EVM address for {account}',

diff --git a/src/pages/native/balance/DepositEVM.vue b/src/pages/native/balance/DepositEVM.vue
@@ -1,6 +1,5 @@
 <script>
 import { mapGetters, mapActions } from 'vuex';
-const MINIMUM_RAM_BYTES = 1000;
 
 export default {
     name: 'WithdrawEVM',

diff --git a/src/pages/native/balance/WithdrawEVM.vue b/src/pages/native/balance/WithdrawEVM.vue
@@ -1,6 +1,7 @@
 <script>
 import { mapGetters, mapActions } from 'vuex';
 import { getAntelope } from 'src/antelope';
+const MINIMUM_RAM_BYTES = 1000;
 
 export default {
     name: 'WithdrawEVM',
@@ -110,7 +111,6 @@ export default {
             }
         },
     },
-    watch: {},
 };
 </script>
 
@@ -167,8 +167,10 @@ export default {
                 <div
                     class="note"
                 >
-                    {{$t('components.address_not_exist')}}
+                    {{$t('components.evm_address_not_found')}}
                 </div>
+            </div>
+            <div v-if="!evmAddress" class="row justify-center">
                 <q-btn
                     class="purpleGradient generateAccountBtn"
                     no-caps
@@ -191,11 +193,11 @@ export default {
                         TLOS
                     </label>
                 </div>
-                <div class="" @click="withdrawAmount=evmTLOSBalance">Max: {{ evmTLOSBalance }}</div>
+                <div class="" @click="withdrawAmount=evmTLOSBalance">Max: {{ evmTLOSBalance || '0' }}</div>
             </div>
             <div class="row justify-center q-mt-md q-mb-lg">
                 <q-btn
-                    :disabled="!(parseFloat(withdrawAmount) > 0)"
+                    :disabled="!(evmTLOSBalance > 0) && !evmAddress"
                     class="purpleGradient withdrawBtn"
                     no-caps
                     rounded