Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-02-02 11:16:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more merge fixes

Browse source
This commit is contained in:
fosse 2023-08-18 12:14:48 -04:00
parent d1fc0a5bbd
commit 611f346ea8
5 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cw_nano/lib/nano_client.dart
View file

@ -11,15 +11,12 @@ import 'package:cw_nano/nano_util.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:nanodart/nanodart.dart'; import 'package:nanodart/nanodart.dart';
import 'package:web3dart/web3dart.dart';
import 'package:web3dart/contracts/erc20.dart';
import 'package:cw_core/node.dart'; import 'package:cw_core/node.dart';
class NanoClient { class NanoClient {
static const String DEFAULT_REPRESENTATIVE = static const String DEFAULT_REPRESENTATIVE =
"nano_38713x95zyjsqzx6nm1dsom1jmm668owkeb9913ax6nfgj15az3nu8xkx579"; "nano_38713x95zyjsqzx6nm1dsom1jmm668owkeb9913ax6nfgj15az3nu8xkx579";
StreamSubscription<Transfer>? subscription;
Node? _node; Node? _node;
PowNode? _powNode; PowNode? _powNode;
@ -434,9 +431,7 @@ class NanoClient {
throw UnimplementedError(); throw UnimplementedError();
} }
void stop() { void stop() {}
subscription?.cancel();
}
Future<List<NanoTransactionModel>> fetchTransactions(String address) async { Future<List<NanoTransactionModel>> fetchTransactions(String address) async {
try { try {

2
lib/src/screens/nano/nano_change_rep_page.dart
View file

@ -93,7 +93,7 @@ class NanoChangeRepPage extends BasePage {
} }
}, },
text: S.of(context).change, text: S.of(context).change,
color: Theme.of(context).accentTextTheme.bodyLarge!.color!, color: Theme.of(context).primaryColor,
textColor: Colors.white, textColor: Colors.white,
), ),
)), )),

2
lib/src/screens/nano_accounts/nano_account_edit_or_create_page.dart
View file

@ -54,7 +54,7 @@ class NanoAccountEditOrCreatePage extends BasePage {
text: nanoAccountCreationViewModel.isEdit text: nanoAccountCreationViewModel.isEdit
? S.of(context).rename ? S.of(context).rename
: S.of(context).add, : S.of(context).add,
color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, color: Theme.of(context).primaryColor,
textColor: Colors.white, textColor: Colors.white,
isLoading: nanoAccountCreationViewModel.state is IsExecutingState, isLoading: nanoAccountCreationViewModel.state is IsExecutingState,
isDisabled: nanoAccountCreationViewModel.label?.isEmpty ?? true, isDisabled: nanoAccountCreationViewModel.label?.isEmpty ?? true,

5
lib/src/screens/nodes/pow_node_create_or_edit_page.dart
View file

@ -185,10 +185,7 @@ class PowNodeCreateOrEditPage extends BasePage {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
text: S.of(context).save, text: S.of(context).save,
color: Theme.of(context) color: Theme.of(context).primaryColor,
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
isDisabled: (!nodeCreateOrEditViewModel.isReady)|| isDisabled: (!nodeCreateOrEditViewModel.isReady)||
(nodeCreateOrEditViewModel (nodeCreateOrEditViewModel

5
lib/src/screens/nodes/widgets/pow_node_list_row.dart
View file

@ -1,6 +1,7 @@
import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/src/screens/nodes/widgets/node_indicator.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/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:cake_wallet/themes/extensions/receive_page_theme.dart';
import 'package:cw_core/pow_node.dart'; import 'package:cw_core/pow_node.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -52,8 +53,8 @@ class PowNodeHeaderListRow extends StandardListRow {
Widget buildTrailing(BuildContext context) { Widget buildTrailing(BuildContext context) {
return SizedBox( return SizedBox(
width: 20, width: 20,
child: child: Icon(Icons.add,
Icon(Icons.add, color: Theme.of(context).accentTextTheme!.titleMedium!.color, size: 24.0), color: Theme.of(context).extension<FilterTheme>()!.titlesColor, size: 24.0),
); );
} }
} }