Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-01-09 20:39:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix: merge conflicts

Browse source
This commit is contained in:
Blazebrain 2023-10-03 14:13:13 +01:00
parent dc15fbcc74
commit 5e611becd7
3 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/reactions/on_authentication_state_change.dart
View file

@ -1,5 +1,3 @@
import 'package:cake_wallet/di.dart';
import 'package:cake_wallet/entities/preferences_key.dart';
import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/store/app_store.dart'; import 'package:cake_wallet/store/app_store.dart';
import 'package:cake_wallet/utils/exception_handler.dart'; import 'package:cake_wallet/utils/exception_handler.dart';
@ -8,7 +6,6 @@ import 'package:flutter/widgets.dart';
import 'package:mobx/mobx.dart'; import 'package:mobx/mobx.dart';
import 'package:cake_wallet/entities/load_current_wallet.dart'; import 'package:cake_wallet/entities/load_current_wallet.dart';
import 'package:cake_wallet/store/authentication_store.dart'; import 'package:cake_wallet/store/authentication_store.dart';
import 'package:shared_preferences/shared_preferences.dart';
ReactionDisposer? _onAuthenticationStateChange; ReactionDisposer? _onAuthenticationStateChange;

9
lib/src/screens/wallet_list/wallet_list_page.dart
View file

@ -5,7 +5,6 @@ import 'package:cake_wallet/utils/responsive_layout_util.dart';
import 'package:cake_wallet/utils/show_bar.dart'; import 'package:cake_wallet/utils/show_bar.dart';
import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart'; import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
import 'package:another_flushbar/flushbar.dart'; import 'package:another_flushbar/flushbar.dart';
import 'package:cake_wallet/view_model/wallet_seed_view_model.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/routes.dart';
@ -256,10 +255,10 @@ class WalletListBodyState extends State<WalletListBody> {
return; return;
} }
if (walletListItem.type == WalletType.haven) { // if (walletListItem.type == WalletType.haven) {
_onHavenWalletSelected(walletListItem); // _onHavenWalletSelected(walletListItem);
return; // return;
} // }
try { try {
changeProcessText(S.of(context).wallet_list_loading_wallet(walletListItem.name)); changeProcessText(S.of(context).wallet_list_loading_wallet(walletListItem.name));

14
lib/view_model/haven_removal_view_model.dart
View file

@ -6,15 +6,13 @@ import 'package:cw_core/wallet_base.dart';
import 'package:cw_core/wallet_info.dart'; import 'package:cw_core/wallet_info.dart';
import 'package:cw_core/wallet_type.dart'; import 'package:cw_core/wallet_type.dart';
import 'package:hive/hive.dart'; import 'package:hive/hive.dart';
import 'package:mobx/mobx.dart';
part 'haven_removal_view_model.g.dart'; class HavenRemovalViewModel {
HavenRemovalViewModel({
class HavenRemovalViewModel = HavenRemovalViewModelBase with _$HavenRemovalViewModel; required this.appStore,
required this.walletInfoSource,
abstract class HavenRemovalViewModelBase with Store { required this.walletLoadingService,
HavenRemovalViewModelBase( });
{required this.appStore, required this.walletInfoSource, required this.walletLoadingService});
final AppStore appStore; final AppStore appStore;
final Box<WalletInfo> walletInfoSource; final Box<WalletInfo> walletInfoSource;