CW-243-Better-error-message-for-too-many-decimals (#818)
* update amoung validation * fix decimal validator * minor fix
Serhii committed
Mar 15, 2023 at 19:22 UTC
7dfc5b23bcfb8ade9ecade30ed87ec6178d39615
29 files changed
+78
-23
lib/core/amount_validator.dart
+43
-16
@@ -1,32 +1,59 @@
1
import 'package:cake_wallet/core/validator.dart';
2
import 'package:cake_wallet/generated/i18n.dart';
3
-import 'package:cw_core/wallet_type.dart';
3
+import 'package:cw_core/crypto_currency.dart';
4
5
class AmountValidator extends TextValidator {
6
- AmountValidator({required WalletType type, bool isAutovalidate = false})
6
+ AmountValidator({required CryptoCurrency currency, bool isAutovalidate = false}) {
7
+ symbolsAmountValidator =
8
+ SymbolsAmountValidator(isAutovalidate: isAutovalidate);
9
+ decimalAmountValidator = DecimalAmountValidator(currency: currency);
10
+ }
11
+
12
+ late final SymbolsAmountValidator symbolsAmountValidator;
13
+
14
+ late final DecimalAmountValidator decimalAmountValidator;
15
+
16
+ String? call(String? value) => symbolsAmountValidator(value) ?? decimalAmountValidator(value);
17
+}
18
+
19
+class SymbolsAmountValidator extends TextValidator {
20
+ SymbolsAmountValidator({required bool isAutovalidate})
21
: super(
8
- errorMessage: S.current.error_text_amount,
9
- pattern: _pattern(type),
22
+ errorMessage: S.current.error_text_amount,
23
+ pattern: _pattern(),
24
+ isAutovalidate: isAutovalidate,
25
+ minLength: 0,
26
+ maxLength: 0);
27
+
28
+ static String _pattern() => '^([0-9]+([.\,][0-9]+)?|[.\,][0-9]+)\$';
29
+}
30
+
31
+class DecimalAmountValidator extends TextValidator {
32
+ DecimalAmountValidator({required CryptoCurrency currency, bool isAutovalidate = false})
33
+ : super(
34
+ errorMessage: S.current.decimal_places_error,
35
+ pattern: _pattern(currency),
36
isAutovalidate: isAutovalidate,
37
minLength: 0,
38
maxLength: 0);
39
14
- static String _pattern(WalletType type) {
15
- switch (type) {
16
- case WalletType.monero:
17
- return '^([0-9]+([.\,][0-9]{0,12})?|[.\,][0-9]{1,12})\$';
18
- case WalletType.bitcoin:
19
- return '^([0-9]+([.\,][0-9]{0,8})?|[.\,][0-9]{1,8})\$';
40
+ static String _pattern(CryptoCurrency currency) {
41
+ switch (currency) {
42
+ case CryptoCurrency.xmr:
43
+ return '^([0-9]+([.\,][0-9]{1,12})?|[.\,][0-9]{1,12})\$';
44
+ case CryptoCurrency.btc:
45
+ return '^([0-9]+([.\,][0-9]{1,8})?|[.\,][0-9]{1,8})\$';
46
default:
21
- return '';
47
+ return '^([0-9]+([.\,][0-9]{1,12})?|[.\,][0-9]{1,12})\$';
48
}
49
}
50
}
51
52
class AllAmountValidator extends TextValidator {
27
- AllAmountValidator() : super(
28
- errorMessage: S.current.error_text_amount,
29
- pattern: S.current.all,
30
- minLength: 0,
31
- maxLength: 0);
53
+ AllAmountValidator()
54
+ : super(
55
+ errorMessage: S.current.error_text_amount,
56
+ pattern: S.current.all,
57
+ minLength: 0,
58
+ maxLength: 0);
59
}
lib/src/screens/exchange/exchange_page.dart
+2
-2
@@ -240,7 +240,7 @@ class ExchangePage extends BasePage {
240
.bodyText1!
241
.color!,
242
currencyValueValidator: AmountValidator(
243
- type: exchangeViewModel.wallet.type),
243
+ currency: exchangeViewModel.depositCurrency),
244
addressTextFieldValidator: AddressValidator(
245
type: exchangeViewModel.depositCurrency),
246
onPushPasteButton: (context) async {
@@ -304,7 +304,7 @@ class ExchangePage extends BasePage {
304
.bodyText1!
305
.decorationColor!,
306
currencyValueValidator: AmountValidator(
307
- type: exchangeViewModel.wallet.type),
307
+ currency: exchangeViewModel.receiveCurrency),
308
addressTextFieldValidator:
309
AddressValidator(
310
type: exchangeViewModel
lib/src/screens/exchange/exchange_template_page.dart
+2
-2
@@ -165,7 +165,7 @@ class ExchangeTemplatePage extends BasePage {
165
.bodyText1!
166
.color!,
167
currencyValueValidator: AmountValidator(
168
- type: exchangeViewModel.wallet.type),
168
+ currency: exchangeViewModel.depositCurrency),
169
//addressTextFieldValidator: AddressValidator(
170
// type: exchangeViewModel.depositCurrency),
171
),
@@ -206,7 +206,7 @@ class ExchangeTemplatePage extends BasePage {
206
.bodyText1!
207
.decorationColor!,
208
currencyValueValidator: AmountValidator(
209
- type: exchangeViewModel.wallet.type),
209
+ currency: exchangeViewModel.receiveCurrency),
210
//addressTextFieldValidator: AddressValidator(
211
// type: exchangeViewModel.receiveCurrency),
212
)),
lib/src/screens/receive/widgets/qr_widget.dart
+3
-1
@@ -1,5 +1,6 @@
1
import 'package:cake_wallet/routes.dart';
2
import 'package:cake_wallet/utils/show_bar.dart';
3
+import 'package:cw_core/wallet_type.dart';
4
import 'package:device_display_brightness/device_display_brightness.dart';
5
import 'package:flutter/material.dart';
6
import 'package:flutter/cupertino.dart';
@@ -119,7 +120,8 @@ class QRWidget extends StatelessWidget {
120
hintText: S.of(context).receive_amount,
121
textColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
122
borderColor: Theme.of(context).textTheme!.headline5!.decorationColor!,
122
- validator: AmountValidator(type: addressListViewModel.type, isAutovalidate: true),
123
+ validator: AmountValidator(currency:
124
+ walletTypeToCryptoCurrency(addressListViewModel.type), isAutovalidate: true),
125
// FIX-ME: Check does it equal to autovalidate: true,
126
autovalidateMode: AutovalidateMode.always,
127
placeholderTextStyle: TextStyle(
lib/view_model/send/send_template_view_model.dart
+3
-1
@@ -1,4 +1,5 @@
1
import 'package:cake_wallet/view_model/send/output.dart';
2
+import 'package:cw_core/wallet_type.dart';
3
import 'package:mobx/mobx.dart';
4
import 'package:cake_wallet/entities/template.dart';
5
import 'package:cake_wallet/store/templates/send_template_store.dart';
@@ -26,7 +27,8 @@ abstract class SendTemplateViewModelBase with Store {
27
28
Output output;
29
29
- Validator get amountValidator => AmountValidator(type: _wallet.type);
30
+ Validator get amountValidator =>
31
+ AmountValidator(currency: walletTypeToCryptoCurrency(_wallet.type));
32
33
Validator get addressValidator => AddressValidator(type: _wallet.currency);
34
lib/view_model/send/send_view_model.dart
+2
-1
@@ -126,7 +126,8 @@ abstract class SendViewModelBase with Store {
126
127
CryptoCurrency get currency => _wallet.currency;
128
129
- Validator get amountValidator => AmountValidator(type: _wallet.type);
129
+ Validator get amountValidator =>
130
+ AmountValidator(currency: walletTypeToCryptoCurrency(_wallet.type));
131
132
Validator get allAmountValidator => AllAmountValidator();
133
res/values/strings_ar.arb
+1
@@ -683,5 +683,6 @@
683
"arrive_in_this_address" : "سيصل ${currency} ${tag}إلى هذا العنوان",
684
"do_not_send": "لا ترسل",
685
"error_dialog_content": "عفوًا ، لقد حصلنا على بعض الخطأ.\n\nيرجى إرسال تقرير التعطل إلى فريق الدعم لدينا لتحسين التطبيق.",
686
+ "decimal_places_error": "عدد كبير جدًا من المنازل العشرية",
687
"edit_node": "تحرير العقدة"
688
}
res/values/strings_bg.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}ще отидат на този адрес",
686
"do_not_send": "Не изпращай",
687
"error_dialog_content": "Получихме грешка.\n\nМоля, изпратете доклада до нашия отдел поддръжка, за да подобрим приложението.",
688
+ "decimal_places_error": "Твърде много знаци след десетичната запетая",
689
"edit_node": "Редактиране на възел"
690
}
res/values/strings_cs.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}přijde na tuto adresu",
686
"do_not_send": "Neodesílat",
687
"error_dialog_content": "Nastala chyba.\n\nProsím odešlete zprávu o chybě naší podpoře, aby mohli zajistit opravu.",
688
+ "decimal_places_error": "Příliš mnoho desetinných míst",
689
"edit_node": "Upravit uzel"
690
}
res/values/strings_de.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}wird an dieser Adresse ankommen",
686
"do_not_send": "Nicht senden",
687
"error_dialog_content": "Hoppla, wir haben einen Fehler.\n\nBitte senden Sie den Absturzbericht an unser Support-Team, um die Anwendung zu verbessern.",
688
+ "decimal_places_error": "Zu viele Nachkommastellen",
689
"edit_node": "Knoten bearbeiten"
690
}
res/values/strings_en.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}will arrive in this address",
686
"do_not_send": "Don't send",
687
"error_dialog_content": "Oops, we got some error.\n\nPlease send the crash report to our support team to make the application better.",
688
+ "decimal_places_error": "Too many decimal places",
689
"edit_node": "Edit Node"
690
}
res/values/strings_es.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}llegará a esta dirección",
686
"do_not_send": "no enviar",
687
"error_dialog_content": "Vaya, tenemos un error.\n\nEnvíe el informe de bloqueo a nuestro equipo de soporte para mejorar la aplicación.",
688
+ "decimal_places_error": "Demasiados lugares decimales",
689
"edit_node": "Edit Node"
690
}
res/values/strings_fr.arb
+1
@@ -683,5 +683,6 @@
683
"arrive_in_this_address" : "${currency} ${tag}arrivera à cette adresse",
684
"do_not_send": "N'envoyez pas",
685
"error_dialog_content": "Oups, nous avons eu une erreur.\n\nVeuillez envoyer le rapport de plantage à notre équipe d'assistance pour améliorer l'application.",
686
+ "decimal_places_error": "Trop de décimales",
687
"edit_node": "Modifier le nœud"
688
}
res/values/strings_hi.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}इस पते पर पहुंचेंगे",
686
"do_not_send": "मत भेजो",
687
"error_dialog_content": "ओह, हमसे कुछ गड़बड़ी हुई है.\n\nएप्लिकेशन को बेहतर बनाने के लिए कृपया क्रैश रिपोर्ट हमारी सहायता टीम को भेजें।",
688
+ "decimal_places_error": "बहुत अधिक दशमलव स्थान",
689
"edit_node": "नोड संपादित करें"
690
}
res/values/strings_hr.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}će stići na ovu adresu",
686
"do_not_send": "Ne šalji",
687
"error_dialog_content": "Ups, imamo grešku.\n\nPošaljite izvješće o padu našem timu za podršku kako bismo poboljšali aplikaciju.",
688
+ "decimal_places_error": "Previše decimalnih mjesta",
689
"edit_node": "Uredi čvor"
690
}
res/values/strings_id.arb
+1
@@ -667,5 +667,6 @@
667
"orbot_running_alert": "Pastikan Orbot sedang berjalan sebelum menghubungkan ke node ini.",
668
"contact_list_contacts": "Kontak",
669
"contact_list_wallets": "Dompet Saya",
670
+ "decimal_places_error": "Terlalu banyak tempat desimal",
671
"edit_node": "Sunting Node"
672
}
res/values/strings_it.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}arriverà a questo indirizzo",
686
"do_not_send": "Non inviare",
687
"error_dialog_content": "Spiacenti, abbiamo riscontrato un errore.\n\nSi prega di inviare il rapporto sull'arresto anomalo al nostro team di supporto per migliorare l'applicazione.",
688
+ "decimal_places_error": "Troppe cifre decimali",
689
"edit_node": "Modifica nodo"
690
}
res/values/strings_ja.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}はこの住所に到着します",
686
"do_not_send": "送信しない",
687
"error_dialog_content": "エラーが発生しました。\n\nアプリケーションを改善するために、クラッシュ レポートをサポート チームに送信してください。",
688
+ "decimal_places_error": "小数点以下の桁数が多すぎる",
689
"edit_node": "ノードを編集"
690
}
res/values/strings_ko.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}이(가) 이 주소로 도착합니다",
686
"do_not_send": "보내지 마세요",
687
"error_dialog_content": "죄송합니다. 오류가 발생했습니다.\n\n응용 프로그램을 개선하려면 지원 팀에 충돌 보고서를 보내주십시오.",
688
+ "decimal_places_error": "소수점 이하 자릿수가 너무 많습니다.",
689
"edit_node": "노드 편집"
690
}
res/values/strings_my.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}ဤလိပ်စာသို့ ရောက်ရှိပါမည်။",
686
"do_not_send": "မပို့ပါနှင့်",
687
"error_dialog_content": "အိုး၊ ကျွန်ုပ်တို့တွင် အမှားအယွင်းအချို့ရှိသည်။\n\nအပလီကေးရှင်းကို ပိုမိုကောင်းမွန်စေရန်အတွက် ပျက်စီးမှုအစီရင်ခံစာကို ကျွန်ုပ်တို့၏ပံ့ပိုးကူညီရေးအဖွဲ့ထံ ပေးပို့ပါ။",
688
+ "decimal_places_error": "ဒဿမနေရာများ များလွန်းသည်။",
689
"edit_node": "Node ကို တည်းဖြတ်ပါ။"
690
}
res/values/strings_nl.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}komt aan op dit adres",
686
"do_not_send": "Niet sturen",
687
"error_dialog_content": "Oeps, er is een fout opgetreden.\n\nStuur het crashrapport naar ons ondersteuningsteam om de applicatie te verbeteren.",
688
+ "decimal_places_error": "Te veel decimalen",
689
"edit_node": "Knooppunt bewerken"
690
}
res/values/strings_pl.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}dotrze na ten adres",
686
"do_not_send": "Nie wysyłaj",
687
"error_dialog_content": "Ups, wystąpił błąd.\n\nPrześlij raport o awarii do naszego zespołu wsparcia, aby ulepszyć aplikację.",
688
+ "decimal_places_error": "Za dużo miejsc dziesiętnych",
689
"edit_node": "Edytuj węzeł"
690
}
res/values/strings_pt.arb
+1
@@ -684,5 +684,6 @@
684
"arrive_in_this_address" : "${currency} ${tag}chegará neste endereço",
685
"do_not_send": "não envie",
686
"error_dialog_content": "Ops, houve algum erro.\n\nPor favor, envie o relatório de falha para nossa equipe de suporte para melhorar o aplicativo.",
687
+ "decimal_places_error": "Muitas casas decimais",
688
"edit_node": "Editar nó"
689
}
res/values/strings_ru.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}придет на этот адрес",
686
"do_not_send": "Не отправлять",
687
"error_dialog_content": "Ой, у нас какая-то ошибка.\n\nПожалуйста, отправьте отчет о сбое в нашу службу поддержки, чтобы сделать приложение лучше.",
688
+ "decimal_places_error": "Слишком много десятичных знаков",
689
"edit_node": "Редактировать узел"
690
}
res/values/strings_th.arb
+1
@@ -683,5 +683,6 @@
683
"arrive_in_this_address" : "${currency} ${tag}จะมาถึงที่อยู่นี้",
684
"do_not_send": "อย่าส่ง",
685
"error_dialog_content": "อ๊ะ เราพบข้อผิดพลาดบางอย่าง\n\nโปรดส่งรายงานข้อขัดข้องไปยังทีมสนับสนุนของเราเพื่อปรับปรุงแอปพลิเคชันให้ดียิ่งขึ้น",
686
+ "decimal_places_error": "ทศนิยมมากเกินไป",
687
"edit_node": "แก้ไขโหนด"
688
}
res/values/strings_tr.arb
+1
@@ -685,5 +685,6 @@
685
"arrive_in_this_address" : "${currency} ${tag}bu adrese ulaşacak",
686
"do_not_send": "Gönderme",
687
"error_dialog_content": "Hay aksi, bir hatamız var.\n\nUygulamayı daha iyi hale getirmek için lütfen kilitlenme raporunu destek ekibimize gönderin.",
688
+ "decimal_places_error": "Çok fazla ondalık basamak",
689
"edit_node": "Düğümü Düzenle"
690
}
res/values/strings_uk.arb
+1
@@ -684,5 +684,6 @@
684
"arrive_in_this_address" : "${currency} ${tag}надійде на цю адресу",
685
"do_not_send": "Не надсилайте",
686
"error_dialog_content": "На жаль, ми отримали помилку.\n\nБудь ласка, надішліть звіт про збій нашій команді підтримки, щоб покращити додаток.",
687
+ "decimal_places_error": "Забагато знаків після коми",
688
"edit_node": "Редагувати вузол"
689
}
res/values/strings_ur.arb
+1
@@ -686,5 +686,6 @@
686
"arrive_in_this_address" : "${currency} ${tag}اس پتے پر پہنچے گا۔",
687
"do_not_send" : "مت بھیجیں۔",
688
"error_dialog_content" : "افوہ، ہمیں کچھ خرابی ملی۔\n\nایپلی کیشن کو بہتر بنانے کے لیے براہ کرم کریش رپورٹ ہماری سپورٹ ٹیم کو بھیجیں۔",
689
+ "decimal_places_error": "بہت زیادہ اعشاریہ جگہیں۔",
690
"edit_node": "نوڈ میں ترمیم کریں۔"
691
}
res/values/strings_zh.arb
+1
@@ -683,5 +683,6 @@
683
"arrive_in_this_address" : "${currency} ${tag}将到达此地址",
684
"do_not_send": "不要发送",
685
"error_dialog_content": "糟糕，我们遇到了一些错误。\n\n请将崩溃报告发送给我们的支持团队，以改进应用程序。",
686
+ "decimal_places_error": "小数位太多",
687
"edit_node": "编辑节点"
688
}