Skip to content

N13/msig support #380

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

Draft
n13 wants to merge 5 commits into
base: n13/dirac
Choose a base branch
from
Draft

N13/msig support #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc11cc2
msig first take
n13 Feb 8, 2026
62b441f
create msig screen added
n13 Feb 9, 2026
7f6e10b
melos format - no code change
n13 Feb 9, 2026
2bc2351
Merge branch 'n13/dirac' into n13/msig-support
n13 Feb 9, 2026
02658cb
better error display
n13 Feb 9, 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
157 changes: 149 additions & 8 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 @@ -17,16 +17,18 @@ import 'package:resonance_network_wallet/features/main/screens/add_hardware_acco
import 'package:resonance_network_wallet/features/main/screens/create_account_screen.dart';
import 'package:resonance_network_wallet/features/main/screens/create_wallet_and_backup_screen.dart';
import 'package:resonance_network_wallet/features/main/screens/import_wallet_screen.dart';
import 'package:resonance_network_wallet/features/main/screens/multisig/add_multisig_screen.dart';
import 'package:resonance_network_wallet/features/styles/app_colors_theme.dart';
import 'package:resonance_network_wallet/features/styles/app_size_theme.dart';
import 'package:resonance_network_wallet/features/styles/app_text_theme.dart';
import 'package:resonance_network_wallet/providers/account_providers.dart';
import 'package:resonance_network_wallet/providers/entrusted_account_provider.dart';
import 'package:resonance_network_wallet/providers/multisig_providers.dart';
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';

enum _WalletMoreAction { createWallet, importWallet, addHardwareWallet }
enum _WalletMoreAction { createWallet, importWallet, addHardwareWallet, addMultisig }

