Skip to content

Support multi-recipient Monero payment URIs #1459

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

Open
waozixyz wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

Support multi-recipient Monero payment URIs #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
121 changes: 80 additions & 41 deletions lib/pages/send_view/confirm_transaction_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ import '../../utilities/constants.dart';
import '../../utilities/logger.dart';
import '../../utilities/text_styles.dart';
import '../../utilities/util.dart';
import '../../wallets/crypto_currency/coins/epiccash.dart';
import '../../wallets/crypto_currency/coins/ethereum.dart';
import '../../wallets/crypto_currency/coins/mimblewimblecoin.dart';
import '../../wallets/crypto_currency/crypto_currency.dart';
import '../../wallets/crypto_currency/intermediate/nano_currency.dart';
import '../../wallets/isar/providers/eth/current_token_wallet_provider.dart';
import '../../wallets/isar/providers/solana/current_sol_token_wallet_provider.dart';
Expand Down Expand Up @@ -67,6 +65,7 @@ import '../../wl_gen/interfaces/libepiccash_interface.dart';
import '../pinpad_views/lock_screen_view.dart';
import '../wallet_view/wallet_view.dart';
import 'sub_widgets/epic_slatepack_dialog.dart';
import 'sub_widgets/multi_recipient.dart';
import 'sub_widgets/mwc_slatepack_dialog.dart';
import 'sub_widgets/sending_transaction_dialog.dart';
import 'sub_widgets/split_transaction_warning.dart';
Expand All @@ -83,6 +82,7 @@ class ConfirmTransactionView extends ConsumerStatefulWidget {
this.isPaynymNotificationTransaction = false,
this.isTokenTx = false,
this.onSuccessInsteadOfRouteOnSuccess,
this.recipientLabels,
});

static const String routeName = "/confirmTransactionView";
Expand All @@ -97,6 +97,10 @@ class ConfirmTransactionView extends ConsumerStatefulWidget {
final VoidCallback? onSuccessInsteadOfRouteOnSuccess;
final VoidCallback onSuccess;

/// The payment request's names for the recipients of a transaction with
/// several recipients, in order.
final List<String?>? recipientLabels;

@override
ConsumerState<ConfirmTransactionView> createState() =>
_ConfirmTransactionViewState();
Expand Down Expand Up @@ -623,6 +627,11 @@ class _ConfirmTransactionViewState
@override
Widget build(BuildContext context) {
final coin = ref.watch(pWalletCoin(walletId));
final sentRecipients = [
for (final e in widget.txData.recipients ?? <TxRecipient>[])
if (!e.isChange) e,
];
final hasMultipleRecipients = sentRecipients.length > 1;

final String unit;
final wallet = ref.watch(pWallets).getWallet(walletId);
Expand Down Expand Up @@ -767,25 +776,36 @@ class _ConfirmTransactionViewState
Text(
widget.isPaynymTransaction
? "PayNym recipient"
: hasMultipleRecipients
? "Recipients"
: "Recipient",
style: STextStyles.smallMed12(context),
),
const SizedBox(height: 4),
Text(
widget.isPaynymTransaction
? widget.txData.paynymAccountLite!.nymName
: widget
.txData
.recipients
?.firstOrNull
?.address ??
widget
.txData
.sparkRecipients!
.first
.address,
style: STextStyles.itemSubtitle12(context),
),
if (hasMultipleRecipients)
RecipientAmountList(
coin: coin,
recipients: sentRecipients,
labels: widget.recipientLabels,
labelStyle: STextStyles.smallMed12(context),
valueStyle: STextStyles.itemSubtitle12(context),
)
else
Text(
widget.isPaynymTransaction
? widget.txData.paynymAccountLite!.nymName
: widget
.txData
.recipients
?.firstOrNull
?.address ??
widget
.txData
.sparkRecipients!
.first
.address,
style: STextStyles.itemSubtitle12(context),
),
],
),
),
Expand Down Expand Up @@ -1120,29 +1140,48 @@ class _ConfirmTransactionViewState
),
),
const SizedBox(height: 2),
SelectableText(
// TODO: [prio=med] spark transaction specifics - better handling
widget.isPaynymTransaction
? widget.txData.paynymAccountLite!.nymName
: widget
.txData
.recipients
?.firstOrNull
?.address ??
widget
.txData
.sparkRecipients!
.first
.address,
style:
STextStyles.desktopTextExtraExtraSmall(
context,
).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.textDark,
),
),
if (hasMultipleRecipients)
RecipientAmountList(
coin: coin,
recipients: sentRecipients,
labels: widget.recipientLabels,
labelStyle:
STextStyles.desktopTextExtraExtraSmall(
context,
),
valueStyle:
STextStyles.desktopTextExtraExtraSmall(
context,
).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.textDark,
),
)
else
SelectableText(
// TODO: [prio=med] spark transaction specifics - better handling
widget.isPaynymTransaction
? widget.txData.paynymAccountLite!.nymName
: widget
.txData
.recipients
?.firstOrNull
?.address ??
widget
.txData
.sparkRecipients!
.first
.address,
style:
STextStyles.desktopTextExtraExtraSmall(
context,
).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.textDark,
),
),
],
),
),
Expand Down
11 changes: 7 additions & 4 deletions lib/pages/send_view/frost_ms/frost_send_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class _FrostSendViewState extends ConsumerState<FrostSendView> {
final wallet = ref.read(pWallets).getWallet(walletId) as BitcoinFrostWallet;

final recipients = recipientWidgetIndexes
.map((i) => ref.read(pRecipient(i).state).state)
.map((i) => ref.read(pRecipient((walletId: walletId, index: i))))
.map(
(e) => TxRecipient(
address: e!.address,
Expand Down Expand Up @@ -190,7 +190,7 @@ class _FrostSendViewState extends ConsumerState<FrostSendView> {

bool _validateRecipientFormStatesHelper() {
for (final i in recipientWidgetIndexes) {
final state = ref.read(pRecipient(i));
final state = ref.read(pRecipient((walletId: walletId, index: i)));
if (state?.amount == null ||
state?.address == null ||
state!.address.isEmpty) {
Expand Down Expand Up @@ -376,6 +376,7 @@ class _FrostSendViewState extends ConsumerState<FrostSendView> {
),
child: Recipient(
key: Key("recipientKey_${recipientWidgetIndexes[i]}"),
walletId: walletId,
index: recipientWidgetIndexes[i],
displayNumber: i + 1,
coin: coin,
Expand All @@ -387,8 +388,10 @@ class _FrostSendViewState extends ConsumerState<FrostSendView> {
: () {
ref
.read(
pRecipient(recipientWidgetIndexes[i])
.notifier,
pRecipient((
walletId: walletId,
index: recipientWidgetIndexes[i],
)).notifier,
)
.state =
null;
Expand Down
Loading