Moved all the payment data preparation logic from the paymentFlowProvider to the payment and walletproviders

frontend/pweb/lib/main.dart

@@ -19,8 +19,8 @@ import 'package:pshared/provider/payment/quotation.dart';
 import 'package:pshared/provider/recipient/provider.dart';
 import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/payment/wallets.dart';
-import 'package:pshared/service/payment/wallets.dart';
 import 'package:pshared/models/payment/type.dart';
+import 'package:pshared/service/payment/wallets.dart';
 
 import 'package:pweb/app/app.dart';
 import 'package:pweb/app/timeago.dart';

frontend/pweb/lib/pages/payment_methods/page.dart

@@ -1,17 +1,13 @@
 import 'package:flutter/material.dart';
 
-import 'package:collection/collection.dart';
-
 import 'package:provider/provider.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/provider/payment/flow.dart';
 import 'package:pshared/provider/payment/provider.dart';
 import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';
-import 'package:pshared/models/payment/wallet.dart';
 import 'package:pshared/provider/payment/wallets.dart';
 
 import 'package:pweb/pages/payment_methods/payment_page/body.dart';
@@ -57,9 +53,7 @@ class _PaymentPageState extends State<PaymentPage> {
 
   void _initializePaymentPage() {
     final flowProvider = context.read<PaymentFlowProvider>();
-    final methodsProvider = context.read<PaymentMethodsProvider>();
     flowProvider.setPreferredType(widget.initialPaymentType);
-    _handleWalletAutoSelection(methodsProvider);
   }
 
   void _handleSearchChanged(String query) {
@@ -113,6 +107,7 @@ class _PaymentPageState extends State<PaymentPage> {
       recipient: recipient,
       recipientProvider: recipientProvider,
       methodsProvider: methodsProvider,
+      onWalletSelected: context.read<WalletsProvider>().selectWallet,
       searchController: _searchController,
       searchFocusNode: _searchFocusNode,
       onSearchChanged: _handleSearchChanged,
@@ -121,29 +116,4 @@ class _PaymentPageState extends State<PaymentPage> {
       onSend: _handleSendPayment,
     );
   }
-
-  void _handleWalletAutoSelection(PaymentMethodsProvider methodsProvider) {
-    final wallet = context.read<WalletsProvider>().selectedWallet;
-    if (wallet == null) return;
-
-    final matchingMethod = _getPaymentMethodForWallet(wallet, methodsProvider);
-    if (matchingMethod != null) {
-      methodsProvider.setCurrentObject(matchingMethod.id);
-    }
-  }
-
-  PaymentMethod? _getPaymentMethodForWallet(
-    Wallet wallet,
-    PaymentMethodsProvider methodsProvider,
-  ) {
-    if (methodsProvider.methods.isEmpty) {
-      return null;
-    }
-
-    return methodsProvider.methods.firstWhereOrNull(
-      (method) =>
-          method.type == PaymentType.wallet &&
-          (method.description?.contains(wallet.walletUserID) ?? false),
-    );
-  }
 }

frontend/pweb/lib/pages/payment_methods/payment_page/body.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 
 import 'package:pshared/models/recipient/recipient.dart';
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';
 
@@ -16,6 +17,7 @@ class PaymentPageBody extends StatelessWidget {
   final Recipient? recipient;
   final RecipientsProvider recipientProvider;
   final PaymentMethodsProvider methodsProvider;
+  final ValueChanged<Wallet> onWalletSelected;
   final PayoutDestination fallbackDestination;
   final TextEditingController searchController;
   final FocusNode searchFocusNode;
@@ -30,6 +32,7 @@ class PaymentPageBody extends StatelessWidget {
     required this.recipient,
     required this.recipientProvider,
     required this.methodsProvider,
+    required this.onWalletSelected,
     required this.fallbackDestination,
     required this.searchController,
     required this.searchFocusNode,
@@ -57,7 +60,7 @@ class PaymentPageBody extends StatelessWidget {
       onBack: onBack,
       recipient: recipient,
       recipientProvider: recipientProvider,
-      methodsProvider: methodsProvider,
+      onWalletSelected: onWalletSelected,
       fallbackDestination: fallbackDestination,
       searchController: searchController,
       searchFocusNode: searchFocusNode,

frontend/pweb/lib/pages/payment_methods/payment_page/content.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pshared/models/recipient/recipient.dart';
-import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';
 
 import 'package:pweb/pages/payment_methods/payment_page/back_button.dart';
@@ -22,7 +22,7 @@ class PaymentPageContent extends StatelessWidget {
   final ValueChanged<Recipient?>? onBack;
   final Recipient? recipient;
   final RecipientsProvider recipientProvider;
-  final PaymentMethodsProvider methodsProvider;
+  final ValueChanged<Wallet> onWalletSelected;
   final PayoutDestination fallbackDestination;
   final TextEditingController searchController;
   final FocusNode searchFocusNode;
@@ -36,7 +36,7 @@ class PaymentPageContent extends StatelessWidget {
     required this.onBack,
     required this.recipient,
     required this.recipientProvider,
-    required this.methodsProvider,
+    required this.onWalletSelected,
     required this.fallbackDestination,
     required this.searchController,
     required this.searchFocusNode,
@@ -77,7 +77,7 @@ class PaymentPageContent extends StatelessWidget {
                   SectionTitle(loc.sourceOfFunds),
                   SizedBox(height: dimensions.paddingSmall),
                   PaymentMethodSelector(
-                    onMethodChanged: (m) => methodsProvider.setCurrentObject(m.id),
+                    onMethodChanged: onWalletSelected,
                   ),
                   SizedBox(height: dimensions.paddingXLarge),
                   RecipientSection(

frontend/pweb/lib/pages/payment_methods/payment_page/method_selector.dart

@@ -17,9 +17,11 @@ class PaymentMethodSelector extends StatelessWidget {
   });
 
   @override
-  Widget build(BuildContext context) => Consumer<WalletsProvider>(builder:(context, provider, _) =>  PaymentMethodDropdown(
-    methods: provider.wallets,
-    initialValue: provider.selectedWallet,
-    onChanged: onMethodChanged,
-  ));
+  Widget build(BuildContext context) => Consumer<WalletsProvider>(
+        builder: (context, provider, _) => PaymentMethodDropdown(
+          methods: provider.wallets,
+          selectedMethod: provider.selectedWallet,
+          onChanged: onMethodChanged,
+        ),
+      );
 }

frontend/pweb/lib/pages/payment_methods/payment_page/page.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
+import 'package:pshared/models/payment/wallet.dart';
 import 'package:pshared/models/recipient/recipient.dart';
-import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';
 
 import 'package:pweb/pages/dashboard/payouts/widget.dart';
@@ -22,7 +22,7 @@ class PaymentPageContent extends StatelessWidget {
   final ValueChanged<Recipient?>? onBack;
   final Recipient? recipient;
   final RecipientsProvider recipientProvider;
-  final PaymentMethodsProvider methodsProvider;
+  final ValueChanged<Wallet> onWalletSelected;
   final PayoutDestination fallbackDestination;
   final TextEditingController searchController;
   final FocusNode searchFocusNode;
@@ -36,7 +36,7 @@ class PaymentPageContent extends StatelessWidget {
     required this.onBack,
     required this.recipient,
     required this.recipientProvider,
-    required this.methodsProvider,
+    required this.onWalletSelected,
     required this.fallbackDestination,
     required this.searchController,
     required this.searchFocusNode,
@@ -77,7 +77,7 @@ class PaymentPageContent extends StatelessWidget {
                   SectionTitle(loc.sourceOfFunds),
                   SizedBox(height: dimensions.paddingSmall),
                   PaymentMethodSelector(
-                    onMethodChanged: (m) => methodsProvider.setCurrentObject(m.id),
+                    onMethodChanged: onWalletSelected,
                   ),
                   SizedBox(height: dimensions.paddingXLarge),
                   RecipientSection(

frontend/pweb/lib/utils/payment/dropdown.dart

@@ -8,40 +8,27 @@ import 'package:pweb/pages/payment_methods/icon.dart';
 import 'package:pweb/generated/i18n/app_localizations.dart';
 
 
-class PaymentMethodDropdown extends StatefulWidget {
+class PaymentMethodDropdown extends StatelessWidget {
   final List<Wallet> methods;
   final ValueChanged<Wallet> onChanged;
-  final Wallet? initialValue;
+  final Wallet? selectedMethod;
 
   const PaymentMethodDropdown({
     super.key,
     required this.methods,
     required this.onChanged,
-    this.initialValue,
+    this.selectedMethod,
   });
 
-  @override
-  State<PaymentMethodDropdown> createState() => _PaymentMethodDropdownState();
-}
-
-class _PaymentMethodDropdownState extends State<PaymentMethodDropdown> {
-  late Wallet _selectedMethod;
-
-  @override
-  void initState() {
-    super.initState();
-    _selectedMethod = widget.initialValue ?? widget.methods.first;
-  }
-
   @override
   Widget build(BuildContext context) => DropdownButtonFormField<Wallet>(
     dropdownColor: Theme.of(context).colorScheme.onSecondary,
-    initialValue: _selectedMethod,
+    value: _getSelectedMethod(),
     decoration: InputDecoration(
       labelText: AppLocalizations.of(context)!.whereGetMoney,
       border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
     ),
-    items: widget.methods.map((method) => DropdownMenuItem<Wallet>(
+    items: methods.map((method) => DropdownMenuItem<Wallet>(
       value: method,
       child: Row(
         children: [
@@ -53,9 +40,14 @@ class _PaymentMethodDropdownState extends State<PaymentMethodDropdown> {
     )).toList(),
     onChanged: (value) {
       if (value != null) {
-        setState(() => _selectedMethod = value);
-        widget.onChanged(value);
+        onChanged(value);
       }
     },
   );
-}
+
+  Wallet? _getSelectedMethod() {
+    if (selectedMethod != null) return selectedMethod;
+    if (methods.isEmpty) return null;
+    return methods.first;
+  }
+}