refactoring for recipient addition page

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

@@ -11,6 +11,7 @@ import 'package:pweb/pages/address_book/page/filter_button.dart';
 import 'package:pweb/pages/address_book/page/header.dart';
 import 'package:pweb/pages/address_book/page/list.dart';
 import 'package:pweb/pages/address_book/page/search.dart';
+import 'package:pweb/utils/recipient/filtering.dart';
 
 import 'package:pweb/generated/i18n/app_localizations.dart';
 
@@ -41,12 +42,13 @@ class RecipientAddressBookPage extends StatefulWidget {
 class _RecipientAddressBookPageState extends State<RecipientAddressBookPage> {
   late final TextEditingController _searchController;
   late final FocusNode _searchFocusNode;
+  RecipientFilter _selectedFilter = RecipientFilter.all;
+  String _query = '';
 
   @override
   void initState() {
     super.initState();
-    final provider = context.read<RecipientsProvider>();
-    _searchController = TextEditingController(text: provider.query);
+    _searchController = TextEditingController();
     _searchFocusNode = FocusNode();
   }
 
@@ -57,23 +59,27 @@ class _RecipientAddressBookPageState extends State<RecipientAddressBookPage> {
     super.dispose();
   }
 
-  void _syncSearchField(RecipientsProvider provider) {
-    final query = provider.query;
-    if (_searchController.text == query) return;
+  void _setQuery(String query) {
+    setState(() {
+      _query = query;
+    });
+  }
 
-    _searchController.value = TextEditingValue(
-      text: query,
-      selection: TextSelection.collapsed(offset: query.length),
-    );
+  void _setFilter(RecipientFilter filter) {
+    setState(() {
+      _selectedFilter = filter;
+    });
   }
 
   @override
   Widget build(BuildContext context) {
-    
     final loc = AppLocalizations.of(context)!;
     final provider = context.watch<RecipientsProvider>(); 
-    _syncSearchField(provider);
-    final filteredRecipients = provider.filteredRecipients;
+    final filteredRecipients = filterRecipients(
+      recipients: provider.recipients,
+      filter: _selectedFilter,
+      query: _query,
+    );
 
     if (provider.isLoading) {
       return const Center(child: CircularProgressIndicator());
@@ -91,7 +97,7 @@ class _RecipientAddressBookPageState extends State<RecipientAddressBookPage> {
         RecipientSearchField(
           controller: _searchController,
           focusNode: _searchFocusNode,
-          onChanged: provider.setQuery,
+          onChanged: _setQuery,
         ),
         const SizedBox(height: RecipientAddressBookPage._bigBox),
         Row(
@@ -99,26 +105,26 @@ class _RecipientAddressBookPageState extends State<RecipientAddressBookPage> {
             RecipientFilterButton(
               text: loc.allStatus,
               filter: RecipientFilter.all,
-              selected: provider.selectedFilter,
-              onTap: provider.setFilter,
+              selected: _selectedFilter,
+              onTap: _setFilter,
             ),
             RecipientFilterButton(
               text: loc.readyStatus,
               filter: RecipientFilter.ready,
-              selected: provider.selectedFilter,
-              onTap: provider.setFilter,
+              selected: _selectedFilter,
+              onTap: _setFilter,
             ),
             RecipientFilterButton(
               text: loc.registeredStatus,
               filter: RecipientFilter.registered,
-              selected: provider.selectedFilter,
-              onTap: provider.setFilter,
+              selected: _selectedFilter,
+              onTap: _setFilter,
             ),
             RecipientFilterButton(
               text: loc.notRegisteredStatus,
               filter: RecipientFilter.notRegistered,
-              selected: provider.selectedFilter,
-              onTap: provider.setFilter,
+              selected: _selectedFilter,
+              onTap: _setFilter,
             ),
           ],
         ),
@@ -145,4 +151,4 @@ class _RecipientAddressBookPageState extends State<RecipientAddressBookPage> {
       ],
     );
   }
-}
+}

frontend/pweb/lib/pages/address_book/page/recipient/payment_row.dart

@@ -3,14 +3,13 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 import 'package:pshared/models/recipient/recipient.dart';
-import 'package:pshared/provider/organizations.dart';
-import 'package:pshared/provider/recipient/pmethods.dart';
+import 'package:pshared/provider/recipient/methods_cache.dart';
 
 import 'package:pweb/pages/address_book/page/recipient/info_row.dart';
 import 'package:pweb/utils/payment/label.dart';
 
 
-class RecipientPaymentRow extends StatefulWidget {
+class RecipientPaymentRow extends StatelessWidget {
   final Recipient recipient;
   final double spacing;
 
@@ -20,40 +19,19 @@ class RecipientPaymentRow extends StatefulWidget {
     this.spacing = 18
   });
 
-  @override
-  State<RecipientPaymentRow> createState() => _RecipientPaymentRowState();
-}
-
-class _RecipientPaymentRowState extends State<RecipientPaymentRow> {
-  late final PaymentMethodsProvider _methodsProvider;
-
-  @override
-  void initState() {
-    super.initState();
-    _methodsProvider = PaymentMethodsProvider()
-      ..addListener(_onProviderChanged)
-      ..loadMethods(
-        context.read<OrganizationsProvider>(), 
-        widget.recipient.id,
-      );
-  }
-
-  @override
-  void dispose() {
-    _methodsProvider.removeListener(_onProviderChanged);
-    _methodsProvider.dispose();
-    super.dispose();
-  }
-
-  void _onProviderChanged() => setState(() {});
-
   @override
   Widget build(BuildContext context) {
-    if (!_methodsProvider.isReady) return const Center(child: CircularProgressIndicator());
+    final cacheProvider = context.watch<RecipientMethodsCacheProvider>();
+    final recipientId = recipient.id;
+    final isLoading = cacheProvider.isLoadingFor(recipientId);
+
+    if (isLoading && !cacheProvider.hasMethodsFor(recipientId)) {
+      return const Center(child: CircularProgressIndicator());
+    }
 
     return Row(
-      spacing: widget.spacing,
-      children: _methodsProvider.methods.map((m) => RecipientAddressBookInfoRow(
+      spacing: spacing,
+      children: cacheProvider.methodsForRecipient(recipientId).map((m) => RecipientAddressBookInfoRow(
         type: m.type,
         value: getPaymentTypeDescription(context, m),
       )).toList(),