Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
80 changes: 40 additions & 40 deletions mobile-app/lib/v2/screens/accounts/account_menu_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
import 'package:wallet_core/l10n/app_localizations.dart';
import 'package:wallet_core/providers/account_providers.dart';
import 'package:wallet_core/providers/l10n_provider.dart';
import 'package:wallet_core/utils/accounts_grouping.dart';
import 'package:wallet_core/utils/account_menu.dart';
import 'package:resonance_network_wallet/v2/components/menu_row.dart';
import 'package:resonance_network_wallet/v2/screens/accounts/account_details_screen.dart';
import 'package:resonance_network_wallet/v2/screens/accounts/accounts_navigation.dart';
Expand Down Expand Up @@ -83,27 +83,25 @@ class AccountMenuScreen extends ConsumerWidget {
);
}

/// Hardware accounts can always be disconnected. Software accounts can be
/// disconnected, except the last remaining account of the primary wallet
/// (index 0) — that wallet can only be removed by logging out.
static bool canDisconnect(WidgetRef ref, Account account) {
if (account.accountType == AccountType.keystone) return true;
if (account.accountType != AccountType.local) return false;
if (account.walletIndex == 0) return !_isLastInWallet(ref, account);
return true;
}
static DisconnectPlan? _planOf(WidgetRef ref, Account account) =>
disconnectPlanOf(account, ref.read(accountsProvider).requireValue);

static bool _isLastInWallet(WidgetRef ref, Account account) {
final all = ref.read(accountsProvider).value ?? <Account>[];
final siblings = all.where((a) => a.walletIndex == account.walletIndex && a.accountType != AccountType.encrypted);
return siblings.length <= 1;
}
/// Whether [account] can be disconnected; see [disconnectPlanOf].
static bool canDisconnect(WidgetRef ref, Account account) => _planOf(ref, account) != null;

static Future<void> disconnect(BuildContext context, WidgetRef ref, Account account) {
if (account.accountType == AccountType.keystone) {
return _onDisconnectHardware(context, ref, account);
}
return _onDisconnectSoftware(context, ref, account);
return switch (_planOf(ref, account)) {
DisconnectHardware() => _onDisconnectHardware(context, ref, account),
DisconnectAccount() => _onDisconnectAccount(context, ref, account),
DisconnectWallet(:final walletIndex, :final walletNumber) => _onDisconnectWallet(
context,
ref,
account,
walletIndex: walletIndex,
walletNumber: walletNumber,
),
null => throw StateError('${account.accountId} cannot be disconnected'),
};
}