class AccountsScreen extends ConsumerStatefulWidget {
const AccountsScreen({super.key});
Expand Down Expand Up @@ -116,6 +118,7 @@ class _AccountsScreenState extends ConsumerState<AccountsScreen> {
if (FeatureFlags.enableKeystoneHardwareWallet) {
items.add(Item(value: _WalletMoreAction.addHardwareWallet, label: 'Add hardware wallet'));
}
items.add(Item(value: _WalletMoreAction.addMultisig, label: 'Add multisig wallet'));

showSelectActionSheet<_WalletMoreAction>(context, items, (item) async {
final result = await (switch (item.value) {
Expand All @@ -137,6 +140,10 @@ class _AccountsScreenState extends ConsumerState<AccountsScreen> {
builder: (context) => AddHardwareAccountScreen(walletIndex: nextWalletIndex, isNewWallet: true),
),
),
_WalletMoreAction.addMultisig => Navigator.push<bool?>(
context,
MaterialPageRoute(builder: (context) => const AddMultisigScreen()),
),
});
if (result == true && mounted) {
ref.invalidate(accountsProvider);
Expand Down Expand Up @@ -246,18 +253,23 @@ class _AccountsScreenState extends ConsumerState<AccountsScreen> {
}

final grouped = _groupByWallet(accounts);
final multisigSection = _buildMultisigSection(activeDisplayAccount?.account.accountId);

if (grouped.length <= 1) {
final walletAccounts = grouped.values.first;
return RefreshIndicator(
onRefresh: _refreshAccounts,
child: ListView.separated(
child: ListView(
padding: const EdgeInsets.symmetric(vertical: 16.0),
itemCount: walletAccounts.length,
separatorBuilder: (context, index) => const SizedBox(height: 25),
itemBuilder: (context, index) {
final account = walletAccounts[index];
return _buildAccountListItem(account, activeDisplayAccount?.account.accountId, index);
},
children: [
...walletAccounts.asMap().entries.map((entry) {
return Padding(
padding: EdgeInsets.only(top: entry.key > 0 ? 25 : 0),
child: _buildAccountListItem(entry.value, activeDisplayAccount?.account.accountId, entry.key),
);
}),
multisigSection,
],
),
);
}
Expand Down Expand Up @@ -292,6 +304,8 @@ class _AccountsScreenState extends ConsumerState<AccountsScreen> {
sectionIndex++;
}

children.add(multisigSection);

return RefreshIndicator(
onRefresh: _refreshAccounts,
child: ListView(padding: const EdgeInsets.symmetric(vertical: 16.0), children: children),
Expand Down Expand Up @@ -601,4 +615,131 @@ class _AccountsScreenState extends ConsumerState<AccountsScreen> {
),
);
}

Widget _buildMultisigSection(String? activeAccountId) {
final multisigAccountsAsync = ref.watch(multisigAccountsProvider);

return multisigAccountsAsync.when(
data: (multisigAccounts) {
if (multisigAccounts.isEmpty) return const SizedBox.shrink();

return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(height: 18),
Padding(
padding: const EdgeInsets.only(bottom: 10),
child: Text(
'Multisig Wallets',
style: context.themeText.detail?.copyWith(color: context.themeColors.textPrimary),
),
),
...multisigAccounts.asMap().entries.map((entry) {
final msig = entry.value;
return Padding(
padding: EdgeInsets.only(top: entry.key > 0 ? 25 : 0),
child: _buildMultisigListItem(msig, activeAccountId),
);
}),
],
);
},
loading: () => const SizedBox.shrink(),
error: (_, _) => const SizedBox.shrink(),
);
}

Widget _buildMultisigListItem(MultisigAccount msig, String? activeAccountId) {
final isActive = msig.accountId == activeAccountId;

return InkWell(
onTap: () async {
await ref.read(activeAccountProvider.notifier).setActiveAccount(MultisigDisplayAccount(msig));
if (mounted) Navigator.pop(context);
},
child: Stack(
clipBehavior: Clip.hardEdge,
children: [
Container(
padding: EdgeInsets.symmetric(horizontal: context.isTablet ? 20 : 8, vertical: 8),
height: context.themeSize.accountListItemHeight,
decoration: ShapeDecoration(
color: isActive ? context.themeColors.surfaceActive : context.themeColors.surface,
shape: RoundedRectangleBorder(
side: BorderSide(width: 1, color: context.themeColors.borderLight),
borderRadius: BorderRadius.circular(5),
),
),
child: Row(
children: [
const SizedBox(width: 24),
Expanded(
child: Consumer(
builder: (context, ref, child) {
return FutureBuilder<String>(
future: _checksumService.getHumanReadableName(msig.accountId),
builder: (context, checksumSnapshot) {
final humanChecksum = checksumSnapshot.data ?? '';

return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
msig.name,
style: context.themeText.smallParagraph?.copyWith(
color: isActive ? Colors.black : Colors.white,
),
),
AccountTag(text: 'Multisig', color: context.themeColors.accountTagMultisig),
],
),
Text(
humanChecksum,
style: context.themeText.detail?.copyWith(
color: isActive ? context.themeColors.checksumDarker : context.themeColors.checksum,
),
),
Text(
context.isTablet
? msig.accountId
: AddressFormattingService.formatAddress(msig.accountId),
style: context.themeText.tiny?.copyWith(
color: isActive ? context.themeColors.darkGray : context.themeColors.textMuted,
),
),
const SizedBox(height: 2),
Text(
'${msig.threshold} of ${msig.signers.length} signers',
style: context.themeText.tiny?.copyWith(
color: isActive
? context.themeColors.darkGray
: context.themeColors.accountTagMultisig,
),
),
],
);
},
);
},
),
),
],
),
),
Positioned(
top: (context.themeSize.accountListItemHeight / 2) - (context.themeSize.accountListItemLogoWidth / 2),
left: (context.themeSize.accountListItemLogoWidth / 2) * -1,
child: AccountGradientImage(
accountId: msig.accountId,
width: context.themeSize.accountListItemLogoWidth,
height: context.themeSize.accountListItemLogoWidth,
),
),
],
),
);
}
}
Loading