Skip to content
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

Jump to bottom

feat: add PaymentSelectionPage #282

Merged
merged 6 commits into from
Sep 3, 2024
Merged

feat: add PaymentSelectionPage #282

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
8ba55de
remove `PaymentMethodsPage` and `PaymentTypesPage`
ethan-tbd Aug 30, 2024
02cd03d
update `copyWith` to support resetting `selectedPaymentMethod`
ethan-tbd Aug 30, 2024
7fa66ca
add `PaymentSelectionPage`
ethan-tbd Aug 30, 2024
3679b78
use `PaymentSelectionPage` for payment types/method selection
ethan-tbd Aug 30, 2024
f4bdd23
update test to use `PaymentSelectionPage`
ethan-tbd Aug 30, 2024
6935005
add test for `PaymentSelectionPage`
ethan-tbd Aug 30, 2024
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
13 changes: 8 additions & 5 deletions lib/features/payment/payment_details_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ import 'package:didpay/features/did/did_provider.dart';
import 'package:didpay/features/kcc/kcc_consent_page.dart';
import 'package:didpay/features/payment/payment_details_state.dart';
import 'package:didpay/features/payment/payment_method.dart';
import 'package:didpay/features/payment/payment_methods_page.dart';
import 'package:didpay/features/payment/payment_review_page.dart';
import 'package:didpay/features/payment/payment_selection_page.dart';
import 'package:didpay/features/payment/payment_state.dart';
import 'package:didpay/features/payment/payment_types_page.dart';
import 'package:didpay/features/pfis/pfi.dart';
import 'package:didpay/features/tbdex/tbdex_quote_notifier.dart';
import 'package:didpay/features/tbdex/tbdex_service.dart';
Expand Down Expand Up @@ -55,6 +54,7 @@ class PaymentDetailsPage extends HookConsumerWidget {
state.value = state.value.copyWith(
selectedPaymentMethod: selectedMethod,
paymentName: selectedMethod?.title,
resetSelectedPaymentMethod: selectedMethod == null,
);

return;
Expand Down Expand Up @@ -108,7 +108,7 @@ class PaymentDetailsPage extends HookConsumerWidget {
context,
state,
),
if (state.value.hasNoPaymentTypes ||
if (!state.value.hasMultiplePaymentTypes ||
state.value.selectedPaymentType != null)
_buildPaymentMethodSelector(
context,
Expand Down Expand Up @@ -211,7 +211,10 @@ class PaymentDetailsPage extends HookConsumerWidget {
onTap: () {
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => PaymentTypesPage(state: state),
builder: (context) => PaymentSelectionPage(
state: state,
isSelectingMethod: false,
),
),
);
},
Expand Down Expand Up @@ -262,7 +265,7 @@ class PaymentDetailsPage extends HookConsumerWidget {
: () {
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => PaymentMethodsPage(
builder: (context) => PaymentSelectionPage(
state: state,
availableMethods: availableMethods,
),
Expand Down
7 changes: 4 additions & 3 deletions lib/features/payment/payment_details_state.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class PaymentDetailsState {
Set<String>? get paymentTypes =>
paymentMethods?.map((method) => method.type).whereType<String>().toSet();

bool get hasNoPaymentTypes => paymentTypes?.isEmpty ?? true;
bool get hasMultiplePaymentTypes => (paymentTypes?.length ?? 0) > 1;

List<PaymentMethod>? filterPaymentMethods(String? paymentType) =>
Expand All @@ -47,14 +46,16 @@ class PaymentDetailsState {
List<String>? credentialsJwt,
Map<String, String>? formData,
Quote? quote,
bool resetSelectedPaymentMethod = false,
}) {
return PaymentDetailsState(
paymentCurrency: paymentCurrency ?? this.paymentCurrency,
paymentName: paymentName ?? this.paymentName,
exchangeId: exchangeId ?? this.exchangeId,
selectedPaymentType: selectedPaymentType ?? this.selectedPaymentType,
selectedPaymentMethod:
selectedPaymentMethod ?? this.selectedPaymentMethod,
selectedPaymentMethod: resetSelectedPaymentMethod
? null
: selectedPaymentMethod ?? this.selectedPaymentMethod,
paymentMethods: paymentMethods ?? this.paymentMethods,
credentialsJwt: credentialsJwt ?? this.credentialsJwt,
formData: formData ?? this.formData,
Expand Down
66 changes: 55 additions & 11 deletions ...eatures/payment/payment_methods_page.dart → ...tures/payment/payment_selection_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@ import 'package:didpay/shared/search_field.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';

class PaymentMethodsPage extends HookWidget {
class PaymentSelectionPage extends HookWidget {
final _formKey = GlobalKey<FormState>();

final List<PaymentMethod>? availableMethods;
final ValueNotifier<PaymentDetailsState> state;
final List<PaymentMethod>? availableMethods;
final bool isSelectingMethod;

PaymentMethodsPage({
required this.availableMethods,
PaymentSelectionPage({
required this.state,
this.availableMethods,
this.isSelectingMethod = true,
super.key,
});

Expand All @@ -23,7 +25,7 @@ class PaymentMethodsPage extends HookWidget {
final focusNode = useFocusNode();

return Scaffold(
appBar: AppBar(scrolledUnderElevation: 0),
appBar: AppBar(),
body: SafeArea(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
Expand All @@ -34,12 +36,18 @@ class PaymentMethodsPage extends HookWidget {
searchText: searchText,
),
Expanded(
child: _buildMethodsList(
context,
searchText,
availableMethods,
state,
),
child: isSelectingMethod
? _buildMethodsList(
context,
searchText,
availableMethods,
state,
)
: _buildTypesList(
context,
searchText,
state,
),
),
],
),
Expand Down Expand Up @@ -97,4 +105,40 @@ class PaymentMethodsPage extends HookWidget {
itemCount: filteredPaymentMethods?.length,
);
}

Widget _buildTypesList(
BuildContext context,
ValueNotifier<String> searchText,
ValueNotifier<PaymentDetailsState> state,
) {
final filteredPaymentTypes = state.value.paymentTypes
?.where(
(entry) =>
entry.toLowerCase().contains(searchText.value.toLowerCase()),
)
.toList();

return ListView.builder(
itemBuilder: (context, index) {
final currentPaymentType = filteredPaymentTypes?.elementAtOrNull(index);
final selected = state.value.selectedPaymentType == currentPaymentType;

return ListTile(
visualDensity: VisualDensity.compact,
selected: selected,
title: Text(currentPaymentType ?? ''),
trailing: selected ? const Icon(Icons.check) : null,
onTap: () {
if (currentPaymentType != null) {
state.value =
state.value.copyWith(selectedPaymentType: currentPaymentType);
}

Navigator.of(context).pop();
},
);
},
itemCount: filteredPaymentTypes?.length,
);
}
}
79 changes: 0 additions & 79 deletions lib/features/payment/payment_types_page.dart
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions test/features/payment/payment_details_page_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ import 'package:didpay/features/payment/payment_amount_state.dart';
import 'package:didpay/features/payment/payment_details_page.dart';
import 'package:didpay/features/payment/payment_details_state.dart';
import 'package:didpay/features/payment/payment_method.dart';
import 'package:didpay/features/payment/payment_methods_page.dart';
import 'package:didpay/features/payment/payment_selection_page.dart';
import 'package:didpay/features/payment/payment_state.dart';
import 'package:didpay/features/payment/payment_types_page.dart';
import 'package:didpay/features/pfis/pfis_notifier.dart';
import 'package:didpay/features/transaction/transaction.dart';
import 'package:flutter/material.dart';
Expand Down Expand Up @@ -162,7 +161,8 @@ void main() async {
expect(find.widgetWithIcon(Icon, Icons.chevron_right), findsNothing);
});

testWidgets('should show PaymentTypesPage on tap of select a payment type',
testWidgets(
'should show PaymentSelectionPage on tap of select a payment type',
(tester) async {
await tester.pumpWidget(
WidgetHelpers.testableWidget(
Expand All @@ -187,11 +187,11 @@ void main() async {

await tester.tap(find.text('Select a payment type'));
await tester.pumpAndSettle();
expect(find.byType(PaymentTypesPage), findsOneWidget);
expect(find.byType(PaymentSelectionPage), findsOneWidget);
});

testWidgets(
'should show PaymentMethodsPage on tap of select a payment method',
'should show PaymentSelectionPage on tap of select a payment method',
(tester) async {
await tester.pumpWidget(
WidgetHelpers.testableWidget(
Expand All @@ -214,7 +214,7 @@ void main() async {

await tester.tap(find.text('Select a payment method'));
await tester.pumpAndSettle();
expect(find.byType(PaymentMethodsPage), findsOneWidget);
expect(find.byType(PaymentSelectionPage), findsOneWidget);
});

testWidgets('should show payment type after PaymentTypesPage selection',
Expand Down
83 changes: 0 additions & 83 deletions test/features/payment/payment_methods_page_test.dart
View file
Open in desktop

This file was deleted.

Loading
Loading