Merge branch 'pre_main_qa' of https://github.com/MXCzkEVM/datadash-wa…

…llet into pre_main_qa
MXCzkEVM · Sep 20, 2023 · 56a1bee · 56a1bee
2 parents 79b5746 + ec3f3c7
commit 56a1bee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/common/components/recent_transactions/domain/transactions_use_case.dart b/lib/common/components/recent_transactions/domain/transactions_use_case.dart
@@ -77,7 +77,7 @@ class TransactionsHistoryUseCase extends ReactiveUseCase {
     if (index != -1) {
       final chainTx = transactionsHistory.value[index];
       final pendingTxList = chainTx.txList
-          .where((element) => element.status == TransactionStatus.failed);
+          .where((element) => element.status == TransactionStatus.pending);
       for (TransactionModel pendingTx in pendingTxList) {
         spyOnTransaction(pendingTx, chainId);
       }

diff --git a/lib/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_page.dart b/lib/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_page.dart
@@ -120,9 +120,15 @@ class SendCryptoPage extends HookConsumerWidget {
                     return res;
                   }
                   try {
-                    if (int.parse(v!).isNegative) {
+                    final doubleValue = double.parse(v!);
+                    String stringValue = doubleValue.toString();
+
+                    int decimalPlaces = stringValue.split('.')[1].length;
+
+                    if (doubleValue.isNegative || decimalPlaces > 8) {
                       return translate('invalid_format');
                     }
+
                     return null;
                   } catch (e) {
                     return translate('invalid_format');