fix Acala collateral withdraw issue

polkawallet-io · Aug 3, 2020 · 5d1326d · 5d1326d
1 parent 905ae7b
commit 5d1326d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/lib/page-acala/loan/loanAdjustPage.dart b/lib/page-acala/loan/loanAdjustPage.dart
@@ -266,13 +266,19 @@ class _LoanAdjustPageState extends State<LoanAdjustPage> {
           ]
         };
       case LoanAdjustPage.actionTypeWithdraw:
+
+        /// withdraw all if user input near max
+        BigInt amt =
+            loan.collaterals - _amountCollateral > BigInt.parse('1000000000000')
+                ? _amountCollateral
+                : loan.collaterals;
         return {
           'detail': jsonEncode({
             "amount": _amountCtrl.text.trim(),
           }),
           'params': [
             params.token,
-            (BigInt.zero - _amountCollateral).toString(),
+            (BigInt.zero - amt).toString(),
             0,
           ]
         };

diff --git a/lib/utils/format.dart b/lib/utils/format.dart
@@ -104,10 +104,14 @@ class Fmt {
       return BigInt.zero;
     }
     double v = 0;
-    if (value.contains(',') || value.contains('.')) {
-      v = NumberFormat(",##0.${"0" * decimals}").parse(value);
-    } else {
-      v = double.parse(value);
+    try {
+      if (value.contains(',') || value.contains('.')) {
+        v = NumberFormat(",##0.${"0" * decimals}").parse(value);
+      } else {
+        v = double.parse(value);
+      }
+    } catch (err) {
+      print('Fmt.tokenInt() error: ${err.toString()}');
     }
     return BigInt.from(v * pow(10, decimals));
   }