Moved payment data preparation into providers

frontend/pshared/lib/provider/payment/flow.dart

@@ -3,11 +3,14 @@ import 'package:flutter/foundation.dart';
 import 'package:pshared/models/payment/methods/data.dart';
 import 'package:pshared/models/payment/type.dart';
 import 'package:pshared/models/recipient/recipient.dart';
+import 'package:pshared/provider/recipient/pmethods.dart';
 
 
 class PaymentFlowProvider extends ChangeNotifier {
   PaymentType _selectedType;
   PaymentMethodData? _manualPaymentData;
+  MethodMap _availableTypes = {};
+  Recipient? _recipient;
 
   PaymentFlowProvider({
     required PaymentType initialType,
@@ -15,57 +18,40 @@ class PaymentFlowProvider extends ChangeNotifier {
 
   PaymentType get selectedType => _selectedType;
   PaymentMethodData? get manualPaymentData => _manualPaymentData;
+  Recipient? get recipient => _recipient;
 
-  void sync({
+  bool get hasRecipient => _recipient != null;
+
+  MethodMap get availableTypes => hasRecipient
+      ? _availableTypes
+      : {for (final type in PaymentType.values) type: null};
+
+  PaymentMethodData? get selectedPaymentData =>
+      hasRecipient ? _availableTypes[_selectedType] : _manualPaymentData;
+
+  void syncWith({
     required Recipient? recipient,
-    required MethodMap availableTypes,
+    required PaymentMethodsProvider methodsProvider,
     PaymentType? preferredType,
-  }) {
-    final resolvedType = _resolveSelectedType(
-      recipient: recipient,
-      availableTypes: availableTypes,
-      preferredType: preferredType,
-    );
-
-    var hasChanges = false;
-    if (resolvedType != _selectedType) {
-      _selectedType = resolvedType;
-      hasChanges = true;
-    }
-
-    if (recipient != null && _manualPaymentData != null) {
-      _manualPaymentData = null;
-      hasChanges = true;
-    }
-
-    if (hasChanges) notifyListeners();
-  }
+  }) =>
+      _applyState(
+        recipient: recipient,
+        availableTypes: methodsProvider.availableTypesForRecipient(recipient),
+        preferredType: preferredType,
+        forceResetManualData: false,
+      );
 
   void reset({
     required Recipient? recipient,
-    required MethodMap availableTypes,
+    required PaymentMethodsProvider methodsProvider,
     PaymentType? preferredType,
-  }) {
-    final resolvedType = _resolveSelectedType(
-      recipient: recipient,
-      availableTypes: availableTypes,
-      preferredType: preferredType,
-    );
-
-    var hasChanges = false;
-
-    if (resolvedType != _selectedType) {
-      _selectedType = resolvedType;
-      hasChanges = true;
-    }
-
-    if (_manualPaymentData != null) {
-      _manualPaymentData = null;
-      hasChanges = true;
-    }
-
-    if (hasChanges) notifyListeners();
-  }
+  }) =>
+      _applyState(
+        recipient: recipient,
+        availableTypes: methodsProvider.availableTypesForRecipient(recipient),
+        preferredType: preferredType,
+        forceResetManualData: true,
+      );
 
   void selectType(PaymentType type, {bool resetManualData = false}) {
     if (_selectedType == type && (!resetManualData || _manualPaymentData == null)) {
@@ -107,4 +93,41 @@ class PaymentFlowProvider extends ChangeNotifier {
 
     return availableTypes.keys.first;
   }
+
+  void _applyState({
+    required Recipient? recipient,
+    required MethodMap availableTypes,
+    required PaymentType? preferredType,
+    required bool forceResetManualData,
+  }) {
+    final resolvedType = _resolveSelectedType(
+      recipient: recipient,
+      availableTypes: availableTypes,
+      preferredType: preferredType,
+    );
+
+    var hasChanges = false;
+
+    if (_recipient != recipient) {
+      _recipient = recipient;
+      hasChanges = true;
+    }
+
+    if (!mapEquals(_availableTypes, availableTypes)) {
+      _availableTypes = availableTypes;
+      hasChanges = true;
+    }
+
+    if (resolvedType != _selectedType) {
+      _selectedType = resolvedType;
+      hasChanges = true;
+    }
+
+    if ((recipient != null || forceResetManualData) && _manualPaymentData != null) {
+      _manualPaymentData = null;
+      hasChanges = true;
+    }
+
+    if (hasChanges) notifyListeners();
+  }
 }

frontend/pshared/lib/provider/payment/quotation.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 
-import 'package:collection/collection.dart';
-
 import 'package:uuid/uuid.dart';
 
 import 'package:pshared/api/requests/payment/quote.dart';
@@ -20,7 +18,6 @@ import 'package:pshared/provider/organizations.dart';
 import 'package:pshared/provider/payment/amount.dart';
 import 'package:pshared/provider/payment/flow.dart';
 import 'package:pshared/provider/payment/wallets.dart';
-import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/resource.dart';
 import 'package:pshared/service/payment/quotation.dart';
 import 'package:pshared/utils/currency.dart';
@@ -36,12 +33,10 @@ class QuotationProvider extends ChangeNotifier {
     PaymentAmountProvider payment,
     WalletsProvider wallets,
     PaymentFlowProvider flow,
-    PaymentMethodsProvider methods,
   ) {
     _organizations = venue;
-    final t = flow.selectedType;
-    final method = methods.methods.firstWhereOrNull((m) => m.type == t);
-    if ((wallets.selectedWallet != null) && (method != null)) {
+    final destination = flow.selectedPaymentData;
+    if ((wallets.selectedWallet != null) && (destination != null)) {
       getQuotation(PaymentIntent(
         kind: PaymentKind.payout,
         amount: Money(
@@ -49,7 +44,7 @@ class QuotationProvider extends ChangeNotifier {
           // TODO: adapt to possible other sources
           currency: currencyCodeToString(wallets.selectedWallet!.currency),
         ),
-        destination: method.data,
+        destination: destination,
         source: ManagedWalletPaymentMethod(
           managedWalletRef: wallets.selectedWallet!.id,
         ),

frontend/pshared/lib/provider/recipient/pmethods.dart

@@ -5,6 +5,8 @@ import 'package:pshared/models/describable.dart';
 import 'package:pshared/models/organization/bound.dart';
 import 'package:pshared/models/payment/methods/data.dart';
 import 'package:pshared/models/payment/methods/type.dart';
+import 'package:pshared/models/payment/type.dart';
+import 'package:pshared/models/recipient/recipient.dart';
 import 'package:pshared/models/permissions/bound.dart';
 import 'package:pshared/models/storable.dart';
 import 'package:pshared/provider/organizations.dart';
@@ -20,6 +22,24 @@ class PaymentMethodsProvider extends GenericProvider<PaymentMethod> {
 
   List<PaymentMethod> get methods => List<PaymentMethod>.unmodifiable(items.toList()..sort((a, b) => a.storable.createdAt.compareTo(b.storable.createdAt))); 
 
+  List<PaymentMethod> methodsForRecipient(Recipient? recipient) {
+    if (recipient == null || !isReady) return [];
+
+    return methods
+        .where((method) => !method.isArchived && method.recipientRef == recipient.id)
+        .toList();
+  }
+
+  MethodMap availableTypesForRecipient(Recipient? recipient) => {
+    for (final method in methodsForRecipient(recipient)) method.type: method.data,
+  };
+
+  PaymentMethod? findMethodByType({
+    required PaymentType type,
+    required Recipient? recipient,
+  }) =>
+      methodsForRecipient(recipient).firstWhereOrNull((method) => method.type == type);
+
   void updateProviders(OrganizationsProvider organizations, RecipientsProvider recipients) {
     if (recipients.currentObject != null) loadMethods(organizations, recipients.currentObject?.id);
   }