CAKE-158 | merged 4.0.8 into current branch; renamed _onMoneroTransactionsChange() on _onMoneroTransactionsUpdate(); applied _onMoneroTransactionsUpdate() in the dashboard_view_model.dart
OleksandrSobol committed
Nov 18, 2020 at 19:09 UTC
7aecb330442912fab3ad4079948120199317a1e1
2 files changed
+8
-24
lib/src/screens/receive/receive_page.dart
+1
@@ -1,3 +1,4 @@
1
+import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
2
import 'package:cake_wallet/utils/show_pop_up.dart';
3
import 'package:flutter/material.dart';
4
import 'package:flutter/cupertino.dart';
lib/view_model/dashboard/dashboard_view_model.dart
+7
-24
@@ -89,7 +89,7 @@ abstract class DashboardViewModelBase with Store {
89
90
_onMoneroTransactionsChangeReaction = reaction((_) => _wallet.transactionHistory,
91
(MoneroTransactionHistory transactionHistory) =>
92
- _onMoneroTransactionsChange(_wallet));
92
+ _onMoneroTransactionsUpdate(_wallet));
93
94
final _accountTransactions = _wallet
95
.transactionHistory.transactions.values
@@ -204,7 +204,6 @@ abstract class DashboardViewModelBase with Store {
204
void _onWalletChange(WalletBase wallet) {
205
this.wallet = wallet;
206
name = wallet.name;
207
- transactions.clear();
207
208
if (wallet is MoneroWallet) {
209
subname = wallet.account?.label;
@@ -217,18 +216,12 @@ abstract class DashboardViewModelBase with Store {
216
217
_onMoneroTransactionsChangeReaction = reaction((_) => wallet.transactionHistory,
218
(MoneroTransactionHistory transactionHistory) =>
220
- _onMoneroTransactionsChange(wallet));
221
-
222
- final _accountTransactions = wallet
223
- .transactionHistory.transactions.values
224
- .where((tx) => tx.accountIndex == wallet.account.id).toList();
219
+ _onMoneroTransactionsUpdate(wallet));
220
226
- transactions.addAll(_accountTransactions
227
- .map((transaction) => TransactionListItem(
228
- transaction: transaction,
229
- balanceViewModel: balanceViewModel,
230
- settingsStore: appStore.settingsStore)));
221
+ _onMoneroTransactionsUpdate(wallet);
222
} else {
223
+ transactions.clear();
224
+
225
transactions.addAll(wallet.transactionHistory.transactions.values.map(
226
(transaction) => TransactionListItem(
227
transaction: transaction,
@@ -240,21 +233,11 @@ abstract class DashboardViewModelBase with Store {
233
@action
234
void _onMoneroAccountChange(MoneroWallet wallet) {
235
subname = wallet.account?.label;
243
- transactions.clear();
244
-
245
- final _accountTransactions = wallet
246
- .transactionHistory.transactions.values
247
- .where((tx) => tx.accountIndex == wallet.account.id).toList();
248
-
249
- transactions.addAll(_accountTransactions
250
- .map((transaction) => TransactionListItem(
251
- transaction: transaction,
252
- balanceViewModel: balanceViewModel,
253
- settingsStore: appStore.settingsStore)));
236
+ _onMoneroTransactionsUpdate(wallet);
237
}
238
239
@action
257
- void _onMoneroTransactionsChange(MoneroWallet wallet) {
240
+ void _onMoneroTransactionsUpdate(MoneroWallet wallet) {
241
transactions.clear();
242
243
final _accountTransactions = wallet