payment button connected

frontend/pweb/lib/pages/dashboard/payouts/widget.dart

@@ -1,31 +0,0 @@
-import 'package:flutter/material.dart';
-
-import 'package:provider/provider.dart';
-
-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/quotation.dart';
-import 'package:pshared/provider/payment/wallets.dart';
-import 'package:pshared/provider/recipient/pmethods.dart';
-
-import 'package:pweb/pages/dashboard/payouts/form.dart';
-
-
-class PaymentFromWrappingWidget extends StatelessWidget {
-  const PaymentFromWrappingWidget({super.key});
-
-  @override
-  Widget build(BuildContext context) => MultiProvider(
-    providers: [
-      ChangeNotifierProvider(
-        create: (_) => PaymentAmountProvider(),
-      ),
-      ChangeNotifierProxyProvider5<OrganizationsProvider, PaymentAmountProvider, WalletsProvider, PaymentFlowProvider, PaymentMethodsProvider, QuotationProvider>(
-        create: (_) => QuotationProvider(),
-        update: (context, orgnization, payment, wallet, flow, methods, provider) => provider!..update(orgnization, payment, wallet, flow, methods),
-      ),
-    ],
-    child: const PaymentFormWidget(),
-  );
-}

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

@@ -8,7 +8,11 @@ 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/provider/organizations.dart';
+import 'package:pshared/provider/payment/amount.dart';
 import 'package:pshared/provider/payment/flow.dart';
+import 'package:pshared/provider/payment/provider.dart';
+import 'package:pshared/provider/payment/quotation.dart';
 import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';
 