static Future<void> _onDisconnectHardware(BuildContext context, WidgetRef ref, Account account) async {
Expand All @@ -120,28 +118,30 @@ class AccountMenuScreen extends ConsumerWidget {
await _performRemoveAccount(context, ref, account);
}

/// Disconnecting a software account removes just that account, unless it is
/// the last account in its wallet — in which case it removes the entire
/// wallet (and its recovery phrase) after a second confirmation.
static Future<void> _onDisconnectSoftware(BuildContext context, WidgetRef ref, Account account) async {
static Future<void> _onDisconnectAccount(BuildContext context, WidgetRef ref, Account account) async {
final l10n = ref.read(l10nProvider);
final allAccounts = ref.read(accountsProvider).value ?? <Account>[];

if (!_isLastInWallet(ref, account)) {
final confirmed = await showConfirmActionSheet(
context,
title: l10n.accountMenuDisconnectAccountTitle,
message: l10n.accountMenuDisconnectAccountMessage(account.name),
confirmLabel: l10n.accountMenuDisconnect,
cancelLabel: l10n.commonCancel,
isDestructive: true,
);
if (!confirmed || !context.mounted) return;
await _performRemoveAccount(context, ref, account);
return;
}
final confirmed = await showConfirmActionSheet(
context,
title: l10n.accountMenuDisconnectAccountTitle,
message: l10n.accountMenuDisconnectAccountMessage(account.name),
confirmLabel: l10n.accountMenuDisconnect,
cancelLabel: l10n.commonCancel,
isDestructive: true,
);
if (!confirmed || !context.mounted) return;
await _performRemoveAccount(context, ref, account);
}

final walletNumber = softwareWalletNumber(allAccounts, account.walletIndex) ?? account.walletIndex;
/// The last account of its wallet takes the entire wallet (and its recovery
/// phrase) with it, after a second confirmation.
static Future<void> _onDisconnectWallet(
BuildContext context,
WidgetRef ref,
Account account, {
required int walletIndex,
required int walletNumber,
}) async {
final l10n = ref.read(l10nProvider);
final confirmWallet = await showConfirmActionSheet(
context,
title: l10n.accountMenuDisconnectWalletTitle(walletNumber),
Expand All @@ -162,7 +162,7 @@ class AccountMenuScreen extends ConsumerWidget {
);
if (!confirmDelete || !context.mounted) return;

await _performRemoveWallet(context, ref, account.walletIndex);
await _performRemoveWallet(context, ref, walletIndex);
}

static Future<void> _performRemoveAccount(BuildContext context, WidgetRef ref, Account account) async {
Expand Down
113 changes: 54 additions & 59 deletions mobile-app/lib/v2/screens/accounts/accounts_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:quantus_sdk/quantus_sdk.dart' hide ScaffoldBase;
import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
import 'package:wallet_core/providers/multisig_providers.dart';
import 'package:wallet_core/utils/account_menu.dart';
import 'package:wallet_core/utils/accounts_grouping.dart';
import 'package:wallet_core/l10n/app_localizations.dart';
import 'package:wallet_core/providers/account_providers.dart';
Expand Down Expand Up @@ -87,74 +88,68 @@ class _AccountsScreenState extends ConsumerState<AccountsScreen> {

void _openAccountMenu(BuildContext anchor, Account account) {
final l10n = ref.read(l10nProvider);
final isEncrypted = account.accountType == AccountType.encrypted;
showAnchoredMenu(
context,
anchor: anchor,
width: _menuWidth,
groups: [
[
if (isEncrypted)
AnchoredMenuItem(
label: l10n.accountMenuInnerHash,
onTap: () => AccountMenuScreen.openInnerHash(context, account),
)
else ...[
AnchoredMenuItem(
label: l10n.accountMenuShowAddress,
onTap: () => AccountMenuScreen.openAddressDetails(context, account),
),
AnchoredMenuItem(
label: l10n.accountMenuRename,
onTap: () => AccountMenuScreen.openNameEditor(context, ref, account),
),
],
if (account.accountType == AccountType.local)
AnchoredMenuItem(
label: l10n.accountMenuShowRecoveryPhrase,
onTap: () => AccountMenuScreen.openRecoveryPhrase(context, account),
),
],
if (AccountMenuScreen.canDisconnect(ref, account))
[
AnchoredMenuItem(
label: l10n.accountMenuDisconnectAccount,
isDestructive: true,
onTap: () => AccountMenuScreen.disconnect(context, ref, account),
),
],
],
);
AnchoredMenuItem itemOf(AccountMenuItem item) => switch (item) {
AccountMenuItem.innerHash => AnchoredMenuItem(
label: l10n.accountMenuInnerHash,
onTap: () => AccountMenuScreen.openInnerHash(context, account),
),
AccountMenuItem.showAddress => AnchoredMenuItem(
label: l10n.accountMenuShowAddress,
onTap: () => AccountMenuScreen.openAddressDetails(context, account),
),
AccountMenuItem.rename => AnchoredMenuItem(
label: l10n.accountMenuRename,
onTap: () => AccountMenuScreen.openNameEditor(context, ref, account),
),
AccountMenuItem.recoveryPhrase => AnchoredMenuItem(
label: l10n.accountMenuShowRecoveryPhrase,
onTap: () => AccountMenuScreen.openRecoveryPhrase(context, account),
),
AccountMenuItem.disconnect => AnchoredMenuItem(
label: l10n.accountMenuDisconnectAccount,
isDestructive: true,
onTap: () => AccountMenuScreen.disconnect(context, ref, account),
),
AccountMenuItem.multisigDetails => throw StateError('An account has no multisig details'),
};
_showMenu(anchor, accountMenuOf(account, ref.read(accountsProvider).requireValue), itemOf);
}

void _openMultisigAccountMenu(BuildContext anchor, MultisigAccount account) {
final l10n = ref.read(l10nProvider);
AnchoredMenuItem itemOf(AccountMenuItem item) => switch (item) {
AccountMenuItem.showAddress => AnchoredMenuItem(
label: l10n.accountMenuShowAddress,
onTap: () => MultisigAccountMenuScreen.openAddressDetails(context, account),
),
AccountMenuItem.rename => AnchoredMenuItem(
label: l10n.accountMenuRename,
onTap: () => MultisigAccountMenuScreen.openNameEditor(context, ref, account),
),
AccountMenuItem.multisigDetails => AnchoredMenuItem(
label: l10n.multisigAccountMenuDetails,
onTap: () => MultisigAccountMenuScreen.openDetails(context, account),
),
AccountMenuItem.disconnect => AnchoredMenuItem(
label: l10n.accountMenuDisconnectAccount,
isDestructive: true,
onTap: () => MultisigAccountMenuScreen.disconnect(context, ref, account),
),
AccountMenuItem.innerHash || AccountMenuItem.recoveryPhrase => throw StateError('A multisig has no $item'),
};
_showMenu(anchor, multisigMenu, itemOf);
}

/// Shows [items] with Disconnect in a group of its own at the end.
void _showMenu(BuildContext anchor, List<AccountMenuItem> items, AnchoredMenuItem Function(AccountMenuItem) itemOf) {
final main = items.where((i) => i != AccountMenuItem.disconnect).map(itemOf).toList();
showAnchoredMenu(
context,
anchor: anchor,
width: _menuWidth,
groups: [
[
AnchoredMenuItem(
label: l10n.accountMenuShowAddress,
onTap: () => MultisigAccountMenuScreen.openAddressDetails(context, account),
),
AnchoredMenuItem(
label: l10n.accountMenuRename,
onTap: () => MultisigAccountMenuScreen.openNameEditor(context, ref, account),
),
AnchoredMenuItem(
label: l10n.multisigAccountMenuDetails,
onTap: () => MultisigAccountMenuScreen.openDetails(context, account),
),
],
[
AnchoredMenuItem(
label: l10n.accountMenuDisconnectAccount,
isDestructive: true,
onTap: () => MultisigAccountMenuScreen.disconnect(context, ref, account),
),
],
main,
if (items.contains(AccountMenuItem.disconnect)) [itemOf(AccountMenuItem.disconnect)],
],
);
}
Expand Down
23 changes: 13 additions & 10 deletions mobile-app/lib/v2/screens/accounts/edit_account_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
import 'package:wallet_core/providers/account_providers.dart';
import 'package:wallet_core/providers/l10n_provider.dart';
import 'package:wallet_core/providers/multisig_providers.dart';
import 'package:wallet_core/utils/account_menu.dart';
import 'package:resonance_network_wallet/v2/components/name_field.dart';

class EditAccountScreen extends ConsumerStatefulWidget {
Expand All @@ -30,7 +31,7 @@ class EditAccountScreenState extends ConsumerState<EditAccountScreen> {
final _accountsService = AccountsService();
bool _saving = false;

bool get _isDisabled => _controller.text.trim().isEmpty;
bool get _isDisabled => nameEditOf(widget._initialName, _controller.text) is NameBlank;

@override
void initState() {
Expand All @@ -46,15 +47,17 @@ class EditAccountScreenState extends ConsumerState<EditAccountScreen> {
}

Future<void> _save() async {
final name = _controller.text.trim();
if (name.isEmpty) {
final l10n = ref.read(l10nProvider);
context.showErrorToaster(message: l10n.editAccountNameEmpty);
return;
}
if (name == widget._initialName) {
if (mounted) Navigator.of(context).pop();
return;
final String name;
switch (nameEditOf(widget._initialName, _controller.text)) {
case NameBlank():
final l10n = ref.read(l10nProvider);
context.showErrorToaster(message: l10n.editAccountNameEmpty);
return;
case NameUnchanged():
if (mounted) Navigator.of(context).pop();
return;
case NameChanged(name: final changed):
name = changed;
}
setState(() => _saving = true);
try {
Expand Down
12 changes: 2 additions & 10 deletions mobile-app/lib/v2/screens/accounts/multisig_details_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,14 @@ import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
import 'package:wallet_core/providers/account_providers.dart';
import 'package:wallet_core/l10n/app_localizations.dart';
import 'package:wallet_core/providers/l10n_provider.dart';
import 'package:wallet_core/utils/account_menu.dart';
import 'package:resonance_network_wallet/v2/components/multisig_signer_list_tile.dart';

class MultisigDetailsScreen extends ConsumerWidget {
const MultisigDetailsScreen({super.key, required this.account});

final MultisigAccount account;

List<String> _orderedSigners() {
final creator = account.creator;
if (creator == null || !account.signers.contains(creator)) {
return List<String>.from(account.signers);
}
final rest = account.signers.where((id) => id != creator).toList();
return [creator, ...rest];
}

String? _localAccountName(WidgetRef ref, String accountId) {
final accounts = ref.watch(accountsProvider).value;
if (accounts == null) return null;
Expand All @@ -33,7 +25,7 @@ class MultisigDetailsScreen extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final l10n = ref.watch(l10nProvider);
final signers = _orderedSigners();
final signers = orderedSignersOf(account);

return ScaffoldBase(
appBar: V2AppBar(title: l10n.multisigAccountMenuDetailsTitle),
Expand Down
2 changes: 1 addition & 1 deletion mobile-app/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ packages:
source: hosted
version: "2.12.0"
flutter_secure_storage:
dependency: transitive
dependency: "direct dev"
description:
name: flutter_secure_storage
sha256: "6848263f9744072d0977347c383fb8b57d9780319a6bf5238b5a2866a029de62"
Expand Down
1 change: 1 addition & 0 deletions mobile-app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ dependencies:
dev_dependencies:
ed25519_edwards: ^0.3.1
fake_async: ^1.3.3
flutter_secure_storage: ^10.1.0
flutter_test:
sdk: flutter
integration_test:
Expand Down
Loading
Loading