Fix: validate field in token approval forms before adding (#548)

baking-bad · Jul 20, 2023 · c0ea985 · c0ea985
1 parent 3d80428
commit c0ea985
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/src/components/schema/schemaForm/approve/Fa1Approve.vue b/src/components/schema/schemaForm/approve/Fa1Approve.vue
@@ -11,6 +11,7 @@
             placeholder="Token contract"
             background-color="data"
             :rules="rules.address"
+            maxlength="36"
         >
         </v-text-field>
         <v-text-field

diff --git a/src/components/schema/schemaForm/approve/Fa2Approve.vue b/src/components/schema/schemaForm/approve/Fa2Approve.vue
@@ -12,6 +12,7 @@
             placeholder="Token contract"
             background-color="data"
             :rules="rules.address"
+            maxlength="36"
         >
         </v-text-field>
         <v-text-field
@@ -28,6 +29,7 @@
             :rules="rules.address"
             persistent-hint
             hint="If you attached a wallet, its address will be pasted automatically"
+            maxlength="36"
         >
         </v-text-field>
         <v-text-field

diff --git a/src/components/schema/schemaForm/approve/TokenAddDialog.vue b/src/components/schema/schemaForm/approve/TokenAddDialog.vue
@@ -36,11 +36,11 @@
                             <v-btn :value="typ.value" :key="typ.value" v-for="typ in tokenTypes" small>{{ typ.name }}</v-btn>
                         </v-btn-toggle>
                     </v-col>
-                    <v-col class="pb-0 mb-0" v-if="selectedTokenType == 1">
-                        <Fa1Approve v-model="fa1" :rules="rules"/>
-                    </v-col>
-                    <v-col class="pb-0 mb-0" v-else>
-                        <Fa2Approve v-model="fa2" :rules="rules"/>                    
+                    <v-col class="pb-0 mb-0" >
+                        <v-form lazy-validation ref="form">
+                            <Fa1Approve v-model="fa1" :rules="rules" v-if="selectedTokenType == 1"/>
+                            <Fa2Approve v-model="fa2" :rules="rules" v-else/>
+                        </v-form>
                     </v-col>
                 </v-row>
             </v-card-text>
@@ -118,6 +118,9 @@ export default {
     },
     methods: {
         addToken() {
+            if (!this.$refs.form.validate()) {
+                return
+            }
             this.show = false;
             if (!this.isEdit) {
                 if (this.selectedTokenType == 1) {
@@ -152,12 +155,14 @@ export default {
             this.selectedTokenType = 1;
             this.fa1 = {
                 tokenContract: '',
-                allowance: 0
+                allowance: 0,
+                valid: false
             }
             this.fa2 = {
                 tokenContract: '',
                 owner: '',
-                tokenId: 0
+                tokenId: 0,
+                valid: false
             }
             this.searchToken = null;
             let account = Wallet.getLastUsedAccount();

diff --git a/src/utils/tz.js b/src/utils/tz.js
@@ -149,7 +149,8 @@ export function validateNat(value) {
 
 export let validationRules = {
     contract:[
-        v => (v && v.length == 36) || 'The length of the contract address is 36 characters',
+        v => (!!v) || 'Required field',
+        v => (v.length == 36) || 'The length of the contract address is 36 characters',
         v => isKT1Address(v) || 'In this field you should write the address of the contract. It begins with KT.'
     ],
     nat: [
@@ -161,7 +162,8 @@ export let validationRules = {
         v => /^[0-9a-fA-F]*$/.test(v) || 'Only 0-9 and a-f are allowed',
     ],
     address: [
-        v => (v && v.length == 36) || 'The length of the address is 36 characters',
+        v => (!!v) || 'Required field',
+        v => (v.length == 36) || 'The length of the address is 36 characters',
         v => isAddress(v) || 'In this field you should write the address'
     ]
 }