CWA-169 | created check_amount then added to transaction_info and to trade
Oleksandr Sobol committed
Feb 7, 2020 at 14:06 UTC
ad241ca1dbd78f2f0da44810229c3c2f4636f59d
4 files changed
+15
-3
lib/src/domain/common/check_amount.dart
new
+8
@@ -0,0 +1,8 @@
1
+String checkAmount(String amount) {
2
+ if (!amount.contains('.')) {
3
+ return amount + '.00';
4
+ } else if (amount.endsWith('.')) {
5
+ return amount + '00';
6
+ }
7
+ return amount;
8
+}
\ No newline at end of file
lib/src/domain/common/transaction_info.dart
+3
-2
@@ -2,6 +2,7 @@ import 'package:cake_wallet/src/domain/monero/monero_amount_format.dart';
2
import 'package:cw_monero/structs/transaction_info_row.dart';
3
import 'package:cake_wallet/src/domain/common/parseBoolFromString.dart';
4
import 'package:cake_wallet/src/domain/common/transaction_direction.dart';
5
+import 'package:cake_wallet/src/domain/common/check_amount.dart';
6
7
class TransactionInfo {
8
TransactionInfo(this.id, this.height, this.direction, this.date,
@@ -40,9 +41,9 @@ class TransactionInfo {
41
42
String _fiatAmount;
43
43
- String amountFormatted() => '${moneroAmountToString(amount: amount)} XMR';
44
+ String amountFormatted() => '${checkAmount(moneroAmountToString(amount: amount))} XMR';
45
46
String fiatAmount() => _fiatAmount ?? '';
47
47
- void changeFiatAmount(String amount) => _fiatAmount = amount;
48
+ void changeFiatAmount(String amount) => _fiatAmount = checkAmount(amount);
49
}
lib/src/domain/exchange/trade.dart
+3
@@ -2,6 +2,7 @@ import 'package:hive/hive.dart';
2
import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
3
import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.dart';
4
import 'package:cake_wallet/src/domain/exchange/trade_state.dart';
5
+import 'package:cake_wallet/src/domain/common/check_amount.dart';
6
7
part 'trade.g.dart';
8
@@ -101,4 +102,6 @@ class Trade extends HiveObject {
102
'wallet_id': walletId
103
};
104
}
105
+
106
+ String amountFormatted() => checkAmount(amount);
107
}
lib/src/screens/dashboard/dashboard_page.dart
+1
-1
@@ -577,7 +577,7 @@ class DashboardPageBodyState extends State<DashboardPageBody> {
577
final formattedAmount = trade.amount != null
578
? savedDisplayMode == BalanceDisplayMode.hiddenBalance
579
? '---'
580
- : trade.amount
580
+ : trade.amountFormatted()
581
: trade.amount;
582
583
return TradeRow(