mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-01-09 12:29:31 +00:00
updates
This commit is contained in:
parent
1adf9ae1b5
commit
d4e3e505cf
3 changed files with 22 additions and 14 deletions
13
lib/di.dart
13
lib/di.dart
|
@ -15,7 +15,7 @@ import 'package:cake_wallet/entities/exchange_api_mode.dart';
|
||||||
import 'package:cake_wallet/entities/parse_address_from_domain.dart';
|
import 'package:cake_wallet/entities/parse_address_from_domain.dart';
|
||||||
import 'package:cake_wallet/src/screens/dashboard/sign_page.dart';
|
import 'package:cake_wallet/src/screens/dashboard/sign_page.dart';
|
||||||
import 'package:cake_wallet/src/screens/transaction_details/rbf_details_page.dart';
|
import 'package:cake_wallet/src/screens/transaction_details/rbf_details_page.dart';
|
||||||
import 'package:cake_wallet/view_model/dashboard/sign_message_view_model.dart';
|
import 'package:cake_wallet/view_model/dashboard/sign_view_model.dart';
|
||||||
import 'package:cw_core/receive_page_option.dart';
|
import 'package:cw_core/receive_page_option.dart';
|
||||||
import 'package:cake_wallet/ethereum/ethereum.dart';
|
import 'package:cake_wallet/ethereum/ethereum.dart';
|
||||||
import 'package:cake_wallet/nano/nano.dart';
|
import 'package:cake_wallet/nano/nano.dart';
|
||||||
|
@ -1142,9 +1142,9 @@ Future<void> setup({
|
||||||
getIt.registerFactory(() => IoniaAccountCardsPage(getIt.get<IoniaAccountViewModel>()));
|
getIt.registerFactory(() => IoniaAccountCardsPage(getIt.get<IoniaAccountViewModel>()));
|
||||||
|
|
||||||
getIt.registerFactoryParam<RBFDetailsPage, TransactionInfo, void>(
|
getIt.registerFactoryParam<RBFDetailsPage, TransactionInfo, void>(
|
||||||
(TransactionInfo transactionInfo, _) => RBFDetailsPage(
|
(TransactionInfo transactionInfo, _) => RBFDetailsPage(
|
||||||
transactionDetailsViewModel:
|
transactionDetailsViewModel:
|
||||||
getIt.get<TransactionDetailsViewModel>(param1: transactionInfo)));
|
getIt.get<TransactionDetailsViewModel>(param1: transactionInfo)));
|
||||||
|
|
||||||
getIt.registerFactory(() => AnonPayApi(
|
getIt.registerFactory(() => AnonPayApi(
|
||||||
useTorOnly: getIt.get<SettingsStore>().exchangeStatus == ExchangeApiMode.torOnly,
|
useTorOnly: getIt.get<SettingsStore>().exchangeStatus == ExchangeApiMode.torOnly,
|
||||||
|
@ -1205,12 +1205,11 @@ Future<void> setup({
|
||||||
|
|
||||||
getIt.registerFactory(
|
getIt.registerFactory(
|
||||||
() => WalletConnectConnectionsView(web3walletService: getIt.get<Web3WalletService>()));
|
() => WalletConnectConnectionsView(web3walletService: getIt.get<Web3WalletService>()));
|
||||||
|
|
||||||
getIt.registerFactoryParam<SignPage, SignViewModel, void>((signViewModel, _) =>
|
|
||||||
SignPage(signViewModel));
|
|
||||||
|
|
||||||
getIt.registerFactory(() => NFTViewModel(appStore, getIt.get<BottomSheetService>()));
|
getIt.registerFactory(() => NFTViewModel(appStore, getIt.get<BottomSheetService>()));
|
||||||
getIt.registerFactory<TorPage>(() => TorPage(getIt.get<AppStore>()));
|
getIt.registerFactory<TorPage>(() => TorPage(getIt.get<AppStore>()));
|
||||||
|
|
||||||
|
getIt.registerFactory(() => SignViewModel(getIt.get<AppStore>().wallet!));
|
||||||
|
|
||||||
_isSetupFinished = true;
|
_isSetupFinished = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,7 @@ import 'package:cake_wallet/src/screens/buy/webview_page.dart';
|
||||||
import 'package:cake_wallet/src/screens/dashboard/edit_token_page.dart';
|
import 'package:cake_wallet/src/screens/dashboard/edit_token_page.dart';
|
||||||
import 'package:cake_wallet/src/screens/dashboard/home_settings_page.dart';
|
import 'package:cake_wallet/src/screens/dashboard/home_settings_page.dart';
|
||||||
import 'package:cake_wallet/src/screens/dashboard/pages/nft_details_page.dart';
|
import 'package:cake_wallet/src/screens/dashboard/pages/nft_details_page.dart';
|
||||||
|
import 'package:cake_wallet/src/screens/dashboard/sign_page.dart';
|
||||||
import 'package:cake_wallet/src/screens/nano/nano_change_rep_page.dart';
|
import 'package:cake_wallet/src/screens/nano/nano_change_rep_page.dart';
|
||||||
import 'package:cake_wallet/src/screens/nano_accounts/nano_account_edit_or_create_page.dart';
|
import 'package:cake_wallet/src/screens/nano_accounts/nano_account_edit_or_create_page.dart';
|
||||||
import 'package:cake_wallet/src/screens/nodes/pow_node_create_or_edit_page.dart';
|
import 'package:cake_wallet/src/screens/nodes/pow_node_create_or_edit_page.dart';
|
||||||
|
@ -61,6 +62,7 @@ import 'package:cake_wallet/src/screens/wallet_connect/wc_connections_listing_vi
|
||||||
import 'package:cake_wallet/utils/payment_request.dart';
|
import 'package:cake_wallet/utils/payment_request.dart';
|
||||||
import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
|
import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
|
||||||
import 'package:cake_wallet/view_model/dashboard/nft_view_model.dart';
|
import 'package:cake_wallet/view_model/dashboard/nft_view_model.dart';
|
||||||
|
import 'package:cake_wallet/view_model/dashboard/sign_view_model.dart';
|
||||||
import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';
|
import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';
|
||||||
import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
|
import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
|
||||||
import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
|
import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
|
||||||
|
@ -151,7 +153,8 @@ Route<dynamic> createRoute(RouteSettings settings) {
|
||||||
final walletNewVM = getIt.get<WalletNewVM>(param1: type);
|
final walletNewVM = getIt.get<WalletNewVM>(param1: type);
|
||||||
final seedTypeViewModel = getIt.get<SeedTypeViewModel>();
|
final seedTypeViewModel = getIt.get<SeedTypeViewModel>();
|
||||||
|
|
||||||
return CupertinoPageRoute<void>(builder: (_) => NewWalletPage(walletNewVM, seedTypeViewModel));
|
return CupertinoPageRoute<void>(
|
||||||
|
builder: (_) => NewWalletPage(walletNewVM, seedTypeViewModel));
|
||||||
|
|
||||||
case Routes.setupPin:
|
case Routes.setupPin:
|
||||||
Function(PinCodeState<PinCodeWidget>, String)? callback;
|
Function(PinCodeState<PinCodeWidget>, String)? callback;
|
||||||
|
@ -257,8 +260,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
|
||||||
case Routes.bumpFeePage:
|
case Routes.bumpFeePage:
|
||||||
return CupertinoPageRoute<void>(
|
return CupertinoPageRoute<void>(
|
||||||
fullscreenDialog: true,
|
fullscreenDialog: true,
|
||||||
builder: (_) =>
|
builder: (_) => getIt.get<RBFDetailsPage>(param1: settings.arguments as TransactionInfo));
|
||||||
getIt.get<RBFDetailsPage>(param1: settings.arguments as TransactionInfo));
|
|
||||||
|
|
||||||
case Routes.newSubaddress:
|
case Routes.newSubaddress:
|
||||||
return CupertinoPageRoute<void>(
|
return CupertinoPageRoute<void>(
|
||||||
|
@ -400,8 +402,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
|
||||||
|
|
||||||
case Routes.buySellPage:
|
case Routes.buySellPage:
|
||||||
final args = settings.arguments as bool;
|
final args = settings.arguments as bool;
|
||||||
return MaterialPageRoute<void>(
|
return MaterialPageRoute<void>(builder: (_) => getIt.get<BuySellOptionsPage>(param1: args));
|
||||||
builder: (_) => getIt.get<BuySellOptionsPage>(param1: args));
|
|
||||||
|
|
||||||
case Routes.buyWebView:
|
case Routes.buyWebView:
|
||||||
final args = settings.arguments as List;
|
final args = settings.arguments as List;
|
||||||
|
@ -424,8 +425,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
|
||||||
|
|
||||||
case Routes.preSeedPage:
|
case Routes.preSeedPage:
|
||||||
return MaterialPageRoute<void>(
|
return MaterialPageRoute<void>(
|
||||||
builder: (_) => getIt.get<PreSeedPage>(
|
builder: (_) => getIt.get<PreSeedPage>(param1: settings.arguments as int));
|
||||||
param1: settings.arguments as int));
|
|
||||||
|
|
||||||
case Routes.backup:
|
case Routes.backup:
|
||||||
return CupertinoPageRoute<void>(
|
return CupertinoPageRoute<void>(
|
||||||
|
@ -647,6 +647,13 @@ Route<dynamic> createRoute(RouteSettings settings) {
|
||||||
case Routes.torPage:
|
case Routes.torPage:
|
||||||
return MaterialPageRoute<void>(builder: (_) => getIt.get<TorPage>());
|
return MaterialPageRoute<void>(builder: (_) => getIt.get<TorPage>());
|
||||||
|
|
||||||
|
case Routes.signPage:
|
||||||
|
return MaterialPageRoute<void>(
|
||||||
|
builder: (_) => SignPage(
|
||||||
|
getIt.get<SignViewModel>(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return MaterialPageRoute<void>(
|
return MaterialPageRoute<void>(
|
||||||
builder: (_) => Scaffold(
|
builder: (_) => Scaffold(
|
||||||
|
|
|
@ -68,6 +68,8 @@ class MarketPlacePage extends StatelessWidget {
|
||||||
subTitle: S.of(context).cake_pay_web_cards_subtitle,
|
subTitle: S.of(context).cake_pay_web_cards_subtitle,
|
||||||
),
|
),
|
||||||
|
|
||||||
|
SizedBox(height: 20),
|
||||||
|
|
||||||
Observer(
|
Observer(
|
||||||
builder: (context) {
|
builder: (context) {
|
||||||
if (!dashboardViewModel.hasSignMessages) {
|
if (!dashboardViewModel.hasSignMessages) {
|
||||||
|
|
Loading…
Reference in a new issue