@@ -38,16 +42,12 @@ class PaymentPage extends StatefulWidget {
 class _PaymentPageState extends State<PaymentPage> {
   late final TextEditingController _searchController;
   late final FocusNode _searchFocusNode;
-  late final PaymentFlowProvider _flowProvider;
 
   @override
   void initState() {
     super.initState();
     _searchController = TextEditingController();
     _searchFocusNode = FocusNode();
-    _flowProvider = PaymentFlowProvider(
-      initialType: widget.initialPaymentType ?? PaymentType.bankAccount,
-    );
 
     WidgetsBinding.instance.addPostFrameCallback((_) => _initializePaymentPage());
   }
@@ -56,45 +56,30 @@ class _PaymentPageState extends State<PaymentPage> {
   void dispose() {
     _searchController.dispose();
     _searchFocusNode.dispose();
-    _flowProvider.dispose();
     super.dispose();
   }
 
   void _initializePaymentPage() {
     final methodsProvider = context.read<PaymentMethodsProvider>();
     _handleWalletAutoSelection(methodsProvider);
-
-    final recipient = context.read<RecipientsProvider>().currentObject;
-    _syncFlowProvider(
-      recipient: recipient,
-      methodsProvider: methodsProvider,
-      preferredType: widget.initialPaymentType,
-    );
   }
 
   void _handleSearchChanged(String query) {
     context.read<RecipientsProvider>().setQuery(query);
   }
 
-  void _handleRecipientSelected(Recipient recipient) {
+  void _handleRecipientSelected(BuildContext context, Recipient recipient) {
     final recipientProvider = context.read<RecipientsProvider>();
-    final methodsProvider = context.read<PaymentMethodsProvider>();
-
     recipientProvider.setCurrentObject(recipient.id);
-    _flowProvider.reset(
-      recipient: recipient,
-      availableTypes: _availablePaymentTypes(recipient, methodsProvider),
-      preferredType: widget.initialPaymentType,
-    );
     _clearSearchField();
   }
 
-  void _handleRecipientCleared() {
+  void _handleRecipientCleared(BuildContext context) {
     final recipientProvider = context.read<RecipientsProvider>();
     final methodsProvider = context.read<PaymentMethodsProvider>();
 
     recipientProvider.setCurrentObject(null);
-    _flowProvider.reset(
+    context.read<PaymentFlowProvider>().reset(
       recipient: null,
       availableTypes: _availablePaymentTypes(null, methodsProvider),
       preferredType: widget.initialPaymentType,
@@ -108,9 +93,13 @@ class _PaymentPageState extends State<PaymentPage> {
     context.read<RecipientsProvider>().setQuery('');
   }
 
-  void _handleSendPayment() {
-    // TODO: Handle Payment logic
-    PosthogService.paymentInitiated(method: _flowProvider.selectedType);
+  void _handleSendPayment(BuildContext context) {
+    if (context.read<QuotationProvider>().isReady) {
+      context.read<PaymentProvider>().pay();
+      PosthogService.paymentInitiated(
+        method: context.read<PaymentFlowProvider>().selectedType,
+      );
+    }
   }
 
   @override
@@ -120,27 +109,49 @@ class _PaymentPageState extends State<PaymentPage> {
     final recipient = recipientProvider.currentObject;
     final availableTypes = _availablePaymentTypes(recipient, methodsProvider);
 
-    _syncFlowProvider(
-      recipient: recipient,
-      methodsProvider: methodsProvider,
-      preferredType: recipient != null ? widget.initialPaymentType : null,
-    );
-
-    return ChangeNotifierProvider.value(
-      value: _flowProvider,
-      child: PaymentPageBody(
-        onBack: widget.onBack,
-        fallbackDestination: widget.fallbackDestination,
-        recipient: recipient,
-        recipientProvider: recipientProvider,
-        methodsProvider: methodsProvider,
-        availablePaymentTypes: availableTypes,
-        searchController: _searchController,
-        searchFocusNode: _searchFocusNode,
-        onSearchChanged: _handleSearchChanged,
-        onRecipientSelected: _handleRecipientSelected,
-        onRecipientCleared: _handleRecipientCleared,
-        onSend: _handleSendPayment,
+    return MultiProvider(
+      providers: [
+        ChangeNotifierProxyProvider2<RecipientsProvider, PaymentMethodsProvider, PaymentFlowProvider>(
+          create: (_) => PaymentFlowProvider(
+            initialType: widget.initialPaymentType ?? PaymentType.bankAccount,
+          ),
+          update: (_, recipients, methods, flow) {
+            final currentRecipient = recipients.currentObject;
+            flow!.sync(
+              recipient: currentRecipient,
+              availableTypes: _availablePaymentTypes(currentRecipient, methods),
+              preferredType: currentRecipient != null ? widget.initialPaymentType : null,
+            );
+            return flow;
+          },
+        ),
+        ChangeNotifierProvider(
+          create: (_) => PaymentAmountProvider(),
+        ),
+        ChangeNotifierProxyProvider5<OrganizationsProvider, PaymentAmountProvider, WalletsProvider, PaymentFlowProvider, PaymentMethodsProvider, QuotationProvider>(
+          create: (_) => QuotationProvider(),
+          update: (_, organization, payment, wallet, flow, methods, provider) => provider!..update(organization, payment, wallet, flow, methods),
+        ),
+        ChangeNotifierProxyProvider2<OrganizationsProvider, QuotationProvider, PaymentProvider>(
+          create: (_) => PaymentProvider(), 
+          update: (_, organization, quotation, provider) => provider!..update(organization, quotation),
+        ),
+      ],
+      child: Builder(
+        builder: (innerContext) => PaymentPageBody(
+          onBack: widget.onBack,
+          fallbackDestination: widget.fallbackDestination,
+          recipient: recipient,
+          recipientProvider: recipientProvider,
+          methodsProvider: methodsProvider,
+          availablePaymentTypes: availableTypes,
+          searchController: _searchController,
+          searchFocusNode: _searchFocusNode,
+          onSearchChanged: _handleSearchChanged,
+          onRecipientSelected: (selected) => _handleRecipientSelected(innerContext, selected),
+          onRecipientCleared: () => _handleRecipientCleared(innerContext),
+          onSend: () => _handleSendPayment(innerContext),
+        ),
       ),
     );
   }
@@ -155,18 +166,6 @@ class _PaymentPageState extends State<PaymentPage> {
     }
   }
 
-  void _syncFlowProvider({
-    required Recipient? recipient,
-    required PaymentMethodsProvider methodsProvider,
-    PaymentType? preferredType,
-  }) {
-    _flowProvider.sync(
-      recipient: recipient,
-      availableTypes: _availablePaymentTypes(recipient, methodsProvider),
-      preferredType: preferredType,
-    );
-  }
-
   MethodMap _availablePaymentTypes(
     Recipient? recipient,
     PaymentMethodsProvider methodsProvider,

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

@@ -8,7 +8,7 @@ import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';
 import 'package:pshared/provider/payment/flow.dart';
 
-import 'package:pweb/pages/dashboard/payouts/widget.dart';
+import 'package:pweb/pages/dashboard/payouts/form.dart';
 import 'package:pweb/pages/payment_methods/payment_page/back_button.dart';
 import 'package:pweb/pages/payment_methods/payment_page/header.dart';
 import 'package:pweb/pages/payment_methods/payment_page/method_selector.dart';
@@ -105,7 +105,7 @@ class PaymentPageContent extends StatelessWidget {
                     availableTypes: availablePaymentTypes,
                   ),
                   SizedBox(height: dimensions.paddingLarge),
-                  const PaymentFromWrappingWidget(),
+                  const PaymentFormWidget(),
                   SizedBox(height: dimensions.paddingXXXLarge),
                   SendButton(onPressed: onSend),
                   SizedBox(height: dimensions.paddingLarge),