added ledger as souec of funds for payouts

2026-03-03 21:03:30 +03:00
parent 3f578353da
commit 51c72a87ae
29 changed files with 796 additions and 385 deletions
--- a/frontend/pweb/lib/pages/payout_page/send/body.dart
+++ b/frontend/pweb/lib/pages/payout_page/send/body.dart
@@ -1,7 +1,6 @@
 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';

@@ -13,7 +12,6 @@ import 'package:pweb/models/state/visibility.dart';

 import 'package:pweb/generated/i18n/app_localizations.dart';

-
 class PaymentPageBody extends StatelessWidget {
  final ValueChanged<Recipient?>? onBack;
  final Recipient? recipient;
@@ -23,7 +21,6 @@ class PaymentPageBody extends StatelessWidget {
  final PaymentMethodsProvider methodsProvider;
  final ControlState sendState;
  final int cooldownRemainingSeconds;
-  final ValueChanged<Wallet> onWalletSelected;
  final PayoutDestination fallbackDestination;
  final TextEditingController searchController;
  final FocusNode searchFocusNode;
@@ -46,7 +43,6 @@ class PaymentPageBody extends StatelessWidget {
    required this.methodsProvider,
    required this.sendState,
    required this.cooldownRemainingSeconds,
-    required this.onWalletSelected,
    required this.fallbackDestination,
    required this.searchController,
    required this.searchFocusNode,
@@ -70,7 +66,9 @@ class PaymentPageBody extends StatelessWidget {

    if (methodsProvider.error != null) {
      return PaymentMethodsErrorView(
-        message: loc.notificationError(methodsProvider.error ?? loc.noErrorInformation),
+        message: loc.notificationError(
+          methodsProvider.error ?? loc.noErrorInformation,
+        ),
      );
    }

@@ -80,7 +78,6 @@ class PaymentPageBody extends StatelessWidget {
      recipientProvider: recipientProvider,
      searchQuery: searchQuery,
      filteredRecipients: filteredRecipients,
-      onWalletSelected: onWalletSelected,
      fallbackDestination: fallbackDestination,
      sendState: sendState,
      cooldownRemainingSeconds: cooldownRemainingSeconds,
--- a/frontend/pweb/lib/pages/payout_page/send/content.dart
+++ b/frontend/pweb/lib/pages/payout_page/send/content.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';

-import 'package:pshared/models/payment/wallet.dart';
 import 'package:pshared/models/recipient/recipient.dart';
 import 'package:pshared/provider/recipient/provider.dart';

@@ -13,14 +12,12 @@ import 'package:pweb/models/state/visibility.dart';

 import 'package:pweb/generated/i18n/app_localizations.dart';

-
 class PaymentPageContent extends StatelessWidget {
  final ValueChanged<Recipient?>? onBack;
  final Recipient? recipient;
  final RecipientsProvider recipientProvider;
  final String searchQuery;
  final List<Recipient> filteredRecipients;
-  final ValueChanged<Wallet> onWalletSelected;
  final PayoutDestination fallbackDestination;
  final ControlState sendState;
  final int cooldownRemainingSeconds;
@@ -42,7 +39,6 @@ class PaymentPageContent extends StatelessWidget {
    required this.recipientProvider,
    required this.searchQuery,
    required this.filteredRecipients,
-    required this.onWalletSelected,
    required this.fallbackDestination,
    required this.sendState,
    required this.cooldownRemainingSeconds,
@@ -79,7 +75,6 @@ class PaymentPageContent extends StatelessWidget {
        recipientProvider: recipientProvider,
        searchQuery: searchQuery,
        filteredRecipients: filteredRecipients,
-        onWalletSelected: onWalletSelected,
        fallbackDestination: fallbackDestination,
        sendState: sendState,
        cooldownRemainingSeconds: cooldownRemainingSeconds,
--- a/frontend/pweb/lib/pages/payout_page/send/content/sections.dart
+++ b/frontend/pweb/lib/pages/payout_page/send/content/sections.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';

-import 'package:pshared/models/payment/wallet.dart';
 import 'package:pshared/models/recipient/recipient.dart';
 import 'package:pshared/provider/recipient/provider.dart';

@@ -13,7 +12,6 @@ import 'package:pweb/widgets/sidebar/destinations.dart';
 import 'package:pweb/models/state/control_state.dart';
 import 'package:pweb/models/state/visibility.dart';

-
 class PaymentPageContentSections extends StatelessWidget {
  final AppDimensions dimensions;
  final String sourceOfFundsTitle;
@@ -22,7 +20,6 @@ class PaymentPageContentSections extends StatelessWidget {
  final RecipientsProvider recipientProvider;
  final String searchQuery;
  final List<Recipient> filteredRecipients;
-  final ValueChanged<Wallet> onWalletSelected;
  final PayoutDestination fallbackDestination;
  final ControlState sendState;
  final int cooldownRemainingSeconds;
@@ -46,7 +43,6 @@ class PaymentPageContentSections extends StatelessWidget {
    required this.recipientProvider,
    required this.searchQuery,
    required this.filteredRecipients,
-    required this.onWalletSelected,
    required this.fallbackDestination,
    required this.sendState,
    required this.cooldownRemainingSeconds,
@@ -77,7 +73,6 @@ class PaymentPageContentSections extends StatelessWidget {
        PaymentPageSourceSection(
          dimensions: dimensions,
          title: sourceOfFundsTitle,
-          onWalletSelected: onWalletSelected,
        ),
        SizedBox(height: dimensions.paddingXLarge),
        PaymentPageRecipientSection(
--- a/frontend/pweb/lib/pages/payout_page/send/content/source_section.dart
+++ b/frontend/pweb/lib/pages/payout_page/send/content/source_section.dart
@@ -1,29 +1,20 @@
 import 'package:flutter/material.dart';

-import 'package:pshared/models/payment/wallet.dart';
-
 import 'package:pweb/pages/payout_page/send/widgets/source_of_funds_card.dart';
 import 'package:pweb/utils/dimensions.dart';

-
 class PaymentPageSourceSection extends StatelessWidget {
  final AppDimensions dimensions;
  final String title;
-  final ValueChanged<Wallet> onWalletSelected;

  const PaymentPageSourceSection({
    super.key,
    required this.dimensions,
    required this.title,
-    required this.onWalletSelected,
  });

  @override
  Widget build(BuildContext context) {
-    return PaymentSourceOfFundsCard(
-      dimensions: dimensions,
-      title: title,
-      onWalletSelected: onWalletSelected,
-    );
+    return PaymentSourceOfFundsCard(dimensions: dimensions, title: title);
  }
 }
--- a/frontend/pweb/lib/pages/payout_page/send/page_view.dart
+++ b/frontend/pweb/lib/pages/payout_page/send/page_view.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';

 import 'package:provider/provider.dart';

-import 'package:pshared/controllers/balance_mask/wallets.dart';
 import 'package:pshared/models/recipient/recipient.dart';
 import 'package:pshared/provider/payment/quotation/quotation.dart';
 import 'package:pshared/provider/recipient/pmethods.dart';
@@ -15,7 +14,6 @@ import 'package:pweb/controllers/payments/page_ui.dart';
 import 'package:pweb/controllers/payouts/payout_verification.dart';
 import 'package:pweb/models/state/control_state.dart';

-
 class PaymentPageView extends StatelessWidget {
  final PaymentPageUiController uiController;
  final ValueChanged<Recipient?>? onBack;
@@ -50,8 +48,8 @@ class PaymentPageView extends StatelessWidget {
          final methodsProvider = context.watch<PaymentMethodsProvider>();
          final recipientProvider = context.watch<RecipientsProvider>();
          final quotationProvider = context.watch<QuotationProvider>();
-          final verificationController =
-              context.watch<PayoutVerificationController>();
+          final verificationController = context
+              .watch<PayoutVerificationController>();
          final verificationContextKey =
              quotationProvider.quotation?.quoteRef ??
              quotationProvider.quotation?.idempotencyKey;
@@ -62,10 +60,10 @@ class PaymentPageView extends StatelessWidget {
          );
          final sendState =
              verificationController.isCooldownActiveFor(verificationContextKey)
-                  ? ControlState.disabled
-                  : (recipient == null
-                      ? ControlState.disabled
-                      : ControlState.enabled);
+              ? ControlState.disabled
+              : (recipient == null
+                    ? ControlState.disabled
+                    : ControlState.enabled);

          return PaymentPageBody(
            onBack: onBack,
@@ -76,10 +74,8 @@ class PaymentPageView extends StatelessWidget {
            filteredRecipients: filteredRecipients,
            methodsProvider: methodsProvider,
            sendState: sendState,
-            cooldownRemainingSeconds:
-                verificationController
-                    .cooldownRemainingSecondsFor(verificationContextKey),
-            onWalletSelected: context.read<WalletsController>().selectWallet,
+            cooldownRemainingSeconds: verificationController
+                .cooldownRemainingSecondsFor(verificationContextKey),
            searchController: uiController.searchController,
            searchFocusNode: uiController.searchFocusNode,
            onSearchChanged: onSearchChanged,
--- a/frontend/pweb/lib/pages/payout_page/send/widgets/method_selector.dart
+++ b/frontend/pweb/lib/pages/payout_page/send/widgets/method_selector.dart
@@ -2,25 +2,16 @@ import 'package:flutter/material.dart';

 import 'package:provider/provider.dart';

-import 'package:pshared/controllers/balance_mask/wallets.dart';
-import 'package:pshared/models/payment/wallet.dart';
+import 'package:pshared/controllers/payment/source.dart';

 import 'package:pweb/widgets/payment/source_wallet_selector.dart';

-
 class PaymentMethodSelector extends StatelessWidget {
-  final ValueChanged<Wallet> onMethodChanged;
-
-  const PaymentMethodSelector({
-    super.key,
-    required this.onMethodChanged,
-  });
+  const PaymentMethodSelector({super.key});

  @override
-  Widget build(BuildContext context) => Consumer<WalletsController>(
-        builder: (context, provider, _) => SourceWalletSelector(
-          walletsController: provider,
-          onChanged: onMethodChanged,
-        ),
-      );
+  Widget build(BuildContext context) => Consumer<PaymentSourceController>(
+    builder: (context, provider, _) =>
+        SourceWalletSelector(sourceController: provider),
+  );
 }
--- a/frontend/pweb/lib/pages/payout_page/send/widgets/source_of_funds_card.dart
+++ b/frontend/pweb/lib/pages/payout_page/send/widgets/source_of_funds_card.dart
@@ -2,26 +2,23 @@ import 'package:flutter/material.dart';

 import 'package:provider/provider.dart';

-import 'package:pshared/controllers/balance_mask/wallets.dart';
-import 'package:pshared/models/payment/wallet.dart';
+import 'package:pshared/controllers/payment/source.dart';

 import 'package:pweb/pages/payout_page/send/widgets/method_selector.dart';
 import 'package:pweb/pages/payout_page/send/widgets/section/title.dart';
 import 'package:pweb/pages/payout_page/send/widgets/section/card.dart';
 import 'package:pweb/utils/dimensions.dart';
+import 'package:pweb/widgets/refresh_balance/ledger.dart';
 import 'package:pweb/widgets/refresh_balance/wallet.dart';

-
 class PaymentSourceOfFundsCard extends StatelessWidget {
  final AppDimensions dimensions;
  final String title;
-  final ValueChanged<Wallet> onWalletSelected;

  const PaymentSourceOfFundsCard({
    super.key,
    required this.dimensions,
    required this.title,
-    required this.onWalletSelected,
  });

  @override
@@ -33,21 +30,29 @@ class PaymentSourceOfFundsCard extends StatelessWidget {
          Row(
            children: [
              Expanded(child: SectionTitle(title)),
-              Consumer<WalletsController>(
+              Consumer<PaymentSourceController>(
                builder: (context, provider, _) {
-                  final selectedWalletId = provider.selectedWallet?.id;
-                  if (selectedWalletId == null) {
-                    return const SizedBox.shrink();
+                  final selectedWallet = provider.selectedWallet;
+                  if (selectedWallet != null) {
+                    return WalletBalanceRefreshButton(
+                      walletRef: selectedWallet.id,
+                    );
                  }
-                  return WalletBalanceRefreshButton(walletRef: selectedWalletId);
+
+                  final selectedLedger = provider.selectedLedgerAccount;
+                  if (selectedLedger != null) {
+                    return LedgerBalanceRefreshButton(
+                      ledgerAccountRef: selectedLedger.ledgerAccountRef,
+                    );
+                  }
+
+                  return const SizedBox.shrink();
                },
              ),
            ],
          ),
          SizedBox(height: dimensions.paddingSmall),
-          PaymentMethodSelector(
-            onMethodChanged: onWalletSelected,
-          ),
+          const PaymentMethodSelector(),
        ],
      ),
    );