mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-11-21 10:24:15 +01:00
Merge branch 'dev' into CAKE-20-update-exchange-and-send-screens
# Conflicts: # lib/di.dart # lib/palette.dart # lib/src/screens/base_page.dart # lib/src/screens/dashboard/dashboard_page.dart # lib/src/screens/receive/receive_page.dart
This commit is contained in:
@@ -22,6 +22,7 @@ import 'package:cake_wallet/store/dashboard/trades_store.dart';
|
||||
import 'package:cake_wallet/store/dashboard/trade_filter_store.dart';
|
||||
import 'package:cake_wallet/store/dashboard/transaction_filter_store.dart';
|
||||
import 'package:cake_wallet/view_model/dashboard/formatted_item_list.dart';
|
||||
import 'package:cake_wallet/store/dashboard/page_view_store.dart';
|
||||
|
||||
part 'dashboard_view_model.g.dart';
|
||||
|
||||
@@ -33,7 +34,8 @@ abstract class DashboardViewModelBase with Store {
|
||||
this.appStore,
|
||||
this.tradesStore,
|
||||
this.tradeFilterStore,
|
||||
this.transactionFilterStore}) {
|
||||
this.transactionFilterStore,
|
||||
this.pageViewStore}) {
|
||||
|
||||
name = appStore.wallet?.name;
|
||||
wallet ??= appStore.wallet;
|
||||
@@ -53,8 +55,6 @@ abstract class DashboardViewModelBase with Store {
|
||||
if (_wallet is MoneroWallet) {
|
||||
subname = _wallet.account?.label;
|
||||
}
|
||||
|
||||
currentPage = 0;
|
||||
}
|
||||
|
||||
@observable
|
||||
@@ -63,15 +63,15 @@ abstract class DashboardViewModelBase with Store {
|
||||
@observable
|
||||
String name;
|
||||
|
||||
@observable
|
||||
double currentPage;
|
||||
|
||||
@observable
|
||||
ObservableList<TransactionListItem> transactions;
|
||||
|
||||
@observable
|
||||
String subname;
|
||||
|
||||
@computed
|
||||
double get currentPage => pageViewStore.currentPage;
|
||||
|
||||
@computed
|
||||
String get address => wallet.address;
|
||||
|
||||
@@ -130,6 +130,8 @@ abstract class DashboardViewModelBase with Store {
|
||||
|
||||
TransactionFilterStore transactionFilterStore;
|
||||
|
||||
PageViewStore pageViewStore;
|
||||
|
||||
ReactionDisposer _reaction;
|
||||
|
||||
void _onWalletChange(WalletBase wallet) {
|
||||
|
||||
@@ -9,7 +9,15 @@ class MoneroAccountListViewModel = MoneroAccountListViewModelBase
|
||||
with _$MoneroAccountListViewModel;
|
||||
|
||||
abstract class MoneroAccountListViewModelBase with Store {
|
||||
MoneroAccountListViewModelBase(this._moneroWallet);
|
||||
MoneroAccountListViewModelBase(this._moneroWallet) : scrollOffsetFromTop = 0;
|
||||
|
||||
@observable
|
||||
double scrollOffsetFromTop;
|
||||
|
||||
@action
|
||||
void setScrollOffsetFromTop(double scrollOffsetFromTop) {
|
||||
this.scrollOffsetFromTop = scrollOffsetFromTop;
|
||||
}
|
||||
|
||||
@computed
|
||||
List<AccountListItem> get accounts => _moneroWallet.accountList.accounts
|
||||
|
||||
@@ -7,6 +7,7 @@ import 'package:cake_wallet/utils/list_item.dart';
|
||||
import 'package:cake_wallet/view_model/wallet_address_list/wallet_account_list_header.dart';
|
||||
import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_header.dart';
|
||||
import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_item.dart';
|
||||
import 'package:cake_wallet/src/domain/common/wallet_type.dart';
|
||||
|
||||
part 'wallet_address_list_view_model.g.dart';
|
||||
|
||||
@@ -62,6 +63,9 @@ abstract class WalletAddressListViewModelBase with Store {
|
||||
@observable
|
||||
String amount;
|
||||
|
||||
@computed
|
||||
WalletType get type => _wallet.type;
|
||||
|
||||
@computed
|
||||
WalletAddressListItem get address => WalletAddressListItem(address: _wallet.address);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user