add enough amount check when send via file

grinfans · Jul 4, 2019 · ec3cee5 · ec3cee5
1 parent 8bc8796
commit ec3cee5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/src/lang/en.js b/src/lang/en.js
@@ -116,7 +116,8 @@ const messages = {
       createTxFile: 'Create new transcation file',
       WrongAmount: 'Wrong amount',
       saveMsg: 'Save transcation file created',
-      CreateFailed: 'Failed to create new transcation file'
+      CreateFailed: 'Failed to create new transcation file',
+      NotEnough: 'Not enough amount. Keep 0.01 as fee'
     },
 
     httpSend:{

diff --git a/src/lang/ru.js b/src/lang/ru.js
@@ -107,7 +107,8 @@ const messages = {
       createTxFile: 'Создать новый файл транзакции',
       WrongAmount: 'Неверная сумма',
       saveMsg: 'Сохранить созданный файл транзакции',
-      CreateFailed: 'Не удалось создать новый файл транзакции'
+      CreateFailed: 'Не удалось создать новый файл транзакции',
+      NotEnough: 'Недостаточно средств. Оставьте 0.01 для комиссии'
     },
 
     httpSend:{

diff --git a/src/lang/zh.js b/src/lang/zh.js
@@ -116,7 +116,8 @@ const messages = {
       createTxFile: '生成交易文件',
       WrongAmount: '发送数量错误',
       saveMsg: '保存新生成的交易文件',
-      CreateFailed: '生成交易文件错误'
+      CreateFailed: '生成交易文件错误',
+      NotEnough: '没有足够的余额，请至少留下0.01作为手续费',
     },
 
     httpSend:{

diff --git a/src/renderer/components/FileSend.vue b/src/renderer/components/FileSend.vue
@@ -70,10 +70,20 @@ export default {
       if (!this.amount || !this.validAmount(this.amount)) {
         this.errors.push(this.$t('msg.fileSend.WrongAmount'));
       }
+      if (this.amount && this.validAmount(this.amount) && !this.enough(this.amount)) {
+        this.errors.push(this.$t('msg.fileSend.NotEnough'));
+      }
       if (!this.errors.length) {
         return true;
       }
     },
+    enough(amount){
+      let spendable = this.$dbService.getSpendable()
+      if(spendable){
+        return spendable >= parseFloat(amount) + 0.01 //0.008
+      }
+      return true
+    },
     send(){
       if(this.checkForm()){
         let fn_output = this.$electron.remote.dialog.showSaveDialog({

diff --git a/src/renderer/components/HttpSend.vue b/src/renderer/components/HttpSend.vue
@@ -101,7 +101,7 @@ export default {
     enough(amount){
       let spendable = this.$dbService.getSpendable()
       if(spendable){
-        return spendable > parseFloat(amount) + 0.01 //0.008
+        return spendable >= parseFloat(amount) + 0.01 //0.008
       }
       return true
     },
@@ -113,7 +113,7 @@ export default {
       if (!this.amount || !this.validAmount(this.amount)) {
         this.errors.push(this.$t('msg.httpSend.WrongAmount'));
       }
-      if (this.validAmount(this.amount) && !this.enough(this.amount)) {
+      if (this.amount && this.validAmount(this.amount) && !this.enough(this.amount)) {
         this.errors.push(this.$t('msg.httpSend.NotEnough'));
       }
       if (!this.errors.length) {