Skip to content

N13/tree view scroll bug #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
n13 merged 23 commits into from
Jan 20, 2026
Merged

N13/tree view scroll bug #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6226c92
EntrustedAccount class added
n13 Jan 15, 2026
3e4b949
add address book service
n13 Jan 15, 2026
2811513
index map
n13 Jan 15, 2026
ffd11c6
show entrusted accounts
n13 Jan 15, 2026
d321f80
remove unused files
n13 Jan 15, 2026
cf25baa
add high security tag
n13 Jan 15, 2026
efe3513
unify refresh code
n13 Jan 15, 2026
d5223d6
send from high security account implemented
n13 Jan 15, 2026
0367b1d
fix crash on home screen for entrusted account
n13 Jan 15, 2026
e8002f8
intercept transaction flow implemented
n13 Jan 16, 2026
8fc3574
show intercept view in the entrusted account view for cancelled rever…
n13 Jan 16, 2026
1a345b1
format
n13 Jan 19, 2026
bb02256
add emergency button
n13 Jan 19, 2026
52d908f
fix linter errors
n13 Jan 19, 2026
a303c9a
remove send route
n13 Jan 19, 2026
5a2fe31
remove send from Q
n13 Jan 19, 2026
2b72221
refactor display account, remove special providers, move into settings
n13 Jan 19, 2026
969a7a6
fix intercept button
n13 Jan 19, 2026
3c5551f
fix tree view scroll bug
n13 Jan 19, 2026
70c8390
Merge branch 'main' into b13/tree_view_scroll_bug
n13 Jan 20, 2026
d0329bb
fix tree view again
n13 Jan 20, 2026
2ac8290
Delete entrusted_pull_all.png
n13 Jan 20, 2026
5e42a14
remove useless code
n13 Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions mobile-app/lib/features/components/tree_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,17 @@ class _TreeListViewState<T> extends State<TreeListView<T>> {

@override
Widget build(BuildContext context) {
return ListView(
padding: widget.padding,
physics: widget.physics,
shrinkWrap: widget.shrinkWrap,
children: _buildTreeNodes(widget.nodes, 0, []),
final children = _buildTreeNodes(widget.nodes, 0, []);
final content = Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: children,
);

if (widget.padding != null) {
return Padding(padding: widget.padding!, child: content);
}
return content;
}

List<Widget> _buildTreeNodes(List<TreeNode<T>> nodes, int depth, List<bool> parentLines) {
Expand Down
166 changes: 79 additions & 87 deletions mobile-app/lib/features/main/screens/accounts_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import 'package:resonance_network_wallet/providers/entrusted_account_provider.da
import 'package:resonance_network_wallet/providers/wallet_providers.dart';
import 'package:resonance_network_wallet/shared/extensions/media_query_data_extension.dart';
import 'package:resonance_network_wallet/utils/feature_flags.dart';
import 'dart:math';

enum _WalletMoreAction { createWallet, importWallet, addHardwareWallet }

Expand Down Expand Up @@ -312,8 +311,6 @@ class _AccountsScreenState extends ConsumerState<AccountsScreen> {
.map((entrusted) => TreeNode<EntrustedAccount>(data: entrusted))
.toList();

final double constraintMaxHeight = min(entrustedNodes.length * 52, 104);

final isHighSecurityAsync = ref.watch(isHighSecurityProvider(account));
final isHighSecurity = isHighSecurityAsync.value ?? false;

Expand Down Expand Up @@ -502,96 +499,91 @@ class _AccountsScreenState extends ConsumerState<AccountsScreen> {
],
),
if (entrustedNodes.isNotEmpty)
ConstrainedBox(
constraints: BoxConstraints(maxHeight: constraintMaxHeight),
child: TreeListView<EntrustedAccount>(
showExpandCollapse: false,
nodes: entrustedNodes,
nodeBuilder: (context, node, depth) {
final entrusted = node.data;
final isEntrustedActive = entrusted.accountId == activeAccountId;

return Row(
children: [
Expanded(
child: Material(
color: isEntrustedActive
? context.themeColors.surfaceActive
: context.themeColors.darkGray,
shape: RoundedRectangleBorder(
side: const BorderSide(color: Color(0x26FFFFFF)),
borderRadius: BorderRadius.circular(5),
),
child: InkWell(
borderRadius: BorderRadius.circular(5),
onTap: () async {
print('onTap: ${entrusted.accountId}');

// Set the entrusted account as the active display account
await ref
.read(activeAccountProvider.notifier)
.setActiveAccount(EntrustedDisplayAccount(entrusted));

// ignore: use_build_context_synchronously
if (mounted) Navigator.pop(context);
},
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 10),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
entrusted.name,
style: context.themeText.smallParagraph?.copyWith(
color: isEntrustedActive ? Colors.black : Colors.white,
),
TreeListView<EntrustedAccount>(
showExpandCollapse: false,
nodes: entrustedNodes,
nodeBuilder: (context, node, depth) {
final entrusted = node.data;
final isEntrustedActive = entrusted.accountId == activeAccountId;

return Row(
children: [
Expanded(
child: Material(
color: isEntrustedActive ? context.themeColors.surfaceActive : context.themeColors.darkGray,
shape: RoundedRectangleBorder(
side: const BorderSide(color: Color(0x26FFFFFF)),
borderRadius: BorderRadius.circular(5),
),
child: InkWell(
borderRadius: BorderRadius.circular(5),
onTap: () async {
print('onTap: ${entrusted.accountId}');

// Set the entrusted account as the active display account
await ref
.read(activeAccountProvider.notifier)
.setActiveAccount(EntrustedDisplayAccount(entrusted));

// ignore: use_build_context_synchronously
if (mounted) Navigator.pop(context);
},
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 10),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
entrusted.name,
style: context.themeText.smallParagraph?.copyWith(
color: isEntrustedActive ? Colors.black : Colors.white,
),
AccountTag(text: 'Entrusted', color: context.themeColors.accountTagEntrusted),
],
),
),
AccountTag(text: 'Entrusted', color: context.themeColors.accountTagEntrusted),
],
),
),
),
),
IconButton(
padding: EdgeInsets.zero,
constraints: const BoxConstraints(),
icon: SvgPicture.asset(
'assets/settings_icon_off.svg',
width: context.isTablet ? 28 : 21,
colorFilter: const ColorFilter.mode(Colors.white, BlendMode.srcIn),
),
onPressed: () async {
// Get current data from providers
final balanceAsync = ref.read(balanceProviderFamily(entrusted.accountId));
final checksumName = await _checksumService.getHumanReadableName(entrusted.accountId);

balanceAsync.when(
loading: () {},
error: (error, _) {},
data: (balance) async {
if (!mounted) return;
await Navigator.push<bool?>(
context,
MaterialPageRoute(
settings: const RouteSettings(name: AppConstants.accountSettingsRouteName),
builder: (context) => AccountSettingsScreen(
account: entrusted,
balance: _formattingService.formatBalance(balance, addSymbol: true),
checksumName: checksumName,
isHighSecurity: false,
isEntrustedAccount: true,
),
),
);
},
);
},
),
IconButton(
padding: EdgeInsets.zero,
constraints: const BoxConstraints(),
icon: SvgPicture.asset(
'assets/settings_icon_off.svg',
width: context.isTablet ? 28 : 21,
colorFilter: const ColorFilter.mode(Colors.white, BlendMode.srcIn),
),
],
);
},
),
onPressed: () async {
// Get current data from providers
final balanceAsync = ref.read(balanceProviderFamily(entrusted.accountId));
final checksumName = await _checksumService.getHumanReadableName(entrusted.accountId);

balanceAsync.when(
loading: () {},
error: (error, _) {},
data: (balance) async {
if (!mounted) return;
await Navigator.push<bool?>(
context,
MaterialPageRoute(
settings: const RouteSettings(name: AppConstants.accountSettingsRouteName),
builder: (context) => AccountSettingsScreen(
account: entrusted,
balance: _formattingService.formatBalance(balance, addSymbol: true),
checksumName: checksumName,
isHighSecurity: false,
isEntrustedAccount: true,
),
),
);
},
);
},
),
],
);
},
),
],
),
Expand Down