Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ class _SubscriptionPaymentDialogState extends State<SubscriptionPaymentDialog> {

bool _rememberData = false;

String get _normalizedCardHolder => _cardHolderController.text.trim().toUpperCase();

@override
void initState() {
super.initState();
Expand Down Expand Up @@ -115,7 +117,7 @@ class _SubscriptionPaymentDialogState extends State<SubscriptionPaymentDialog> {
subscriptionId: widget.item.id,
saveCard: _rememberData,
cardNumber: _cardNumberController.text.replaceAll(RegExp(r'\D'), ''),
cardHolder: _cardHolderController.text.trim(),
cardHolder: _normalizedCardHolder,
expiryMonth: _expiryMonthController.text.trim(),
expiryYear: _buildBackendExpiryYear(expiryYear),
cvv: _cvvController.text.trim(),
Expand Down Expand Up @@ -176,6 +178,7 @@ class _SubscriptionPaymentDialogState extends State<SubscriptionPaymentDialog> {
enabled: !isInProgress,
keyboardType: TextInputType.name,
textInputAction: TextInputAction.next,
inputFormatters: [const _CardHolderTextInputFormatter()],
validator: SubscriptionPaymentValidators.cardHolder,
),
const SizedBox(height: 12),
Expand Down Expand Up @@ -300,7 +303,7 @@ class _SubscriptionPaymentDialogState extends State<SubscriptionPaymentDialog> {
right: 0,
child: _PaymentPreviewCard(
previewCardNumber: _previewCardNumberController.text,
cardHolder: _cardHolderController.text,
cardHolder: _normalizedCardHolder,
expiryMonth: _expiryMonthController.text.trim(),
expiryYear: _expiryYearController.text.trim(),
),
Expand Down Expand Up @@ -540,6 +543,18 @@ final class _CardNumberTextInputFormatter extends TextInputFormatter {
}
}

final class _CardHolderTextInputFormatter extends TextInputFormatter {
const _CardHolderTextInputFormatter();

@override
TextEditingValue formatEditUpdate(
TextEditingValue oldValue,
TextEditingValue newValue,
) {
return newValue.copyWith(text: newValue.text.toUpperCase());
}
}

final class _ExpiryYearTextInputFormatter extends TextInputFormatter {
const _ExpiryYearTextInputFormatter();

Expand Down
Loading