Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-01-22 18:54:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

merge conflict fixes

Browse source
This commit is contained in:
fosse 2023-08-18 08:58:37 -04:00
parent 2d8923a1e3
commit f948b3dea6
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/src/screens/dashboard/widgets/address_page.dart
View file

@ -214,13 +214,14 @@ class AddressPage extends BasePage {
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w500,
color: Theme.of(context).extension<DashboardPageTheme>()!.textColor),
color: Theme.of(context)
.extension<DashboardPageTheme>()!
.textColor),
)),
Icon(
Icons.arrow_forward_ios,
size: 14,
color:
Theme.of(context).extension<DashboardPageTheme>()!.textColor,
color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
)
],
),

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

@ -30,7 +30,7 @@ class NanoAccountListPage extends StatelessWidget {
child: ListView.separated(
padding: EdgeInsets.zero,
controller: controller,
separatorBuilder: (context, index) => const SectionDivider(),
separatorBuilder: (context, index) => const VerticalSectionDivider(),
itemCount: accounts.length,
itemBuilder: (context, index) {
final account = accounts[index];

2
lib/src/screens/restore/wallet_restore_choose_derivation.dart
View file

@ -19,7 +19,7 @@ class WalletRestoreChooseDerivationPage extends BasePage {
fontSize: 18.0,
fontWeight: FontWeight.bold,
fontFamily: 'Lato',
color: titleColor ?? Theme.of(context).primaryTextTheme!.titleLarge!.color!),
color: titleColor(context)),
));
final WalletRestoreChooseDerivationViewModel walletRestoreChooseDerivationViewModel;

3
lib/src/screens/settings/manage_pow_nodes_page.dart
View file

@ -40,12 +40,11 @@ class ManagePowNodesPage extends BasePage {
return Flexible(
child: SectionStandardList(
sectionCount: 1,
context: context,
dividerPadding: EdgeInsets.symmetric(horizontal: 24),
itemCounter: (int sectionIndex) {
return nodeListViewModel.nodes.length;
},
itemBuilder: (_, sectionIndex, index) {
itemBuilder: (_, index) {
final node = nodeListViewModel.nodes[index];
final isSelected = node.keyIndex == nodeListViewModel.currentNode.keyIndex;
final nodeListRow = PowNodeListRow(