From d1fc0a5bbde8800daaf3c2f568dc5d85675bd542 Mon Sep 17 00:00:00 2001 From: fosse Date: Fri, 18 Aug 2023 12:06:05 -0400 Subject: [PATCH 1/2] small fix --- cw_nano/pubspec.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cw_nano/pubspec.yaml b/cw_nano/pubspec.yaml index ada2693a3..054dd5df4 100644 --- a/cw_nano/pubspec.yaml +++ b/cw_nano/pubspec.yaml @@ -12,7 +12,6 @@ environment: dependencies: flutter: sdk: flutter - web3dart: 2.3.5 mobx: ^2.0.7+4 bip39: ^1.0.6 bip32: ^2.0.0 @@ -21,7 +20,7 @@ dependencies: libcrypto: ^0.2.2 ed25519_hd_key: ^2.2.0 hex: ^0.2.0 - http: ^0.13.4 + http: ^1.1.0 cw_core: path: ../cw_core From 611f346ea88e9c93dcb5d76001d8ad576fe5c21f Mon Sep 17 00:00:00 2001 From: fosse Date: Fri, 18 Aug 2023 12:14:48 -0400 Subject: [PATCH 2/2] more merge fixes --- cw_nano/lib/nano_client.dart | 7 +------ lib/src/screens/nano/nano_change_rep_page.dart | 2 +- .../nano_accounts/nano_account_edit_or_create_page.dart | 2 +- lib/src/screens/nodes/pow_node_create_or_edit_page.dart | 5 +---- lib/src/screens/nodes/widgets/pow_node_list_row.dart | 5 +++-- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/cw_nano/lib/nano_client.dart b/cw_nano/lib/nano_client.dart index 97eaf4342..236ce68f3 100644 --- a/cw_nano/lib/nano_client.dart +++ b/cw_nano/lib/nano_client.dart @@ -11,15 +11,12 @@ import 'package:cw_nano/nano_util.dart'; import 'package:flutter/services.dart'; import 'package:http/http.dart' as http; import 'package:nanodart/nanodart.dart'; -import 'package:web3dart/web3dart.dart'; -import 'package:web3dart/contracts/erc20.dart'; import 'package:cw_core/node.dart'; class NanoClient { static const String DEFAULT_REPRESENTATIVE = "nano_38713x95zyjsqzx6nm1dsom1jmm668owkeb9913ax6nfgj15az3nu8xkx579"; - StreamSubscription? subscription; Node? _node; PowNode? _powNode; @@ -434,9 +431,7 @@ class NanoClient { throw UnimplementedError(); } - void stop() { - subscription?.cancel(); - } + void stop() {} Future> fetchTransactions(String address) async { try { diff --git a/lib/src/screens/nano/nano_change_rep_page.dart b/lib/src/screens/nano/nano_change_rep_page.dart index e2fe17eb8..9a5235657 100644 --- a/lib/src/screens/nano/nano_change_rep_page.dart +++ b/lib/src/screens/nano/nano_change_rep_page.dart @@ -93,7 +93,7 @@ class NanoChangeRepPage extends BasePage { } }, text: S.of(context).change, - color: Theme.of(context).accentTextTheme.bodyLarge!.color!, + color: Theme.of(context).primaryColor, textColor: Colors.white, ), )), diff --git a/lib/src/screens/nano_accounts/nano_account_edit_or_create_page.dart b/lib/src/screens/nano_accounts/nano_account_edit_or_create_page.dart index b4c75fd8b..3ece15a82 100644 --- a/lib/src/screens/nano_accounts/nano_account_edit_or_create_page.dart +++ b/lib/src/screens/nano_accounts/nano_account_edit_or_create_page.dart @@ -54,7 +54,7 @@ class NanoAccountEditOrCreatePage extends BasePage { text: nanoAccountCreationViewModel.isEdit ? S.of(context).rename : S.of(context).add, - color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, + color: Theme.of(context).primaryColor, textColor: Colors.white, isLoading: nanoAccountCreationViewModel.state is IsExecutingState, isDisabled: nanoAccountCreationViewModel.label?.isEmpty ?? true, diff --git a/lib/src/screens/nodes/pow_node_create_or_edit_page.dart b/lib/src/screens/nodes/pow_node_create_or_edit_page.dart index 2bbff2913..b6fdb7b87 100644 --- a/lib/src/screens/nodes/pow_node_create_or_edit_page.dart +++ b/lib/src/screens/nodes/pow_node_create_or_edit_page.dart @@ -185,10 +185,7 @@ class PowNodeCreateOrEditPage extends BasePage { Navigator.of(context).pop(); }, text: S.of(context).save, - color: Theme.of(context) - .accentTextTheme! - .bodyLarge! - .color!, + color: Theme.of(context).primaryColor, textColor: Colors.white, isDisabled: (!nodeCreateOrEditViewModel.isReady)|| (nodeCreateOrEditViewModel diff --git a/lib/src/screens/nodes/widgets/pow_node_list_row.dart b/lib/src/screens/nodes/widgets/pow_node_list_row.dart index 2a829650d..eebfbcc07 100644 --- a/lib/src/screens/nodes/widgets/pow_node_list_row.dart +++ b/lib/src/screens/nodes/widgets/pow_node_list_row.dart @@ -1,6 +1,7 @@ import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/src/screens/nodes/widgets/node_indicator.dart'; import 'package:cake_wallet/src/widgets/standard_list.dart'; +import 'package:cake_wallet/themes/extensions/filter_theme.dart'; import 'package:cake_wallet/themes/extensions/receive_page_theme.dart'; import 'package:cw_core/pow_node.dart'; import 'package:flutter/material.dart'; @@ -52,8 +53,8 @@ class PowNodeHeaderListRow extends StandardListRow { Widget buildTrailing(BuildContext context) { return SizedBox( width: 20, - child: - Icon(Icons.add, color: Theme.of(context).accentTextTheme!.titleMedium!.color, size: 24.0), + child: Icon(Icons.add, + color: Theme.of(context).extension()!.titlesColor, size: 24.0), ); } }