Skip to content

Only show memo input for Tendermint & ZHTLC #2998

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
CharlVS merged 6 commits into from
Aug 12, 2025
Merged

Only show memo input for Tendermint & ZHTLC #2998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
27fe6f3
limit memo field to supporting protocols
smk762 Jul 26, 2025
062985e
add TODO for unused component
smk762 Jul 26, 2025
8f9de44
removes obsolete `MemoField`
smk762 Aug 1, 2025
e3cfe79
Add helper function to check memo support for specific protocols
cursoragent Aug 12, 2025
552b4c0
Merge branch 'dev' of https://github.com/KomodoPlatform/komodo-wallet…
CharlVS Aug 12, 2025
19b95ef
Merge branch 'dev' into selective-memo-input
CharlVS Aug 12, 2025
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
162 changes: 65 additions & 97 deletions lib/views/wallet/coin_details/withdraw_form/widgets/fill_form/fields/fields.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ class ToAddressField extends StatelessWidget {
textInputAction: TextInputAction.next,
enableInteractiveSelection: true,
onChanged: (value) {
context
.read<WithdrawFormBloc>()
.add(WithdrawFormRecipientChanged(value ?? ''));
context.read<WithdrawFormBloc>().add(
WithdrawFormRecipientChanged(value ?? ''),
);
},
validator: (value) {
if (value?.isEmpty ?? true) {
Expand Down Expand Up @@ -63,14 +63,15 @@ class AmountField extends StatelessWidget {
UiTextFormField(
key: const Key('withdraw-amount-input'),
enabled: !state.isMaxAmount,
keyboardType:
const TextInputType.numberWithOptions(decimal: true),
keyboardType: const TextInputType.numberWithOptions(
decimal: true,
),
inputFormatters: currencyInputFormatters,
textInputAction: TextInputAction.next,
onChanged: (value) {
context
.read<WithdrawFormBloc>()
.add(WithdrawFormAmountChanged(value ?? ''));
context.read<WithdrawFormBloc>().add(
WithdrawFormAmountChanged(value ?? ''),
);
},
validator: (value) {
if (state.isMaxAmount) return null;
Expand All @@ -90,9 +91,9 @@ class AmountField extends StatelessWidget {
CheckboxListTile(
value: state.isMaxAmount,
onChanged: (value) {
context
.read<WithdrawFormBloc>()
.add(WithdrawFormMaxAmountEnabled(value ?? false));
context.read<WithdrawFormBloc>().add(
WithdrawFormMaxAmountEnabled(value ?? false),
);
},
title: Text(LocaleKeys.amountFieldCheckboxListTile.tr()),
),
Expand All @@ -114,8 +115,10 @@ class FeeSection extends StatelessWidget {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(LocaleKeys.networkFee.tr(),
style: Theme.of(context).textTheme.titleMedium),
Text(
LocaleKeys.networkFee.tr(),
style: Theme.of(context).textTheme.titleMedium,
),
const SizedBox(height: 8),
const CustomFeeToggle(),
if (state.isCustomFee) ...[
Expand Down Expand Up @@ -160,8 +163,8 @@ class CustomFeeToggle extends StatelessWidget {
value: state.isCustomFee,
onChanged: (value) {
context.read<WithdrawFormBloc>().add(
WithdrawFormCustomFeeEnabled(value),
);
WithdrawFormCustomFeeEnabled(value),
);
},
contentPadding: EdgeInsets.zero,
);
Expand Down Expand Up @@ -190,14 +193,14 @@ class EvmFeeFields extends StatelessWidget {
final gasPrice = Decimal.tryParse(value ?? '');
if (gasPrice != null) {
context.read<WithdrawFormBloc>().add(
WithdrawFormCustomFeeChanged(
FeeInfoEthGas(
coin: state.asset.id.id,
gasPrice: gasPrice,
gas: evmFee?.gas ?? 21000,
),
),
);
WithdrawFormCustomFeeChanged(
FeeInfoEthGas(
coin: state.asset.id.id,
gasPrice: gasPrice,
gas: evmFee?.gas ?? 21000,
),
),
);
}
},
helperText: 'Higher gas price = faster confirmation',
Expand All @@ -211,14 +214,14 @@ class EvmFeeFields extends StatelessWidget {
final gas = int.tryParse(value ?? '');
if (gas != null) {
context.read<WithdrawFormBloc>().add(
WithdrawFormCustomFeeChanged(
FeeInfoEthGas(
coin: state.asset.id.id,
gasPrice: evmFee?.gasPrice ?? Decimal.one,
gas: gas,
),
),
);
WithdrawFormCustomFeeChanged(
FeeInfoEthGas(
coin: state.asset.id.id,
gasPrice: evmFee?.gasPrice ?? Decimal.one,
gas: gas,
),
),
);
}
},
helperText: 'Estimated: 21000',
Expand Down Expand Up @@ -260,19 +263,17 @@ class UtxoFeeFields extends StatelessWidget {
label: Text('Urgent (${defaultFee * 5})'),
),
],
selected: {
currentFee?.amount.toBigInt().toInt() ?? defaultFee,
},
selected: {currentFee?.amount.toBigInt().toInt() ?? defaultFee},
onSelectionChanged: (values) {
if (values.isNotEmpty) {
context.read<WithdrawFormBloc>().add(
WithdrawFormCustomFeeChanged(
FeeInfoUtxoFixed(
coin: state.asset.id.id,
amount: Decimal.fromInt(values.first),
),
),
);
WithdrawFormCustomFeeChanged(
FeeInfoUtxoFixed(
coin: state.asset.id.id,
amount: Decimal.fromInt(values.first),
),
),
);
}
},
),
Expand All @@ -288,30 +289,6 @@ class UtxoFeeFields extends StatelessWidget {
}
}

/// Field for entering transaction memo
class MemoField extends StatelessWidget {
const MemoField({super.key});

@override
Widget build(BuildContext context) {
return BlocBuilder<WithdrawFormBloc, WithdrawFormState>(
builder: (context, state) {
return UiTextFormField(
key: const Key('withdraw-memo-input'),
labelText: 'Memo (Optional)',
maxLines: 2,
onChanged: (value) {
context.read<WithdrawFormBloc>().add(
WithdrawFormMemoChanged(value ?? ''),
);
},
helperText: 'Required for some exchanges',
);
},
);
}
}

/// Page for confirming withdrawal details
class ConfirmationPage extends StatelessWidget {
const ConfirmationPage({super.key});
Expand All @@ -334,7 +311,8 @@ class ConfirmationPage extends StatelessWidget {
children: [
_ConfirmationItem(
label: 'From',
value: state.selectedSourceAddress?.address ??
value:
state.selectedSourceAddress?.address ??
'Default Wallet',
),
const SizedBox(height: 12),
Expand All @@ -355,10 +333,7 @@ class ConfirmationPage extends StatelessWidget {
),
if (state.memo != null) ...[
const SizedBox(height: 12),
_ConfirmationItem(
label: 'Memo',
value: state.memo!,
),
_ConfirmationItem(label: 'Memo', value: state.memo!),
],
],
),
Expand All @@ -370,8 +345,8 @@ class ConfirmationPage extends StatelessWidget {
Expanded(
child: OutlinedButton(
onPressed: () => context.read<WithdrawFormBloc>().add(
const WithdrawFormCancelled(),
),
const WithdrawFormCancelled(),
),
child: Text(LocaleKeys.back.tr()),
),
),
Expand All @@ -382,8 +357,8 @@ class ConfirmationPage extends StatelessWidget {
onPressed: state.isSending
? null
: () => context.read<WithdrawFormBloc>().add(
const WithdrawFormSubmitted(),
),
const WithdrawFormSubmitted(),
),
//TODO! child: state.submissionInProgress
child: state.isSending
? const SizedBox(
Expand All @@ -408,10 +383,7 @@ class _ConfirmationItem extends StatelessWidget {
final String label;
final String value;

const _ConfirmationItem({
required this.label,
required this.value,
});
const _ConfirmationItem({required this.label, required this.value});

@override
Widget build(BuildContext context) {
Expand All @@ -421,17 +393,13 @@ class _ConfirmationItem extends StatelessWidget {
Text(
label,
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: Theme.of(context)
.colorScheme
.onSurface
.withValues(alpha: 0.6),
),
color: Theme.of(
context,
).colorScheme.onSurface.withValues(alpha: 0.6),
),
),
const SizedBox(height: 4),
Text(
value,
style: Theme.of(context).textTheme.bodyLarge,
),
Text(value, style: Theme.of(context).textTheme.bodyLarge),
],
);
}
Expand Down Expand Up @@ -497,8 +465,8 @@ class FailurePage extends StatelessWidget {
Text(
'Withdrawal Failed',
style: Theme.of(context).textTheme.headlineSmall?.copyWith(
color: Theme.of(context).colorScheme.error,
),
color: Theme.of(context).colorScheme.error,
),
),
const SizedBox(height: 16),
if (state.transactionError != null)
Expand All @@ -513,8 +481,8 @@ class FailurePage extends StatelessWidget {
const SizedBox(height: 24),
OutlinedButton(
onPressed: () => context.read<WithdrawFormBloc>().add(
const WithdrawFormCancelled(),
),
const WithdrawFormCancelled(),
),
child: Text(LocaleKeys.tryAgain.tr()),
),
],
Expand All @@ -536,9 +504,9 @@ class IbcTransferField extends StatelessWidget {
subtitle: Text(LocaleKeys.ibcTransferFieldSubtitle.tr()),
value: state.isIbcTransfer,
onChanged: (value) {
context
.read<WithdrawFormBloc>()
.add(WithdrawFormIbcTransferEnabled(value));
context.read<WithdrawFormBloc>().add(
WithdrawFormIbcTransferEnabled(value),
);
},
);
},
Expand All @@ -560,9 +528,9 @@ class IbcChannelField extends StatelessWidget {
keyboardType: TextInputType.number,
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
onChanged: (value) {
context
.read<WithdrawFormBloc>()
.add(WithdrawFormIbcChannelChanged(value ?? ''));
context.read<WithdrawFormBloc>().add(
WithdrawFormIbcChannelChanged(value ?? ''),
);
},
);
},
Expand Down
13 changes: 10 additions & 3 deletions lib/views/wallet/coin_details/withdraw_form/withdraw_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ import 'package:web_dex/views/wallet/coin_details/withdraw_form/widgets/fill_for
import 'package:web_dex/views/wallet/coin_details/withdraw_form/widgets/withdraw_form_header.dart';
import 'package:web_dex/views/wallet/coin_details/withdraw_form/widgets/trezor_withdraw_progress_dialog.dart';

bool _isMemoSupportedProtocol(Asset asset) {
final protocol = asset.protocol;
return protocol is TendermintProtocol || protocol is ZhtlcProtocol;
}

class WithdrawForm extends StatefulWidget {
final Asset asset;
final VoidCallback onSuccess;
Expand Down Expand Up @@ -443,12 +448,14 @@ class WithdrawFormFillSection extends StatelessWidget {
],
],
const SizedBox(height: 16),
if (_isMemoSupportedProtocol(state.asset)) ...[
WithdrawMemoField(
memo: state.memo,
onChanged: (value) => context
.read<WithdrawFormBloc>()
.add(WithdrawFormMemoChanged(value)),
),
.read<WithdrawFormBloc>()
.add(WithdrawFormMemoChanged(value)),
),
],
const SizedBox(height: 24),
// TODO! Refactor to use Formz and replace with the appropriate
// error state value.
Expand Down
Loading