added missed loc instead of hardcode

wallet card redesign
Merge remote-tracking branch 'origin/main' into SEND066
2026-03-06 18:05:04 +03:00 · 2026-03-06 17:48:36 +03:00 · 2026-03-06 17:18:39 +03:00 · 2026-03-06 01:14:40 +03:00 · 2026-03-05 21:49:23 +03:00 · 2026-03-05 21:12:43 +03:00
83 changed files with 2169 additions and 989 deletions
--- a/api/gateway/tgsettle/storage/mongo/store/treasury_telegram_users.go
+++ b/api/gateway/tgsettle/storage/mongo/store/treasury_telegram_users.go
@@ -1,87 +0,0 @@
-package store
-
-import (
-	"context"
-	"errors"
-	"strings"
-
-	"github.com/tech/sendico/gateway/tgsettle/storage"
-	"github.com/tech/sendico/gateway/tgsettle/storage/model"
-	"github.com/tech/sendico/pkg/db/repository"
-	ri "github.com/tech/sendico/pkg/db/repository/index"
-	"github.com/tech/sendico/pkg/merrors"
-	"github.com/tech/sendico/pkg/mlogger"
-	"go.mongodb.org/mongo-driver/v2/mongo"
-	"go.uber.org/zap"
-)
-
-const (
-	treasuryTelegramUsersCollection = "treasury_telegram_users"
-	fieldTreasuryTelegramUserID     = "telegramUserId"
-)
-
-type TreasuryTelegramUsers struct {
-	logger mlogger.Logger
-	repo   repository.Repository
-}
-
-func NewTreasuryTelegramUsers(logger mlogger.Logger, db *mongo.Database) (*TreasuryTelegramUsers, error) {
-	if db == nil {
-		return nil, merrors.InvalidArgument("mongo database is nil")
-	}
-	if logger == nil {
-		logger = zap.NewNop()
-	}
-	logger = logger.Named("treasury_telegram_users").With(zap.String("collection", treasuryTelegramUsersCollection))
-
-	repo := repository.CreateMongoRepository(db, treasuryTelegramUsersCollection)
-	if err := repo.CreateIndex(&ri.Definition{
-		Keys:   []ri.Key{{Field: fieldTreasuryTelegramUserID, Sort: ri.Asc}},
-		Unique: true,
-	}); err != nil {
-		logger.Error("Failed to create treasury telegram users user_id index", zap.Error(err), zap.String("index_field", fieldTreasuryTelegramUserID))
-		return nil, err
-	}
-
-	return &TreasuryTelegramUsers{
-		logger: logger,
-		repo:   repo,
-	}, nil
-}
-
-func (t *TreasuryTelegramUsers) FindByTelegramUserID(ctx context.Context, telegramUserID string) (*model.TreasuryTelegramUser, error) {
-	telegramUserID = strings.TrimSpace(telegramUserID)
-	if telegramUserID == "" {
-		return nil, merrors.InvalidArgument("telegram_user_id is required", "telegram_user_id")
-	}
-	var result model.TreasuryTelegramUser
-	err := t.repo.FindOneByFilter(ctx, repository.Filter(fieldTreasuryTelegramUserID, telegramUserID), &result)
-	if errors.Is(err, merrors.ErrNoData) {
-		return nil, nil
-	}
-	if err != nil {
-		if !errors.Is(err, context.Canceled) && !errors.Is(err, context.DeadlineExceeded) {
-			t.logger.Warn("Failed to load treasury telegram user", zap.Error(err), zap.String("telegram_user_id", telegramUserID))
-		}
-		return nil, err
-	}
-	result.TelegramUserID = strings.TrimSpace(result.TelegramUserID)
-	result.LedgerAccountID = strings.TrimSpace(result.LedgerAccountID)
-	if len(result.AllowedChatIDs) > 0 {
-		normalized := make([]string, 0, len(result.AllowedChatIDs))
-		for _, next := range result.AllowedChatIDs {
-			next = strings.TrimSpace(next)
-			if next == "" {
-				continue
-			}
-			normalized = append(normalized, next)
-		}
-		result.AllowedChatIDs = normalized
-	}
-	if result.TelegramUserID == "" || result.LedgerAccountID == "" {
-		return nil, nil
-	}
-	return &result, nil
-}
-
-var _ storage.TreasuryTelegramUsersStore = (*TreasuryTelegramUsers)(nil)
--- a/frontend/pshared/lib/data/dto/payment/payment.dart
+++ b/frontend/pshared/lib/data/dto/payment/payment.dart
@@ -1,11 +1,11 @@
 import 'package:json_annotation/json_annotation.dart';

 import 'package:pshared/data/dto/payment/operation.dart';
+import 'package:pshared/data/dto/payment/intent/payment.dart';
 import 'package:pshared/data/dto/payment/payment_quote.dart';

 part 'payment.g.dart';

-
@JsonSerializable()
 class PaymentDTO {
  final String? paymentRef;
@@ -13,6 +13,7 @@ class PaymentDTO {
  final String? state;
  final String? failureCode;
  final String? failureReason;
+  final PaymentIntentDTO? intent;
  final List<PaymentOperationDTO> operations;
  final PaymentQuoteDTO? lastQuote;
  final Map<String, String>? metadata;
@@ -24,6 +25,7 @@ class PaymentDTO {
    this.state,
    this.failureCode,
    this.failureReason,
+    this.intent,
    this.operations = const <PaymentOperationDTO>[],
    this.lastQuote,
    this.metadata,
--- a/frontend/pshared/lib/data/mapper/payment/payment_response.dart
+++ b/frontend/pshared/lib/data/mapper/payment/payment_response.dart
@@ -1,10 +1,10 @@
 import 'package:pshared/data/dto/payment/payment.dart';
+import 'package:pshared/data/mapper/payment/intent/payment.dart';
 import 'package:pshared/data/mapper/payment/operation.dart';
 import 'package:pshared/data/mapper/payment/quote.dart';
 import 'package:pshared/models/payment/payment.dart';
 import 'package:pshared/models/payment/state.dart';

-
 extension PaymentDTOMapper on PaymentDTO {
  Payment toDomain() => Payment(
    paymentRef: paymentRef,
@@ -13,6 +13,7 @@ extension PaymentDTOMapper on PaymentDTO {
    orchestrationState: paymentOrchestrationStateFromValue(state),
    failureCode: failureCode,
    failureReason: failureReason,
+    intent: intent?.toDomain(),
    operations: operations.map((item) => item.toDomain()).toList(),
    lastQuote: lastQuote?.toDomain(),
    metadata: metadata,
@@ -27,6 +28,7 @@ extension PaymentMapper on Payment {
    state: state ?? paymentOrchestrationStateToValue(orchestrationState),
    failureCode: failureCode,
    failureReason: failureReason,
+    intent: intent?.toDTO(),
    operations: operations.map((item) => item.toDTO()).toList(),
    lastQuote: lastQuote?.toDTO(),
    metadata: metadata,
--- a/frontend/pshared/lib/models/payment/operation_document.dart
+++ b/frontend/pshared/lib/models/payment/operation_document.dart
@@ -1,9 +1,9 @@
-class OperationDocumentInfo {
-  final String operationRef;
+class OperationDocumentRef {
  final String gatewayService;
+  final String operationRef;

-  const OperationDocumentInfo({
-    required this.operationRef,
+  const OperationDocumentRef({
    required this.gatewayService,
+    required this.operationRef,
  });
 }
--- a/frontend/pshared/lib/models/payment/payment.dart
+++ b/frontend/pshared/lib/models/payment/payment.dart
@@ -1,4 +1,5 @@
 import 'package:pshared/models/payment/execution_operation.dart';
+import 'package:pshared/models/payment/intent.dart';
 import 'package:pshared/models/payment/quote/quote.dart';
 import 'package:pshared/models/payment/state.dart';

@@ -9,6 +10,7 @@ class Payment {
  final PaymentOrchestrationState orchestrationState;
  final String? failureCode;
  final String? failureReason;
+  final PaymentIntent? intent;
  final List<PaymentExecutionOperation> operations;
  final PaymentQuote? lastQuote;
  final Map<String, String>? metadata;
@@ -21,6 +23,7 @@ class Payment {
    required this.orchestrationState,
    required this.failureCode,
    required this.failureReason,
+    this.intent,
    required this.operations,
    required this.lastQuote,
    required this.metadata,
--- a/frontend/pweb/lib/app/router/payout_routes.dart
+++ b/frontend/pweb/lib/app/router/payout_routes.dart
@@ -25,6 +25,7 @@ class PayoutRoutes {
  static const walletTopUp = 'payout-wallet-top-up';

  static const paymentTypeQuery = 'paymentType';
+  static const destinationLedgerAccountRefQuery = 'destinationLedgerAccountRef';
  static const reportPaymentIdQuery = 'paymentId';

  static const dashboardPath = '/dashboard';
@@ -40,7 +41,6 @@ class PayoutRoutes {
  static const editWalletPath = '/methods/edit';
  static const walletTopUpPath = '/wallet/top-up';

-
  static String nameFor(PayoutDestination destination) {
    switch (destination) {
      case PayoutDestination.dashboard:
@@ -126,9 +126,13 @@ class PayoutRoutes {

  static Map<String, String> buildQueryParameters({
    PaymentType? paymentType,
+    String? destinationLedgerAccountRef,
  }) {
    final params = <String, String>{
      if (paymentType != null) paymentTypeQuery: paymentType.name,
+      if (destinationLedgerAccountRef != null &&
+          destinationLedgerAccountRef.trim().isNotEmpty)
+        destinationLedgerAccountRefQuery: destinationLedgerAccountRef.trim(),
    };
    return params;
  }
@@ -140,35 +144,44 @@ class PayoutRoutes {
      ? null
      : PaymentType.values.firstWhereOrNull((type) => type.name == raw);

+  static String? destinationLedgerAccountRefFromState(GoRouterState state) =>
+      destinationLedgerAccountRefFromRaw(
+        state.uri.queryParameters[destinationLedgerAccountRefQuery],
+      );
+
+  static String? destinationLedgerAccountRefFromRaw(String? raw) {
+    final value = raw?.trim();
+    if (value == null || value.isEmpty) return null;
+    return value;
+  }
 }

 extension PayoutNavigation on BuildContext {
-  void goToPayout(PayoutDestination destination) => goNamed(PayoutRoutes.nameFor(destination));
+  void goToPayout(PayoutDestination destination) =>
+      goNamed(PayoutRoutes.nameFor(destination));

-  void pushToPayout(PayoutDestination destination) => pushNamed(PayoutRoutes.nameFor(destination));
+  void pushToPayout(PayoutDestination destination) =>
+      pushNamed(PayoutRoutes.nameFor(destination));

  void goToPayment({
    PaymentType? paymentType,
-  }) =>
-      goNamed(
+    String? destinationLedgerAccountRef,
+  }) => goNamed(
        PayoutRoutes.payment,
        queryParameters: PayoutRoutes.buildQueryParameters(
          paymentType: paymentType,
+      destinationLedgerAccountRef: destinationLedgerAccountRef,
        ),
      );

  void goToReportPayment(String paymentId) => goNamed(
    PayoutRoutes.reportPayment,
-    queryParameters: {
-      PayoutRoutes.reportPaymentIdQuery: paymentId,
-    },
+    queryParameters: {PayoutRoutes.reportPaymentIdQuery: paymentId},
  );

  void pushToReportPayment(String paymentId) => pushNamed(
    PayoutRoutes.reportPayment,
-    queryParameters: {
-      PayoutRoutes.reportPaymentIdQuery: paymentId,
-    },
+    queryParameters: {PayoutRoutes.reportPaymentIdQuery: paymentId},
  );

  void pushToWalletTopUp() => pushNamed(PayoutRoutes.walletTopUp);
--- a/frontend/pweb/lib/app/router/payout_shell.dart
+++ b/frontend/pweb/lib/app/router/payout_shell.dart
@@ -6,6 +6,7 @@ import 'package:provider/provider.dart';

 import 'package:pshared/controllers/balance_mask/wallets.dart';
 import 'package:pshared/controllers/payment/source.dart';
+import 'package:pshared/models/ledger/account.dart';
 import 'package:pshared/models/payment/type.dart';
 import 'package:pshared/models/recipient/recipient.dart';
 import 'package:pshared/provider/ledger.dart';
@@ -227,7 +228,9 @@ RouteBase payoutShellRoute() => ShellRoute(
          onGoToPaymentWithoutRecipient: (type) =>
              _startPayment(context, recipient: null, paymentType: type),
          onTopUp: (wallet) => _openWalletTopUp(context, wallet),
-          onWalletTap: (wallet) => _openWalletEdit(context, wallet),
+          onLedgerAddFunds: (account) => _openLedgerAddFunds(context, account),
+          onWalletTap: (wallet) => _openWalletTopUp(context, wallet),
+          onLedgerTap: (account) => _openLedgerEdit(context, account),
        ),
      ),
    ),
@@ -304,6 +307,8 @@ RouteBase payoutShellRoute() => ShellRoute(
          child: PaymentPage(
            onBack: (_) => _popOrGo(context),
            initialPaymentType: PayoutRoutes.paymentTypeFromState(state),
+            initialDestinationLedgerAccountRef:
+                PayoutRoutes.destinationLedgerAccountRefFromState(state),
            fallbackDestination: fallbackDestination,
          ),
        );
@@ -340,17 +345,9 @@ RouteBase payoutShellRoute() => ShellRoute(
    GoRoute(
      name: PayoutRoutes.editWallet,
      path: PayoutRoutes.editWalletPath,
-      pageBuilder: (context, state) {
-        final walletsProvider = context.read<WalletsController>();
-        final wallet = walletsProvider.selectedWallet;
-        final loc = AppLocalizations.of(context)!;
-
-        return NoTransitionPage(
-          child: wallet != null
-              ? WalletEditPage(onBack: () => _popOrGo(context))
-              : Center(child: Text(loc.noWalletSelected)),
-        );
-      },
+      pageBuilder: (context, state) => NoTransitionPage(
+        child: WalletEditPage(onBack: () => _popOrGo(context)),
+      ),
    ),
    GoRoute(
      name: PayoutRoutes.walletTopUp,
@@ -388,11 +385,27 @@ void _openEditRecipient(BuildContext context, {required Recipient recipient}) {
  context.pushNamed(PayoutRoutes.editRecipient);
 }

-void _openWalletEdit(BuildContext context, Wallet wallet) {
-  context.read<WalletsController>().selectWallet(wallet);
+void _openLedgerEdit(BuildContext context, LedgerAccount account) {
+  context.read<PaymentSourceController>().selectLedgerByRef(
+    account.ledgerAccountRef,
+  );
  context.pushToEditWallet();
 }

+void _openLedgerAddFunds(BuildContext context, LedgerAccount account) {
+  context.read<PaymentSourceController>().selectLedgerByRef(
+    account.ledgerAccountRef,
+  );
+  context.read<RecipientsProvider>().setCurrentObject(null);
+  context.pushNamed(
+    PayoutRoutes.payment,
+    queryParameters: PayoutRoutes.buildQueryParameters(
+      paymentType: PaymentType.ledger,
+      destinationLedgerAccountRef: account.ledgerAccountRef,
+    ),
+  );
+}
+
 void _openWalletTopUp(BuildContext context, Wallet wallet) {
  context.read<WalletsController>().selectWallet(wallet);
  context.pushToWalletTopUp();
--- a/frontend/pweb/lib/controllers/dashboard/balance/actions_ui.dart
+++ b/frontend/pweb/lib/controllers/dashboard/balance/actions_ui.dart
@@ -0,0 +1,19 @@
+import 'package:flutter/foundation.dart';
+
+
+class BalanceActionsUiController extends ChangeNotifier {
+  int? _hoveredButtonIndex;
+
+  int? get hoveredButtonIndex => _hoveredButtonIndex;
+
+  bool isExpanded(int index) => _hoveredButtonIndex == index;
+
+  void onHoverChanged(int index, bool hovered) {
+    final next = hovered
+        ? index
+        : (_hoveredButtonIndex == index ? null : _hoveredButtonIndex);
+    if (next == _hoveredButtonIndex) return;
+    _hoveredButtonIndex = next;
+    notifyListeners();
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/controller.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/controller.dart
@@ -1,14 +1,22 @@
-import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';

 import 'package:pshared/controllers/balance_mask/wallets.dart';
 import 'package:pshared/provider/ledger.dart';

-import 'package:pweb/pages/dashboard/buttons/balance/balance_item.dart';
+import 'package:pweb/models/dashboard/balance_item.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/config.dart';
+
+
+class BalanceCarouselController extends ChangeNotifier {
+  BalanceCarouselController()
+    : pageController = PageController(
+        viewportFraction: WalletCardConfig.viewportFraction,
+      );

-class BalanceCarouselController with ChangeNotifier {
  WalletsController? _walletsController;
  List<BalanceItem> _items = const <BalanceItem>[BalanceItem.addAction()];
  int _index = 0;
+  final PageController pageController;

  List<BalanceItem> get items => _items;
  int get index => _index;
@@ -31,6 +39,7 @@ class BalanceCarouselController with ChangeNotifier {

    _items = nextItems;
    _index = nextIndex;
+    _syncPageController();

    if (hasItemsChanged || hasIndexChanged) {
      notifyListeners();
@@ -49,9 +58,24 @@ class BalanceCarouselController with ChangeNotifier {
    notifyListeners();
  }

-  void goBack() => onPageChanged(_index - 1);
+  void goBack() => animateTo(_index - 1);

-  void goForward() => onPageChanged(_index + 1);
+  void goForward() => animateTo(_index + 1);
+
+  void animateTo(int index) {
+    final target = _clampIndex(index, _items.length);
+    if (!pageController.hasClients) {
+      onPageChanged(target);
+      return;
+    }
+    pageController.animateToPage(
+      target,
+      duration: const Duration(milliseconds: 220),
+      curve: Curves.easeOut,
+    );
+  }
+
+  void syncPageController() => _syncPageController();

  int _resolveNextIndex(
    List<BalanceItem> nextItems,
@@ -73,14 +97,19 @@ class BalanceCarouselController with ChangeNotifier {
  String? _currentWalletRef(List<BalanceItem> items, int index) {
    if (items.isEmpty || index < 0 || index >= items.length) return null;
    final current = items[index];
-    if (!current.isWallet) return null;
-    return current.wallet?.id;
+    return switch (current) {
+      WalletBalanceItem(:final wallet) => wallet.id,
+      _ => null,
+    };
  }

  int? _walletIndexByRef(List<BalanceItem> items, String? walletRef) {
    if (walletRef == null || walletRef.isEmpty) return null;
    final idx = items.indexWhere(
-      (item) => item.isWallet && item.wallet?.id == walletRef,
+      (item) => switch (item) {
+        WalletBalanceItem(:final wallet) => wallet.id == walletRef,
+        _ => false,
+      },
    );
    if (idx < 0) return null;
    return idx;
@@ -97,17 +126,17 @@ class BalanceCarouselController with ChangeNotifier {
    for (var i = 0; i < left.length; i++) {
      final a = left[i];
      final b = right[i];
-      if (a.type != b.type) return false;
+      if (a.runtimeType != b.runtimeType) return false;
      if (_itemIdentity(a) != _itemIdentity(b)) return false;
    }

    return true;
  }

-  String _itemIdentity(BalanceItem item) => switch (item.type) {
-    BalanceItemType.wallet => item.wallet?.id ?? '',
-    BalanceItemType.ledger => item.account?.ledgerAccountRef ?? '',
-    BalanceItemType.addAction => 'add',
+  String _itemIdentity(BalanceItem item) => switch (item) {
+    WalletBalanceItem(:final wallet) => wallet.id,
+    LedgerBalanceItem(:final account) => account.ledgerAccountRef,
+    AddBalanceActionItem() => 'add',
  };

  void _syncSelectedWallet() {
@@ -115,10 +144,23 @@ class BalanceCarouselController with ChangeNotifier {
    if (walletsController == null || _items.isEmpty) return;

    final current = _items[_index];
-    if (!current.isWallet || current.wallet == null) return;
-
-    final wallet = current.wallet!;
+    if (current is! WalletBalanceItem) return;
+    final wallet = current.wallet;
    if (walletsController.selectedWallet?.id == wallet.id) return;
    walletsController.selectWallet(wallet);
  }
+
+  void _syncPageController() {
+    if (!pageController.hasClients || _items.isEmpty) return;
+    final current = pageController.page?.round();
+    final target = _clampIndex(_index, _items.length);
+    if (current == target) return;
+    pageController.jumpToPage(target);
+  }
+
+  @override
+  void dispose() {
+    pageController.dispose();
+    super.dispose();
+  }
 }
--- a/frontend/pweb/lib/controllers/dashboard/balance/source_actions.dart
+++ b/frontend/pweb/lib/controllers/dashboard/balance/source_actions.dart
@@ -0,0 +1,117 @@
+import 'package:flutter/material.dart';
+
+import 'package:go_router/go_router.dart';
+
+import 'package:provider/provider.dart';
+
+import 'package:pshared/controllers/payment/source.dart';
+import 'package:pshared/models/payment/type.dart';
+
+import 'package:pweb/app/router/payout_routes.dart';
+
+import 'package:pweb/generated/i18n/app_localizations.dart';
+
+
+class BalanceActionButtonState {
+  final String label;
+  final IconData icon;
+  final VoidCallback onPressed;
+
+  const BalanceActionButtonState({
+    required this.label,
+    required this.icon,
+    required this.onPressed,
+  });
+}
+
+class BalanceActionsState {
+  final BalanceActionButtonState topLeading;
+  final BalanceActionButtonState topTrailing;
+  final BalanceActionButtonState bottom;
+
+  const BalanceActionsState({
+    required this.topLeading,
+    required this.topTrailing,
+    required this.bottom,
+  });
+}
+
+class BalanceSourceActionsController {
+  const BalanceSourceActionsController();
+
+  BalanceActionsState wallet({
+    required BuildContext context,
+    required String walletRef,
+    required VoidCallback onAddFunds,
+  }) {
+    final l10n = AppLocalizations.of(context)!;
+    return BalanceActionsState(
+      topLeading: BalanceActionButtonState(
+        label: l10n.operationfryTitle,
+        icon: Icons.history_rounded,
+        onPressed: () => _openWalletOperationHistory(context, walletRef),
+      ),
+      topTrailing: BalanceActionButtonState(
+        label: l10n.send,
+        icon: Icons.send_rounded,
+        onPressed: () => _sendWalletPayout(context, walletRef),
+      ),
+      bottom: BalanceActionButtonState(
+        label: '${l10n.details} / ${l10n.addFunds}',
+        icon: Icons.account_balance_wallet_rounded,
+        onPressed: onAddFunds,
+      ),
+    );
+  }
+
+  BalanceActionsState ledger({
+    required BuildContext context,
+    required String ledgerAccountRef,
+    required VoidCallback onAddFunds,
+    required VoidCallback onWalletDetails,
+  }) {
+    final l10n = AppLocalizations.of(context)!;
+    return BalanceActionsState(
+      topLeading: BalanceActionButtonState(
+        label: '${l10n.operationfryTitle} / ${l10n.details}',
+        icon: Icons.receipt_long_rounded,
+        onPressed: onWalletDetails,
+      ),
+      topTrailing: BalanceActionButtonState(
+        label: l10n.send,
+        icon: Icons.send_rounded,
+        onPressed: () => _sendLedgerPayout(context, ledgerAccountRef),
+      ),
+      bottom: BalanceActionButtonState(
+        label: l10n.addFunds,
+        icon: Icons.add_card_rounded,
+        onPressed: onAddFunds,
+      ),
+    );
+  }
+
+  void _openWalletOperationHistory(BuildContext context, String walletRef) {
+    context.read<PaymentSourceController>().selectWalletByRef(walletRef);
+    context.pushNamed(PayoutRoutes.editWallet);
+  }
+
+  void _sendWalletPayout(BuildContext context, String walletRef) {
+    context.read<PaymentSourceController>().selectWalletByRef(walletRef);
+    context.pushNamed(
+      PayoutRoutes.payment,
+      queryParameters: PayoutRoutes.buildQueryParameters(
+        paymentType: PaymentType.wallet,
+      ),
+    );
+  }
+
+  void _sendLedgerPayout(BuildContext context, String ledgerAccountRef) {
+    context.read<PaymentSourceController>().selectLedgerByRef(ledgerAccountRef);
+    context.pushNamed(
+      PayoutRoutes.payment,
+      queryParameters: PayoutRoutes.buildQueryParameters(
+        paymentType: PaymentType.ledger,
+      ),
+    );
+  }
+}
--- a/frontend/pweb/lib/controllers/dashboard/balance/source_copy.dart
+++ b/frontend/pweb/lib/controllers/dashboard/balance/source_copy.dart
@@ -0,0 +1,35 @@
+import 'package:flutter/services.dart';
+
+
+class BalanceCopyState {
+  final String label;
+  final String payload;
+
+  const BalanceCopyState({required this.label, required this.payload});
+
+  bool get canCopy => payload.trim().isNotEmpty;
+}
+
+class BalanceSourceCopyController {
+  const BalanceSourceCopyController();
+
+  BalanceCopyState wallet(String? depositAddress) {
+    return BalanceCopyState(
+      label: 'Copy Deposit Address',
+      payload: depositAddress?.trim() ?? '',
+    );
+  }
+
+  BalanceCopyState ledger(String? accountCode) {
+    return BalanceCopyState(
+      label: 'Copy Deposit Address',
+      payload: accountCode?.trim() ?? '',
+    );
+  }
+
+  Future<bool> copy(BalanceCopyState state) async {
+    if (!state.canCopy) return false;
+    await Clipboard.setData(ClipboardData(text: state.payload));
+    return true;
+  }
+}
--- a/frontend/pweb/lib/controllers/operations/report_operations.dart
+++ b/frontend/pweb/lib/controllers/operations/report_operations.dart
@@ -3,18 +3,24 @@ import 'dart:collection';
 import 'package:flutter/material.dart';

 import 'package:pshared/models/payment/operation.dart';
+import 'package:pshared/models/payment/payment.dart';
+import 'package:pshared/models/payment/source_type.dart';
 import 'package:pshared/models/payment/status.dart';
 import 'package:pshared/provider/payment/payments.dart';

 import 'package:pweb/models/state/load_more_state.dart';
 import 'package:pweb/utils/report/operations/operations.dart';
 import 'package:pweb/utils/report/payment_mapper.dart';
+import 'package:pweb/utils/report/source_filter.dart';


 class ReportOperationsController extends ChangeNotifier {
  PaymentsProvider? _payments;
+  PaymentSourceType? _sourceType;
+  Set<String> _sourceRefs = const <String>{};
  DateTimeRange? _selectedRange;
  final Set<OperationStatus> _selectedStatuses = {};
+  List<Payment> _paymentItems = const [];
  List<OperationItem> _operations = const [];
  List<OperationItem> _filtered = const [];

@@ -36,10 +42,20 @@ class ReportOperationsController extends ChangeNotifier {
    return LoadMoreState.hidden;
  }

-  void update(PaymentsProvider provider) {
+  void update(
+    PaymentsProvider provider, {
+    PaymentSourceType? sourceType,
+    String? sourceRef,
+    List<String>? sourceRefs,
+  }) {
    if (!identical(_payments, provider)) {
      _payments = provider;
    }
+    _sourceType = sourceType;
+    final effectiveSourceRefs =
+        sourceRefs ??
+        (sourceRef == null ? const <String>[] : <String>[sourceRef]);
+    _sourceRefs = _normalizeRefs(effectiveSourceRefs);
    _rebuildOperations();
  }

@@ -74,13 +90,16 @@ class ReportOperationsController extends ChangeNotifier {
  }

  void _rebuildOperations() {
-    final items = _payments?.payments ?? const [];
-    _operations = items.map(mapPaymentToOperation).toList();
+    _paymentItems = _payments?.payments ?? const [];
+    _operations = _paymentItems
+        .where(_matchesCurrentSource)
+        .map(mapPaymentToOperation)
+        .toList();
    _rebuildFiltered(notify: true);
  }

  void _rebuildFiltered({bool notify = true}) {
-    _filtered = _applyFilters(_operations);
+    _filtered = _applyFilters(sortOperations(_operations));
    if (notify) {
      notifyListeners();
    }
@@ -88,13 +107,14 @@ class ReportOperationsController extends ChangeNotifier {

  List<OperationItem> _applyFilters(List<OperationItem> operations) {
    if (_selectedRange == null && _selectedStatuses.isEmpty) {
-      return sortOperations(operations);
+      return operations;
    }

    final filtered = operations.where((op) {
      final statusMatch =
          _selectedStatuses.isEmpty || _selectedStatuses.contains(op.status);
-      final dateMatch = _selectedRange == null ||
+      final dateMatch =
+          _selectedRange == null ||
          isUnknownDate(op.date) ||
          (op.date.isAfter(
                _selectedRange!.start.subtract(const Duration(seconds: 1)),
@@ -105,7 +125,30 @@ class ReportOperationsController extends ChangeNotifier {
      return statusMatch && dateMatch;
    }).toList();

-    return sortOperations(filtered);
+    return filtered;
+  }
+
+  bool _matchesCurrentSource(Payment payment) {
+    final sourceType = _sourceType;
+    if (sourceType == null || _sourceRefs.isEmpty) return true;
+    for (final sourceRef in _sourceRefs) {
+      if (paymentMatchesSource(
+        payment,
+        sourceType: sourceType,
+        sourceRef: sourceRef,
+      )) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  Set<String> _normalizeRefs(List<String> refs) {
+    final normalized = refs
+        .map((value) => value.trim())
+        .where((value) => value.isNotEmpty)
+        .toSet();
+    return normalized;
  }

  bool _isSameRange(DateTimeRange? left, DateTimeRange? right) {
--- a/frontend/pweb/lib/controllers/operations/wallet_transactions.dart
+++ b/frontend/pweb/lib/controllers/operations/wallet_transactions.dart
@@ -71,16 +71,24 @@ class WalletTransactionsController extends ChangeNotifier {

  void _rebuildFiltered({bool notify = true}) {
    final source = _provider?.transactions ?? const <WalletTransaction>[];
+    final activeWalletId = _provider?.walletId;
    _filteredTransactions = source.where((tx) {
+      final walletMatch =
+          activeWalletId == null || tx.walletId == activeWalletId;
      final statusMatch =
          _selectedStatuses.isEmpty || _selectedStatuses.contains(tx.status);
      final typeMatch =
          _selectedTypes.isEmpty || _selectedTypes.contains(tx.type);
-      final dateMatch = _dateRange == null ||
-          (tx.date.isAfter(_dateRange!.start.subtract(const Duration(seconds: 1))) &&
-              tx.date.isBefore(_dateRange!.end.add(const Duration(seconds: 1))));
+      final dateMatch =
+          _dateRange == null ||
+          (tx.date.isAfter(
+                _dateRange!.start.subtract(const Duration(seconds: 1)),
+              ) &&
+              tx.date.isBefore(
+                _dateRange!.end.add(const Duration(seconds: 1)),
+              ));

-      return statusMatch && typeMatch && dateMatch;
+      return walletMatch && statusMatch && typeMatch && dateMatch;
    }).toList();

    if (notify) notifyListeners();
--- a/frontend/pweb/lib/controllers/payments/details.dart
+++ b/frontend/pweb/lib/controllers/payments/details.dart
@@ -1,13 +1,12 @@
 import 'package:flutter/foundation.dart';

+import 'package:pshared/models/payment/operation_document.dart';
 import 'package:pshared/models/payment/execution_operation.dart';
 import 'package:pshared/models/payment/payment.dart';
-import 'package:pshared/models/payment/status.dart';
 import 'package:pshared/provider/payment/payments.dart';
-import 'package:pweb/models/documents/operation.dart';

 import 'package:pweb/utils/report/operations/document_rule.dart';
-import 'package:pweb/utils/report/payment_mapper.dart';
+

 class PaymentDetailsController extends ChangeNotifier {
  PaymentDetailsController({required String paymentId})
@@ -22,26 +21,7 @@ class PaymentDetailsController extends ChangeNotifier {
  bool get isLoading => _payments?.isLoading ?? false;
  Exception? get error => _payments?.error;

-  bool get canDownload {
-    final current = _payment;
-    if (current == null) return false;
-    if (statusFromPayment(current) != OperationStatus.success) return false;
-    return primaryOperationDocumentRequest != null;
-  }
-
-  OperationDocumentRequestModel? get primaryOperationDocumentRequest {
-    final current = _payment;
-    if (current == null) return null;
-    for (final operation in current.operations) {
-      final request = operationDocumentRequest(operation);
-      if (request != null) {
-        return request;
-      }
-    }
-    return null;
-  }
-
-  OperationDocumentRequestModel? operationDocumentRequest(
+  OperationDocumentRef? operationDocumentRequest(
    PaymentExecutionOperation operation,
  ) {
    final current = _payment;
@@ -54,7 +34,7 @@ class PaymentDetailsController extends ChangeNotifier {

    if (!isOperationDocumentEligible(operation.code)) return null;

-    return OperationDocumentRequestModel(
+    return OperationDocumentRef(
      gatewayService: gatewayService,
      operationRef: operationRef,
    );
--- a/frontend/pweb/lib/l10n/en.arb
+++ b/frontend/pweb/lib/l10n/en.arb
@@ -638,7 +638,7 @@
      }
    }
  },
-   "noFee": "No fee",
+   "noFee": "None",

  "recipientWillReceive": "Recipient will receive: {amount}",
  "@recipientWillReceive": {
--- a/frontend/pweb/lib/l10n/ru.arb
+++ b/frontend/pweb/lib/l10n/ru.arb
@@ -638,7 +638,7 @@
      }
    }
  },
-  "noFee": "Нет комиссии",
+  "noFee": "Без оплаты",

  "recipientWillReceive": "Получатель получит: {amount}",
  "@recipientWillReceive": {
--- a/frontend/pweb/lib/models/dashboard/balance_item.dart
+++ b/frontend/pweb/lib/models/dashboard/balance_item.dart
@@ -0,0 +1,26 @@
+import 'package:pshared/models/ledger/account.dart';
+import 'package:pshared/models/payment/wallet.dart';
+
+sealed class BalanceItem {
+  const BalanceItem();
+
+  const factory BalanceItem.wallet(Wallet wallet) = WalletBalanceItem;
+  const factory BalanceItem.ledger(LedgerAccount account) = LedgerBalanceItem;
+  const factory BalanceItem.addAction() = AddBalanceActionItem;
+}
+
+final class WalletBalanceItem extends BalanceItem {
+  final Wallet wallet;
+
+  const WalletBalanceItem(this.wallet);
+}
+
+final class LedgerBalanceItem extends BalanceItem {
+  final LedgerAccount account;
+
+  const LedgerBalanceItem(this.account);
+}
+
+final class AddBalanceActionItem extends BalanceItem {
+  const AddBalanceActionItem();
+}
--- a/frontend/pweb/lib/models/documents/operation.dart
+++ b/frontend/pweb/lib/models/documents/operation.dart
@@ -1,9 +0,0 @@
-class OperationDocumentRequestModel {
-  final String gatewayService;
-  final String operationRef;
-
-  const OperationDocumentRequestModel({
-    required this.gatewayService,
-    required this.operationRef,
-  });
-}
--- a/frontend/pweb/lib/models/payment/payment_state.dart
+++ b/frontend/pweb/lib/models/payment/payment_state.dart
@@ -1,27 +0,0 @@
-enum PaymentState {
-  success,
-  failed,
-  cancelled,
-  processing,
-  unknown,
-}
-
-PaymentState paymentStateFromRaw(String? raw) {
-  final trimmed = (raw ?? '').trim().toUpperCase();
-  final normalized = trimmed.startsWith('PAYMENT_STATE_')
-      ? trimmed.substring('PAYMENT_STATE_'.length)
-      : trimmed;
-
-  switch (normalized) {
-    case 'SUCCESS':
-      return PaymentState.success;
-    case 'FAILED':
-      return PaymentState.failed;
-    case 'CANCELLED':
-      return PaymentState.cancelled;
-    case 'PROCESSING':
-      return PaymentState.processing;
-    default:
-      return PaymentState.unknown;
-  }
-}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/actions/bar.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/actions/bar.dart
@@ -0,0 +1,83 @@
+import 'package:flutter/material.dart';
+
+import 'package:pweb/controllers/dashboard/balance/actions_ui.dart';
+import 'package:pweb/controllers/dashboard/balance/source_actions.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/actions/hover_expandable_action_button.dart';
+
+
+class BalanceActionsBar extends StatefulWidget {
+  final BalanceActionsState state;
+
+  const BalanceActionsBar({super.key, required this.state});
+
+  @override
+  State<BalanceActionsBar> createState() => _BalanceActionsBarState();
+}
+
+class _BalanceActionsBarState extends State<BalanceActionsBar> {
+  static const double _buttonHeight = 34.0;
+  static const double _buttonGap = 6.0;
+  static const double _iconSize = 18.0;
+  static const double _textGap = 8.0;
+  static const double _horizontalPadding = 6.0;
+
+  final BalanceActionsUiController _uiController = BalanceActionsUiController();
+
+  @override
+  void dispose() {
+    _uiController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final textStyle = Theme.of(context).textTheme.titleSmall?.copyWith(
+      fontWeight: FontWeight.w400,
+      color: colorScheme.onSecondary,
+      fontSize: 14,
+    );
+    final buttons = <BalanceActionButtonState>[
+      widget.state.topLeading,
+      widget.state.topTrailing,
+      widget.state.bottom,
+    ];
+
+    return ListenableBuilder(
+      listenable: _uiController,
+      builder: (context, _) {
+        return Align(
+          alignment: Alignment.centerRight,
+          child: OverflowBox(
+            alignment: Alignment.centerRight,
+            minWidth: 0,
+            maxWidth: double.infinity,
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.end,
+              children: [
+                for (var i = 0; i < buttons.length; i++) ...[
+                  HoverExpandableActionButton(
+                    height: _buttonHeight,
+                    icon: buttons[i].icon,
+                    label: buttons[i].label,
+                    iconSize: _iconSize,
+                    textStyle: textStyle,
+                    expanded: _uiController.isExpanded(i),
+                    textGap: _textGap,
+                    horizontalPadding: _horizontalPadding,
+                    onHoverChanged: (hovered) =>
+                        _uiController.onHoverChanged(i, hovered),
+                    onPressed: buttons[i].onPressed,
+                  ),
+                  if (i != buttons.length - 1)
+                    const SizedBox(height: _buttonGap),
+                ],
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/actions/hover_expandable_action_button.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/actions/hover_expandable_action_button.dart
@@ -0,0 +1,80 @@
+import 'package:flutter/material.dart';
+
+
+class HoverExpandableActionButton extends StatelessWidget {
+  final double height;
+  final IconData icon;
+  final String label;
+  final double iconSize;
+  final TextStyle? textStyle;
+  final bool expanded;
+  final double textGap;
+  final double horizontalPadding;
+  final ValueChanged<bool> onHoverChanged;
+  final VoidCallback onPressed;
+
+  const HoverExpandableActionButton({
+    super.key,
+    required this.height,
+    required this.icon,
+    required this.label,
+    required this.iconSize,
+    required this.textStyle,
+    required this.expanded,
+    required this.textGap,
+    required this.horizontalPadding,
+    required this.onHoverChanged,
+    required this.onPressed,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return MouseRegion(
+      onEnter: (_) => onHoverChanged(true),
+      onExit: (_) => onHoverChanged(false),
+      child: AnimatedContainer(
+        duration: const Duration(milliseconds: 220),
+        curve: Curves.easeOutCubic,
+        height: height,
+        decoration: BoxDecoration(
+          color: colorScheme.primaryFixed,
+          borderRadius: BorderRadius.circular(999),
+        ),
+        child: Material(
+          type: MaterialType.transparency,
+          child: InkWell(
+            borderRadius: BorderRadius.circular(999),
+            onTap: onPressed,
+            child: Padding(
+              padding: EdgeInsets.symmetric(horizontal: horizontalPadding),
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Icon(icon, size: iconSize, color: colorScheme.onSecondary),
+                  AnimatedSize(
+                    duration: const Duration(milliseconds: 220),
+                    curve: Curves.easeOutCubic,
+                    alignment: Alignment.centerRight,
+                    child: expanded
+                        ? Padding(
+                            padding: EdgeInsets.only(left: textGap),
+                            child: Text(
+                              label,
+                              maxLines: 1,
+                              overflow: TextOverflow.visible,
+                              style: textStyle,
+                            ),
+                          )
+                        : const SizedBox.shrink(),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/amount.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/amount.dart
@@ -29,12 +29,17 @@ class BalanceAmount extends StatelessWidget {
    final isMasked = wallets.isBalanceMasked(wallet.id);

    return Row(
+      mainAxisSize: MainAxisSize.min,
      children: [
        Text(
-          isMasked ? '•••• $currencyBalance' : '${amountToString(wallet.balance)} $currencyBalance',
-          style: textTheme.headlineSmall?.copyWith(
+          isMasked
+              ? '•••• $currencyBalance'
+              : '${amountToString(wallet.balance)} $currencyBalance',
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: textTheme.headlineMedium?.copyWith(
            fontWeight: FontWeight.bold,
-            color: colorScheme.onSurface,
+            color: colorScheme.primary,
          ),
        ),
        const SizedBox(width: _iconSpacing),
@@ -43,7 +48,7 @@ class BalanceAmount extends StatelessWidget {
          child: Icon(
            isMasked ? Icons.visibility_off : Icons.visibility,
            size: _iconSize,
-            color: colorScheme.onSurface,
+            color: colorScheme.primary,
          ),
        ),
      ],
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/balance_item.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/balance_item.dart
@@ -1,21 +0,0 @@
-import 'package:pshared/models/ledger/account.dart';
-import 'package:pshared/models/payment/wallet.dart';
-
-
-enum BalanceItemType { wallet, ledger, addAction }
-
-class BalanceItem {
-  final BalanceItemType type;
-  final Wallet? wallet;
-  final LedgerAccount? account;
-
-  const BalanceItem.wallet(this.wallet) : type = BalanceItemType.wallet, account = null;
-
-  const BalanceItem.ledger(this.account) : type = BalanceItemType.ledger, wallet = null;
-
-  const BalanceItem.addAction() : type = BalanceItemType.addAction, wallet = null, account = null;
-
-  bool get isWallet => type == BalanceItemType.wallet;
-  bool get isLedger => type == BalanceItemType.ledger;
-  bool get isAdd => type == BalanceItemType.addAction;
-}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/card.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/card.dart
@@ -1,83 +0,0 @@
-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/models/payment/chain_network.dart';
-import 'package:pshared/utils/l10n/chain.dart';
-
-import 'package:pweb/pages/dashboard/buttons/balance/add_funds.dart';
-import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
-import 'package:pweb/pages/dashboard/buttons/balance/config.dart';
-import 'package:pweb/pages/dashboard/buttons/balance/header.dart';
-import 'package:pweb/widgets/refresh_balance/wallet.dart';
-
-
-class WalletCard extends StatelessWidget {
-  final Wallet wallet;
-  final VoidCallback onTopUp;
-  final VoidCallback onTap;
-
-  const WalletCard({
-    super.key,
-    required this.wallet,
-    required this.onTopUp,
-    required this.onTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final networkLabel = (wallet.network == null || wallet.network == ChainNetwork.unspecified)
-      ? null
-      : wallet.network!.localizedName(context);
-    final symbol = wallet.tokenSymbol?.trim();
-
-    return Card(
-      color: Theme.of(context).colorScheme.onSecondary,
-      elevation: WalletCardConfig.elevation,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(WalletCardConfig.borderRadius),
-      ),
-      child: InkWell(
-        borderRadius: BorderRadius.circular(WalletCardConfig.borderRadius),
-        onTap: onTap,
-        child: SizedBox.expand(
-          child: Padding(
-            padding: WalletCardConfig.contentPadding,
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                BalanceHeader(
-                  title: wallet.name,
-                  subtitle: networkLabel,
-                  badge: (symbol == null || symbol.isEmpty) ? null : symbol,
-                ),
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    BalanceAmount(
-                      wallet: wallet,
-                      onToggleMask: () {
-                        context.read<WalletsController>().toggleBalanceMask(wallet.id);
-                      },
-                    ),
-                    Column(
-                      children: [
-                        WalletBalanceRefreshButton(
-                          walletRef: wallet.id,
-                        ),
-                        BalanceAddFunds(onTopUp: onTopUp),
-                      ],
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/carousel.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/carousel.dart
@@ -1,146 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/gestures.dart';
-
-import 'package:pshared/models/payment/wallet.dart';
-
-import 'package:pweb/pages/dashboard/buttons/balance/add/card.dart';
-import 'package:pweb/pages/dashboard/buttons/balance/balance_item.dart';
-import 'package:pweb/pages/dashboard/buttons/balance/card.dart';
-import 'package:pweb/pages/dashboard/buttons/balance/config.dart';
-import 'package:pweb/pages/dashboard/buttons/balance/indicator.dart';
-import 'package:pweb/pages/dashboard/buttons/balance/ledger.dart';
-
-
-class BalanceCarousel extends StatefulWidget {
-  final List<BalanceItem> items;
-  final int currentIndex;
-  final ValueChanged<int> onIndexChanged;
-  final ValueChanged<Wallet> onTopUp;
-  final ValueChanged<Wallet> onWalletTap;
-
-  const BalanceCarousel({
-    super.key,
-    required this.items,
-    required this.currentIndex,
-    required this.onIndexChanged,
-    required this.onTopUp,
-    required this.onWalletTap,
-  });
-
-  @override
-  State<BalanceCarousel> createState() => _BalanceCarouselState();
-}
-
-class _BalanceCarouselState extends State<BalanceCarousel> {
-  late final PageController _controller;
-
-  @override
-  void initState() {
-    super.initState();
-    _controller = PageController(
-      initialPage: widget.currentIndex,
-      viewportFraction: WalletCardConfig.viewportFraction,
-    );
-  }
-
-  @override
-  void didUpdateWidget(covariant BalanceCarousel oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (!mounted) return;
-    if (_controller.hasClients) {
-      final currentPage = _controller.page?.round();
-      if (currentPage != widget.currentIndex) {
-        _controller.jumpToPage(widget.currentIndex);
-      }
-    }
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  void _goToPage(int index) {
-    if (!_controller.hasClients) return;
-    _controller.animateToPage(
-      index,
-      duration: const Duration(milliseconds: 220),
-      curve: Curves.easeOut,
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (widget.items.isEmpty) {
-      return const SizedBox.shrink();
-    }
-
-    final safeIndex = widget.currentIndex.clamp(0, widget.items.length - 1);
-    final scrollBehavior = ScrollConfiguration.of(context).copyWith(
-      dragDevices: const {
-        PointerDeviceKind.touch,
-        PointerDeviceKind.mouse,
-        PointerDeviceKind.trackpad,
-      },
-    );
-
-    return Column(
-      children: [
-        SizedBox(
-          height: WalletCardConfig.cardHeight,
-          child: MouseRegion(
-            cursor: SystemMouseCursors.grab,
-            child: ScrollConfiguration(
-              behavior: scrollBehavior,
-              child: PageView.builder(
-                controller: _controller,
-                onPageChanged: widget.onIndexChanged,
-                itemCount: widget.items.length,
-                itemBuilder: (context, index) {
-                  final item = widget.items[index];
-                  final Widget card = switch (item.type) {
-                    BalanceItemType.wallet => WalletCard(
-                      wallet: item.wallet!,
-                      onTopUp: () => widget.onTopUp(item.wallet!),
-                      onTap: () => widget.onWalletTap(item.wallet!),
-                    ),
-                    BalanceItemType.ledger => LedgerAccountCard(account: item.account!),
-                    BalanceItemType.addAction => const AddBalanceCard(),
-                  };
-
-                  return Padding(
-                    padding: WalletCardConfig.cardPadding,
-                    child: card,
-                  );
-                },
-              ),
-            ),
-          ),
-        ),
-        const SizedBox(height: 16),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            IconButton(
-              onPressed: safeIndex > 0
-                  ? () => _goToPage(safeIndex - 1)
-                  : null,
-              icon: const Icon(Icons.arrow_back),
-            ),
-            const SizedBox(width: 16),
-            CarouselIndicator(
-              itemCount: widget.items.length,
-              index: safeIndex,
-            ),
-            const SizedBox(width: 16),
-            IconButton(
-              onPressed: safeIndex < widget.items.length - 1 ? () => _goToPage(safeIndex + 1) : null,
-              icon: const Icon(Icons.arrow_forward),
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/carousel/card_item.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/carousel/card_item.dart
@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+
+import 'package:pshared/models/ledger/account.dart';
+import 'package:pshared/models/payment/wallet.dart';
+
+import 'package:pweb/models/dashboard/balance_item.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/add/card.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/config.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/source/cards/ledger.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/source/cards/wallet.dart';
+
+
+class BalanceCarouselCardItem extends StatelessWidget {
+  final BalanceItem item;
+  final ValueChanged<Wallet> onTopUp;
+  final ValueChanged<LedgerAccount> onLedgerAddFunds;
+  final ValueChanged<Wallet> onWalletTap;
+  final ValueChanged<LedgerAccount> onLedgerTap;
+
+  const BalanceCarouselCardItem({
+    super.key,
+    required this.item,
+    required this.onTopUp,
+    required this.onLedgerAddFunds,
+    required this.onWalletTap,
+    required this.onLedgerTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final card = switch (item) {
+      WalletBalanceItem(:final wallet) => WalletCard(
+        wallet: wallet,
+        onTopUp: () => onTopUp(wallet),
+        onTap: () => onWalletTap(wallet),
+      ),
+      LedgerBalanceItem(:final account) => LedgerAccountCard(
+        account: account,
+        onTap: () => onLedgerTap(account),
+        onAddFunds: () => onLedgerAddFunds(account),
+      ),
+      AddBalanceActionItem() => const AddBalanceCard(),
+    };
+
+    return Padding(padding: WalletCardConfig.cardPadding, child: card);
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/carousel/cards_view.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/carousel/cards_view.dart
@@ -0,0 +1,61 @@
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+
+import 'package:pshared/models/ledger/account.dart';
+import 'package:pshared/models/payment/wallet.dart';
+
+import 'package:pweb/controllers/dashboard/balance/carousel.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/carousel/card_item.dart';
+
+
+class BalanceCarouselCardsView extends StatelessWidget {
+  final BalanceCarouselController controller;
+  final ValueChanged<Wallet> onTopUp;
+  final ValueChanged<LedgerAccount> onLedgerAddFunds;
+  final ValueChanged<Wallet> onWalletTap;
+  final ValueChanged<LedgerAccount> onLedgerTap;
+  final double height;
+
+  const BalanceCarouselCardsView({
+    super.key,
+    required this.controller,
+    required this.onTopUp,
+    required this.onLedgerAddFunds,
+    required this.onWalletTap,
+    required this.onLedgerTap,
+    required this.height,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final scrollBehavior = ScrollConfiguration.of(context).copyWith(
+      dragDevices: const {
+        PointerDeviceKind.touch,
+        PointerDeviceKind.mouse,
+        PointerDeviceKind.trackpad,
+      },
+    );
+
+    return SizedBox(
+      height: height,
+      child: MouseRegion(
+        cursor: SystemMouseCursors.grab,
+        child: ScrollConfiguration(
+          behavior: scrollBehavior,
+          child: PageView.builder(
+            controller: controller.pageController,
+            onPageChanged: controller.onPageChanged,
+            itemCount: controller.items.length,
+            itemBuilder: (context, index) => BalanceCarouselCardItem(
+              item: controller.items[index],
+              onTopUp: onTopUp,
+              onLedgerAddFunds: onLedgerAddFunds,
+              onWalletTap: onWalletTap,
+              onLedgerTap: onLedgerTap,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/carousel/carousel.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/carousel/carousel.dart
@@ -0,0 +1,63 @@
+import 'package:flutter/material.dart';
+
+import 'package:pshared/models/ledger/account.dart';
+import 'package:pshared/models/payment/wallet.dart';
+
+import 'package:pweb/controllers/dashboard/balance/carousel.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/carousel/cards_view.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/carousel/navigation.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/config.dart';
+
+
+class BalanceCarousel extends StatelessWidget {
+  final BalanceCarouselController controller;
+  final ValueChanged<Wallet> onTopUp;
+  final ValueChanged<LedgerAccount> onLedgerAddFunds;
+  final ValueChanged<Wallet> onWalletTap;
+  final ValueChanged<LedgerAccount> onLedgerTap;
+
+  const BalanceCarousel({
+    super.key,
+    required this.controller,
+    required this.onTopUp,
+    required this.onLedgerAddFunds,
+    required this.onWalletTap,
+    required this.onLedgerTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    if (controller.items.isEmpty) {
+      return const SizedBox.shrink();
+    }
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      controller.syncPageController();
+    });
+
+    final safeIndex = controller.index.clamp(0, controller.items.length - 1);
+
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final cardHeight = WalletCardConfig.cardHeightForWidth(
+          constraints.maxWidth,
+        );
+
+        return Column(
+          children: [
+            BalanceCarouselCardsView(
+              controller: controller,
+              onTopUp: onTopUp,
+              onLedgerAddFunds: onLedgerAddFunds,
+              onWalletTap: onWalletTap,
+              onLedgerTap: onLedgerTap,
+              height: cardHeight,
+            ),
+            const SizedBox(height: 16),
+            BalanceCarouselNavigation(controller: controller, index: safeIndex),
+          ],
+        );
+      },
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/carousel/navigation.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/carousel/navigation.dart
@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+
+import 'package:pweb/controllers/dashboard/balance/carousel.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/indicator.dart';
+
+
+class BalanceCarouselNavigation extends StatelessWidget {
+  final BalanceCarouselController controller;
+  final int index;
+
+  const BalanceCarouselNavigation({
+    super.key,
+    required this.controller,
+    required this.index,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        IconButton(
+          onPressed: index > 0 ? controller.goBack : null,
+          icon: const Icon(Icons.arrow_back),
+        ),
+        const SizedBox(width: 16),
+        CarouselIndicator(itemCount: controller.items.length, index: index),
+        const SizedBox(width: 16),
+        IconButton(
+          onPressed: index < controller.items.length - 1
+              ? controller.goForward
+              : null,
+          icon: const Icon(Icons.arrow_forward),
+        ),
+      ],
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/config.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/config.dart
@@ -2,14 +2,21 @@ import 'package:flutter/material.dart';


 abstract class WalletCardConfig {
-  static const double cardHeight = 145.0;
  static const double elevation = 4.0;
  static const double borderRadius = 16.0;
-  static const double viewportFraction = 0.9;
+  static const double viewportFraction = 0.96;

-  static const EdgeInsets cardPadding = EdgeInsets.symmetric(horizontal: 8);
-  static const EdgeInsets contentPadding = EdgeInsets.all(16);
+  static const EdgeInsets cardPadding = EdgeInsets.symmetric(horizontal: 6);
+  static const EdgeInsets contentPadding = EdgeInsets.symmetric(
+    horizontal: 28,
+    vertical: 16,
+  );

  static const double dotSize = 8.0;
  static const EdgeInsets dotMargin = EdgeInsets.symmetric(horizontal: 4);
+
+  static double cardHeightForWidth(double width) {
+    final adaptiveHeight = width * 0.18;
+    return adaptiveHeight.clamp(150.0, 230.0);
+  }
 }
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/header.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/header.dart
@@ -20,47 +20,52 @@ class BalanceHeader extends StatelessWidget {
    final subtitleText = subtitle?.trim();
    final badgeText = badge?.trim();

-    return Row(
-      children: [
-        Expanded(
-          child: Column(
+    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
-              Text(
+        Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Flexible(
+              child: Text(
                title,
-                style: textTheme.titleMedium?.copyWith(
-                  color: colorScheme.onSurface,
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
+                style: textTheme.titleLarge?.copyWith(
+                  color: colorScheme.primary,
+                  fontWeight: FontWeight.w700,
                ),
              ),
-              if (subtitleText != null && subtitleText.isNotEmpty)
-                Text(
-                  subtitleText,
-                  style: textTheme.bodySmall?.copyWith(
-                    color: colorScheme.onSurfaceVariant,
-                    fontWeight: FontWeight.w500,
-                  ),
-                ),
-            ],
-          ),
            ),
            if (badgeText != null && badgeText.isNotEmpty) ...[
              const SizedBox(width: 8),
              Container(
-            padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+                padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
                decoration: BoxDecoration(
-              color: colorScheme.primaryContainer,
+                  color: colorScheme.primaryFixed,
                  borderRadius: BorderRadius.circular(999),
                ),
                child: Text(
                  badgeText,
-              style: textTheme.bodyMedium?.copyWith(
-                color: colorScheme.onPrimaryContainer,
-                fontWeight: FontWeight.w600,
+                  style: textTheme.labelSmall?.copyWith(
+                    color: colorScheme.onSecondary,
+                    fontWeight: FontWeight.w700,
                  ),
                ),
              ),
            ],
          ],
+        ),
+        if (subtitleText != null && subtitleText.isNotEmpty)
+          Text(
+            subtitleText,
+            style: textTheme.titleSmall?.copyWith(
+              color: colorScheme.primaryFixed,
+              fontWeight: FontWeight.w500,
+            ),
+            maxLines: 1,
+          ),
+      ],
    );
  }
 }
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/ledger.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/ledger.dart
@@ -1,124 +0,0 @@
-import 'package:flutter/material.dart';
-
-import 'package:provider/provider.dart';
-
-import 'package:pshared/controllers/balance_mask/ledger_accounts.dart';
-import 'package:pshared/models/ledger/account.dart';
-import 'package:pshared/utils/currency.dart';
-import 'package:pshared/utils/money.dart';
-
-import 'package:pweb/pages/dashboard/buttons/balance/config.dart';
-import 'package:pweb/pages/dashboard/buttons/balance/header.dart';
-import 'package:pweb/widgets/refresh_balance/ledger.dart';
-
-import 'package:pweb/generated/i18n/app_localizations.dart';
-
-
-class LedgerAccountCard extends StatelessWidget {
-  final LedgerAccount account;
-
-  const LedgerAccountCard({super.key, required this.account});
-
-  String _formatBalance() {
-    final money = account.balance?.balance;
-    if (money == null) return '--';
-
-    final amount = parseMoneyAmount(money.amount, fallback: double.nan);
-    if (amount.isNaN) {
-      return '${money.amount} ${money.currency}';
-    }
-
-    try {
-      final currency = currencyStringToCode(money.currency);
-      final symbol = currencyCodeToSymbol(currency);
-      if (symbol.trim().isEmpty) {
-        return '${amountToString(amount)} ${money.currency}';
-      }
-      return '${amountToString(amount)} $symbol';
-    } catch (_) {
-      return '${amountToString(amount)} ${money.currency}';
-    }
-  }
-
-  String _formatMaskedBalance() {
-    final currency = account.currency.trim();
-    if (currency.isEmpty) return '••••';
-    try {
-      final symbol = currencyCodeToSymbol(currencyStringToCode(currency));
-      if (symbol.trim().isEmpty) {
-        return '•••• $currency';
-      }
-      return '•••• $symbol';
-    } catch (_) {
-      return '•••• $currency';
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final textTheme = Theme.of(context).textTheme;
-    final colorScheme = Theme.of(context).colorScheme;
-    final loc = AppLocalizations.of(context)!;
-    final accountName = account.name.trim();
-    final accountCode = account.accountCode.trim();
-    final title = accountName.isNotEmpty ? accountName : loc.paymentTypeLedger;
-    final subtitle = accountCode.isNotEmpty ? accountCode : null;
-    final badge = account.currency.trim().isEmpty
-        ? null
-        : account.currency.toUpperCase();
-
-    return Card(
-      color: colorScheme.onSecondary,
-      elevation: WalletCardConfig.elevation,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(WalletCardConfig.borderRadius),
-      ),
-      child: Padding(
-        padding: WalletCardConfig.contentPadding,
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            BalanceHeader(title: title, subtitle: subtitle, badge: badge),
-            Row(
-              children: [
-                Consumer<LedgerBalanceMaskController>(
-                  builder: (context, controller, _) {
-                    final isMasked = controller.isBalanceMasked(
-                      account.ledgerAccountRef,
-                    );
-                    return Row(
-                      children: [
-                        Text(
-                          isMasked ? _formatMaskedBalance() : _formatBalance(),
-                          style: textTheme.headlineSmall?.copyWith(
-                            fontWeight: FontWeight.bold,
-                            color: colorScheme.onSurface,
-                          ),
-                        ),
-                        const SizedBox(width: 12),
-                        GestureDetector(
-                          onTap: () => controller.toggleBalanceMask(
-                            account.ledgerAccountRef,
-                          ),
-                          child: Icon(
-                            isMasked ? Icons.visibility_off : Icons.visibility,
-                            size: 24,
-                            color: colorScheme.onSurface,
-                          ),
-                        ),
-                      ],
-                    );
-                  },
-                ),
-                const SizedBox(width: 12),
-                LedgerBalanceRefreshButton(
-                  ledgerAccountRef: account.ledgerAccountRef,
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/ledger_amount.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/ledger_amount.dart
@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+
+import 'package:provider/provider.dart';
+
+import 'package:pshared/controllers/balance_mask/ledger_accounts.dart';
+import 'package:pshared/models/ledger/account.dart';
+
+import 'package:pweb/pages/payout_page/wallet/edit/fields/ledger/balance_formatter.dart';
+
+
+class LedgerBalanceAmount extends StatelessWidget {
+  final LedgerAccount account;
+
+  const LedgerBalanceAmount({super.key, required this.account});
+
+  @override
+  Widget build(BuildContext context) {
+    final textTheme = Theme.of(context).textTheme;
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Consumer<LedgerBalanceMaskController>(
+      builder: (context, controller, _) {
+        final isMasked = controller.isBalanceMasked(account.ledgerAccountRef);
+        final balance = isMasked
+            ? LedgerBalanceFormatter.formatMasked(account)
+            : LedgerBalanceFormatter.format(account);
+
+        return Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Text(
+              balance,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+              style: textTheme.headlineSmall?.copyWith(
+                fontWeight: FontWeight.bold,
+                color: colorScheme.primary,
+              ),
+            ),
+            const SizedBox(width: 12),
+            GestureDetector(
+              onTap: () {
+                controller.toggleBalanceMask(account.ledgerAccountRef);
+              },
+              child: Icon(
+                isMasked ? Icons.visibility_off : Icons.visibility,
+                size: 24,
+                color: colorScheme.primary,
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/providers.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/providers.dart
@@ -5,7 +5,8 @@ import 'package:provider/provider.dart';
 import 'package:pshared/controllers/balance_mask/wallets.dart';
 import 'package:pshared/provider/ledger.dart';

-import 'package:pweb/pages/dashboard/buttons/balance/controller.dart';
+import 'package:pweb/controllers/dashboard/balance/carousel.dart';
+

 class BalanceWidgetProviders extends StatelessWidget {
  final Widget child;
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/source/actions/ledger.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/source/actions/ledger.dart
@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+
+import 'package:pweb/controllers/dashboard/balance/source_actions.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/actions/bar.dart';
+
+
+class LedgerSourceActions extends StatelessWidget {
+  final String ledgerAccountRef;
+  final VoidCallback onAddFunds;
+  final VoidCallback onWalletDetails;
+
+  const LedgerSourceActions({
+    super.key,
+    required this.ledgerAccountRef,
+    required this.onAddFunds,
+    required this.onWalletDetails,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    const controller = BalanceSourceActionsController();
+    final state = controller.ledger(
+      context: context,
+      ledgerAccountRef: ledgerAccountRef,
+      onAddFunds: onAddFunds,
+      onWalletDetails: onWalletDetails,
+    );
+
+    return BalanceActionsBar(state: state);
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/source/actions/wallet.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/source/actions/wallet.dart
@@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+
+import 'package:pweb/controllers/dashboard/balance/source_actions.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/actions/bar.dart';
+
+
+class WalletSourceActions extends StatelessWidget {
+  final String walletRef;
+  final VoidCallback onAddFunds;
+
+  const WalletSourceActions({
+    super.key,
+    required this.walletRef,
+    required this.onAddFunds,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    const controller = BalanceSourceActionsController();
+    final state = controller.wallet(
+      context: context,
+      walletRef: walletRef,
+      onAddFunds: onAddFunds,
+    );
+
+    return BalanceActionsBar(state: state);
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/source/card.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/source/card.dart
@@ -0,0 +1,138 @@
+import 'package:flutter/material.dart';
+
+import 'package:provider/provider.dart';
+
+import 'package:pshared/controllers/balance_mask/wallets.dart';
+import 'package:pshared/models/ledger/account.dart';
+import 'package:pshared/models/payment/chain_network.dart';
+import 'package:pshared/models/payment/source_type.dart';
+import 'package:pshared/models/payment/wallet.dart';
+import 'package:pshared/utils/l10n/chain.dart';
+
+import 'package:pweb/controllers/dashboard/balance/source_copy.dart';
+import 'package:pweb/models/state/visibility.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/ledger_amount.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/source/actions/ledger.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/source/actions/wallet.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/source/card_layout.dart';
+import 'package:pweb/widgets/refresh_balance/ledger.dart';
+import 'package:pweb/widgets/refresh_balance/wallet.dart';
+
+import 'package:pweb/generated/i18n/app_localizations.dart';
+
+
+class BalanceSourceCard extends StatelessWidget {
+  final PaymentSourceType _type;
+  final Wallet? _wallet;
+  final LedgerAccount? _ledgerAccount;
+  final VoidCallback onTap;
+  final VoidCallback onAddFunds;
+  static const BalanceSourceCopyController _copyController =
+      BalanceSourceCopyController();
+
+  const BalanceSourceCard.wallet({
+    super.key,
+    required Wallet wallet,
+    required this.onTap,
+    required this.onAddFunds,
+  }) : _type = PaymentSourceType.wallet,
+       _wallet = wallet,
+       _ledgerAccount = null;
+
+  const BalanceSourceCard.ledger({
+    super.key,
+    required LedgerAccount account,
+    required this.onTap,
+    required this.onAddFunds,
+  }) : _type = PaymentSourceType.ledger,
+       _wallet = null,
+       _ledgerAccount = account;
+
+  @override
+  Widget build(BuildContext context) => switch (_type) {
+    PaymentSourceType.wallet => _buildWalletCard(context, _wallet!),
+    PaymentSourceType.ledger => _buildLedgerCard(context, _ledgerAccount!),
+  };
+
+  Widget _buildWalletCard(BuildContext context, Wallet wallet) {
+    final networkLabel =
+        (wallet.network == null || wallet.network == ChainNetwork.unspecified)
+        ? null
+        : wallet.network!.localizedName(context);
+    final symbol = wallet.tokenSymbol?.trim();
+    final copyState = _copyController.wallet(wallet.depositAddress);
+
+    return BalanceSourceCardLayout(
+      title: wallet.name,
+      subtitle: networkLabel,
+      badge: (symbol == null || symbol.isEmpty) ? null : symbol,
+      onTap: null,
+      copyLabel: copyState.label,
+      canCopy: copyState.canCopy,
+      onCopy: copyState.canCopy
+          ? () async {
+              final copied = await _copyController.copy(copyState);
+              if (!copied || !context.mounted) return;
+              final loc = AppLocalizations.of(context)!;
+              ScaffoldMessenger.of(
+                context,
+              ).showSnackBar(SnackBar(content: Text(loc.addressCopied)));
+            }
+          : null,
+      refreshButton: WalletBalanceRefreshButton(
+        walletRef: wallet.id,
+        iconOnly: VisibilityState.hidden,
+      ),
+      actions: WalletSourceActions(
+        walletRef: wallet.id,
+        onAddFunds: onAddFunds,
+      ),
+      amount: BalanceAmount(
+        wallet: wallet,
+        onToggleMask: () {
+          context.read<WalletsController>().toggleBalanceMask(wallet.id);
+        },
+      ),
+    );
+  }
+
+  Widget _buildLedgerCard(BuildContext context, LedgerAccount account) {
+    final loc = AppLocalizations.of(context)!;
+    final accountName = account.name.trim();
+    final accountCode = account.accountCode.trim();
+    final title = accountName.isNotEmpty ? accountName : loc.paymentTypeLedger;
+    final badge = account.currency.trim().isEmpty
+        ? null
+        : account.currency.toUpperCase();
+    final copyState = _copyController.ledger(accountCode);
+
+    return BalanceSourceCardLayout(
+      title: title,
+      subtitle: null,
+      badge: badge,
+      onTap: onTap,
+      copyLabel: copyState.label,
+      canCopy: copyState.canCopy,
+      onCopy: copyState.canCopy
+          ? () async {
+              final copied = await _copyController.copy(copyState);
+              if (!copied || !context.mounted) return;
+              ScaffoldMessenger.of(
+                context,
+              ).showSnackBar(SnackBar(content: Text(loc.addressCopied)));
+            }
+          : null,
+      refreshButton: LedgerBalanceRefreshButton(
+        ledgerAccountRef: account.ledgerAccountRef,
+        iconOnly: VisibilityState.hidden,
+      ),
+      actions: LedgerSourceActions(
+        ledgerAccountRef: account.ledgerAccountRef,
+        onAddFunds: onAddFunds,
+        onWalletDetails: onTap,
+      ),
+      amount: LedgerBalanceAmount(account: account),
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/source/card_layout.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/source/card_layout.dart
@@ -0,0 +1,64 @@
+import 'package:flutter/material.dart';
+
+import 'package:pweb/pages/dashboard/buttons/balance/config.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/source/layout/wide_body.dart';
+
+
+class BalanceSourceCardLayout extends StatelessWidget {
+  final String title;
+  final String? subtitle;
+  final String? badge;
+  final Widget amount;
+  final Widget refreshButton;
+  final Widget actions;
+  final VoidCallback? onTap;
+  final String copyLabel;
+  final bool canCopy;
+  final VoidCallback? onCopy;
+
+  const BalanceSourceCardLayout({
+    super.key,
+    required this.title,
+    required this.subtitle,
+    required this.badge,
+    required this.amount,
+    required this.refreshButton,
+    required this.actions,
+    required this.onTap,
+    required this.copyLabel,
+    required this.canCopy,
+    required this.onCopy,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final borderRadius = BorderRadius.circular(WalletCardConfig.borderRadius);
+
+    return Card(
+      color: colorScheme.onSecondary,
+      elevation: WalletCardConfig.elevation,
+      shape: RoundedRectangleBorder(borderRadius: borderRadius),
+      child: InkWell(
+        borderRadius: borderRadius,
+        onTap: onTap,
+        child: SizedBox.expand(
+          child: Padding(
+            padding: WalletCardConfig.contentPadding,
+            child: BalanceSourceBody(
+              title: title,
+              subtitle: subtitle,
+              badge: badge,
+              amount: amount,
+              refreshButton: refreshButton,
+              actions: actions,
+              copyLabel: copyLabel,
+              canCopy: canCopy,
+              onCopy: onCopy,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/source/cards/ledger.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/source/cards/ledger.dart
@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+
+import 'package:pshared/models/ledger/account.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/source/card.dart';
+
+
+class LedgerAccountCard extends StatelessWidget {
+  final LedgerAccount account;
+  final VoidCallback onAddFunds;
+  final VoidCallback? onTap;
+
+  const LedgerAccountCard({
+    super.key,
+    required this.account,
+    required this.onAddFunds,
+    this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return BalanceSourceCard.ledger(
+      account: account,
+      onTap: onTap ?? () {},
+      onAddFunds: onAddFunds,
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/source/cards/wallet.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/source/cards/wallet.dart
@@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+
+import 'package:pshared/models/payment/wallet.dart';
+
+import 'package:pweb/pages/dashboard/buttons/balance/source/card.dart';
+
+
+class WalletCard extends StatelessWidget {
+  final Wallet wallet;
+  final VoidCallback onTopUp;
+  final VoidCallback onTap;
+
+  const WalletCard({
+    super.key,
+    required this.wallet,
+    required this.onTopUp,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return BalanceSourceCard.wallet(
+      wallet: wallet,
+      onTap: onTap,
+      onAddFunds: onTopUp,
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/source/layout/amount_with_refresh.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/source/layout/amount_with_refresh.dart
@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+
+
+class BalanceAmountWithRefresh extends StatelessWidget {
+  final Widget amount;
+  final Widget refreshButton;
+
+  const BalanceAmountWithRefresh({
+    super.key,
+    required this.amount,
+    required this.refreshButton,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        IconButtonTheme(
+          data: IconButtonThemeData(
+            style: IconButton.styleFrom(
+              minimumSize: const Size(30, 30),
+              maximumSize: const Size(40, 40),
+              padding: EdgeInsets.zero,
+              foregroundColor: colorScheme.primary,
+              tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+            ),
+          ),
+          child: refreshButton,
+        ),
+        const SizedBox(width: 8),
+        amount,
+      ],
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/source/layout/copyable_field.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/source/layout/copyable_field.dart
@@ -0,0 +1,62 @@
+import 'package:flutter/material.dart';
+
+
+class BalanceCopyableField extends StatelessWidget {
+  final String label;
+  final bool canCopy;
+  final VoidCallback? onCopy;
+
+  const BalanceCopyableField({
+    super.key,
+    required this.label,
+    required this.canCopy,
+    required this.onCopy,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+
+    return Container(
+      decoration: BoxDecoration(
+        color: colorScheme.onSecondary,
+        borderRadius: BorderRadius.circular(12),
+        border: Border.all(color: colorScheme.primaryFixed, width: 0.6),
+      ),
+      child: InkWell(
+        onTap: canCopy ? onCopy : null,
+        borderRadius: BorderRadius.circular(12),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Icon(
+                Icons.copy_rounded,
+                size: 16,
+                color: canCopy
+                    ? colorScheme.primaryFixed
+                    : colorScheme.primary.withValues(alpha: 0.35),
+              ),
+              const SizedBox(width: 6),
+              Flexible(
+                child: Text(
+                  label,
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: theme.textTheme.labelMedium?.copyWith(
+                    color: canCopy
+                        ? colorScheme.primaryFixed
+                        : colorScheme.primary.withValues(alpha: 0.45),
+                    fontWeight: FontWeight.normal,
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/source/layout/wide_body.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/source/layout/wide_body.dart
@@ -0,0 +1,89 @@
+import 'package:flutter/material.dart';
+
+import 'package:pweb/pages/dashboard/buttons/balance/header.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/source/layout/amount_with_refresh.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/source/layout/copyable_field.dart';
+
+
+class BalanceSourceBody extends StatelessWidget {
+  final String title;
+  final String? subtitle;
+  final String? badge;
+  final Widget amount;
+  final Widget refreshButton;
+  final Widget actions;
+  final String copyLabel;
+  final bool canCopy;
+  final VoidCallback? onCopy;
+
+  const BalanceSourceBody({
+    super.key,
+    required this.title,
+    required this.subtitle,
+    required this.badge,
+    required this.amount,
+    required this.refreshButton,
+    required this.actions,
+    required this.copyLabel,
+    required this.canCopy,
+    required this.onCopy,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final sideMaxWidth = constraints.maxWidth * 0.30;
+
+        return Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            Flexible(
+              fit: FlexFit.loose,
+              child: ConstrainedBox(
+                constraints: BoxConstraints(maxWidth: sideMaxWidth),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    BalanceHeader(
+                      title: title,
+                      subtitle: subtitle,
+                      badge: badge,
+                    ),
+                    SizedBox(height: constraints.maxHeight * 0.06),
+                    BalanceCopyableField(
+                      label: copyLabel,
+                      canCopy: canCopy,
+                      onCopy: onCopy,
+                    ),
+                  ],
+                ),
+              ),
+            ),
+            Expanded(
+              child: Align(
+                alignment: Alignment.center,
+                child: FittedBox(
+                  fit: BoxFit.scaleDown,
+                  child: BalanceAmountWithRefresh(
+                    amount: amount,
+                    refreshButton: refreshButton,
+                  ),
+                ),
+              ),
+            ),
+            Flexible(
+              fit: FlexFit.loose,
+              child: ConstrainedBox(
+                constraints: BoxConstraints(maxWidth: sideMaxWidth),
+                child: SizedBox(height: constraints.maxHeight, child: actions),
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/widget.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/widget.dart
@@ -3,22 +3,28 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

 import 'package:pshared/controllers/balance_mask/wallets.dart';
+import 'package:pshared/models/ledger/account.dart';
 import 'package:pshared/provider/ledger.dart';
 import 'package:pshared/models/payment/wallet.dart';

-import 'package:pweb/pages/dashboard/buttons/balance/carousel.dart';
-import 'package:pweb/pages/dashboard/buttons/balance/controller.dart';
+import 'package:pweb/pages/dashboard/buttons/balance/carousel/carousel.dart';
+import 'package:pweb/controllers/dashboard/balance/carousel.dart';

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

+
 class BalanceWidget extends StatelessWidget {
  final ValueChanged<Wallet> onTopUp;
+  final ValueChanged<LedgerAccount> onLedgerAddFunds;
  final ValueChanged<Wallet> onWalletTap;
+  final ValueChanged<LedgerAccount> onLedgerTap;

  const BalanceWidget({
    super.key,
    required this.onTopUp,
+    required this.onLedgerAddFunds,
    required this.onWalletTap,
+    required this.onLedgerTap,
  });

  @override
@@ -41,11 +47,11 @@ class BalanceWidget extends StatelessWidget {
    }

    final carouselWidget = BalanceCarousel(
-      items: carousel.items,
-      currentIndex: carousel.index,
-      onIndexChanged: carousel.onPageChanged,
+      controller: carousel,
      onTopUp: onTopUp,
+      onLedgerAddFunds: onLedgerAddFunds,
      onWalletTap: onWalletTap,
+      onLedgerTap: onLedgerTap,
    );

    if (wallets.isEmpty && accounts.isEmpty) {
--- a/frontend/pweb/lib/pages/dashboard/dashboard.dart
+++ b/frontend/pweb/lib/pages/dashboard/dashboard.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';

+import 'package:pshared/models/ledger/account.dart';
 import 'package:pshared/models/payment/type.dart';
 import 'package:pshared/models/recipient/recipient.dart';
 import 'package:pshared/models/payment/wallet.dart';
@@ -15,6 +16,7 @@ import 'package:pweb/pages/loader.dart';

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

+
 class AppSpacing {
  static const double small = 10;
  static const double medium = 16;
@@ -25,14 +27,18 @@ class DashboardPage extends StatefulWidget {
  final ValueChanged<Recipient> onRecipientSelected;
  final void Function(PaymentType type) onGoToPaymentWithoutRecipient;
  final ValueChanged<Wallet> onTopUp;
+  final ValueChanged<LedgerAccount> onLedgerAddFunds;
  final ValueChanged<Wallet> onWalletTap;
+  final ValueChanged<LedgerAccount> onLedgerTap;

  const DashboardPage({
    super.key,
    required this.onRecipientSelected,
    required this.onGoToPaymentWithoutRecipient,
    required this.onTopUp,
+    required this.onLedgerAddFunds,
    required this.onWalletTap,
+    required this.onLedgerTap,
  });

  @override
@@ -86,7 +92,9 @@ class _DashboardPageState extends State<DashboardPage> {
              BalanceWidgetProviders(
                child: BalanceWidget(
                  onTopUp: widget.onTopUp,
+                  onLedgerAddFunds: widget.onLedgerAddFunds,
                  onWalletTap: widget.onWalletTap,
+                  onLedgerTap: widget.onLedgerTap,
                ),
              ),
              const SizedBox(height: AppSpacing.small),
--- a/frontend/pweb/lib/pages/dashboard/payouts/amount/field.dart
+++ b/frontend/pweb/lib/pages/dashboard/payouts/amount/field.dart
@@ -5,11 +5,11 @@ import 'package:provider/provider.dart';
 import 'package:pshared/utils/currency.dart';

 import 'package:pweb/controllers/payments/amount_field.dart';
-import 'package:pweb/models/payment/amount/mode.dart';
 import 'package:pweb/pages/dashboard/payouts/amount/mode/selector.dart';

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

+
 class PaymentAmountField extends StatelessWidget {
  const PaymentAmountField();

@@ -37,10 +37,6 @@ class PaymentAmountField extends StatelessWidget {
            labelText: loc.amount,
            border: const OutlineInputBorder(),
            prefixText: symbol == null ? null : '$symbol\u00A0',
-            helperText: switch (ui.mode) {
-              PaymentAmountMode.debit => loc.debitAmountLabel,
-              PaymentAmountMode.settlement => loc.expectedSettlementAmountLabel,
-            },
          ),
          onChanged: ui.handleChanged,
        ),
--- a/frontend/pweb/lib/pages/dashboard/payouts/amount/widget.dart
+++ b/frontend/pweb/lib/pages/dashboard/payouts/amount/widget.dart
@@ -6,7 +6,8 @@ import 'package:pshared/controllers/payment/source.dart';
 import 'package:pshared/provider/payment/amount.dart';

 import 'package:pweb/controllers/payments/amount_field.dart';
-import 'package:pweb/pages/dashboard/payouts/amount/feild.dart';
+import 'package:pweb/pages/dashboard/payouts/amount/field.dart';
+

 class PaymentAmountWidget extends StatelessWidget {
  const PaymentAmountWidget({super.key});
--- a/frontend/pweb/lib/pages/dashboard/payouts/form.dart
+++ b/frontend/pweb/lib/pages/dashboard/payouts/form.dart
@@ -102,7 +102,7 @@ class PaymentFormWidget extends StatelessWidget {
          children: [
            detailsHeader,
            Row(
-              crossAxisAlignment: CrossAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.end,
              children: [
                Expanded(
                  flex: 3,
@@ -114,7 +114,7 @@ class PaymentFormWidget extends StatelessWidget {
            ),
            const SizedBox(height: _smallSpacing),
            Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.center,
              children: [
                Expanded(
                  flex: 3,
--- a/frontend/pweb/lib/pages/dashboard/payouts/multiple/actions.dart
+++ b/frontend/pweb/lib/pages/dashboard/payouts/multiple/actions.dart
@@ -6,7 +6,7 @@ import 'package:pshared/provider/payment/multiple/quotation.dart';

 import 'package:pweb/controllers/payouts/multiple_payouts.dart';
 import 'package:pweb/controllers/payouts/payout_verification.dart';
-import 'package:pweb/utils/payment/payout_verification_flow.dart';
+import 'package:pweb/utils/payment/verification_flow.dart';
 import 'package:pweb/widgets/dialogs/payment_status_dialog.dart';


--- a/frontend/pweb/lib/pages/dashboard/payouts/quote_status/widgets/card.dart
+++ b/frontend/pweb/lib/pages/dashboard/payouts/quote_status/widgets/card.dart
@@ -26,15 +26,18 @@ class QuoteStatusCard extends StatelessWidget {
  });

  static const double _cardRadius = 12;
-  static const double _cardSpacing = 12;
+  static const double _cardSpacing = 8;
  static const double _iconSize = 18;

  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);
+    final loc = AppLocalizations.of(context)!;
    final foregroundColor = _resolveForegroundColor(theme, statusType);
    final elementColor = _resolveElementColor(theme, statusType);
-    final statusStyle = theme.textTheme.bodyMedium?.copyWith(color: elementColor);
+    final statusStyle = theme.textTheme.bodyMedium?.copyWith(
+      color: elementColor,
+    );
    final helperStyle = theme.textTheme.bodySmall?.copyWith(
      color: foregroundColor.withValues(alpha: 0.8),
    );
@@ -44,12 +47,10 @@ class QuoteStatusCard extends StatelessWidget {
      decoration: BoxDecoration(
        color: _resolveCardColor(theme, statusType),
        borderRadius: BorderRadius.circular(_cardRadius),
-        border: Border.all(
-          color: elementColor.withValues(alpha: 0.5),
-        ),
+        border: Border.all(color: elementColor.withValues(alpha: 0.5)),
      ),
      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.center,
        children: [
          Padding(
            padding: const EdgeInsets.only(top: 2),
@@ -59,7 +60,9 @@ class QuoteStatusCard extends StatelessWidget {
                    height: _iconSize,
                    child: CircularProgressIndicator(
                      strokeWidth: 2,
-                      valueColor: AlwaysStoppedAnimation<Color>(foregroundColor),
+                      valueColor: AlwaysStoppedAnimation<Color>(
+                        foregroundColor,
+                      ),
                    ),
                  )
                : Icon(
@@ -81,20 +84,16 @@ class QuoteStatusCard extends StatelessWidget {
              ],
            ),
          ),
-          if (canRefresh)
-            Padding(
-              padding: const EdgeInsets.only(left: _cardSpacing),
-              child: showPrimaryRefresh
-                  ? ElevatedButton(
-                      onPressed: canRefresh ? onRefresh : null,
-                      child: Text(AppLocalizations.of(context)!.quoteRefresh),
-                    )
-                  : TextButton(
-                      onPressed: canRefresh ? onRefresh : null,
-                      child: Text(AppLocalizations.of(context)!.quoteRefresh),
-                    ),
+          if (canRefresh) ...[
+            const SizedBox(width: _cardSpacing),
+            IconButton(
+              onPressed: onRefresh,
+              tooltip: loc.quoteRefresh,
+              icon: const Icon(Icons.refresh),
+              color: showPrimaryRefresh ? foregroundColor : elementColor,
            ),
          ],
+        ],
      ),
    );
  }
--- a/frontend/pweb/lib/pages/dashboard/payouts/single/address_book/avatar.dart
+++ b/frontend/pweb/lib/pages/dashboard/payouts/single/address_book/avatar.dart
@@ -23,7 +23,7 @@ class RecipientAvatar extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    final textColor = Theme.of(context).colorScheme.onPrimary;
+    final textColor = Theme.of(context).colorScheme.onSecondary;

    return Column(
      mainAxisAlignment: MainAxisAlignment.center,
@@ -31,7 +31,7 @@ class RecipientAvatar extends StatelessWidget {
        CircleAvatar(
          radius: avatarRadius,
          backgroundImage: avatarUrl != null ? NetworkImage(avatarUrl!) : null,
-          backgroundColor: Theme.of(context).colorScheme.primary,
+          backgroundColor: Theme.of(context).colorScheme.primaryFixed,
          child: avatarUrl == null
              ? Text(
                  getInitials(name),
--- a/frontend/pweb/lib/pages/dashboard/payouts/single/address_book/short_list.dart
+++ b/frontend/pweb/lib/pages/dashboard/payouts/single/address_book/short_list.dart
@@ -7,34 +7,32 @@ import 'package:pweb/pages/dashboard/payouts/single/address_book/avatar.dart';
 class ShortListAddressBookPayout extends StatelessWidget {
  final List<Recipient> recipients;
  final ValueChanged<Recipient> onSelected;
-  final Widget? trailing;
+  final Widget? leading;

  const ShortListAddressBookPayout({
    super.key,
    required this.recipients,
    required this.onSelected,
-    this.trailing,
+    this.leading,
  });

  static const double _avatarRadius = 20;
  static const double _avatarSize = 80;
-  static const EdgeInsets _padding = EdgeInsets.symmetric(horizontal: 10, vertical: 8);
+  static const EdgeInsets _padding = EdgeInsets.symmetric(
+    horizontal: 10,
+    vertical: 8,
+  );
  static const TextStyle _nameStyle = TextStyle(fontSize: 12);

  @override
  Widget build(BuildContext context) {
-    final trailingWidget = trailing;
-
-    return SingleChildScrollView(
-      scrollDirection: Axis.horizontal,
-      child: Row(
-        children: 
-        recipients.map((recipient) {
+    final leadingWidget = leading;
+    final recipientItems = recipients.map((recipient) {
      return Padding(
        padding: _padding,
        child: InkWell(
          borderRadius: BorderRadius.circular(5),
-              hoverColor: Theme.of(context).colorScheme.primaryContainer,
+          hoverColor: Theme.of(context).colorScheme.onTertiary,
          onTap: () => onSelected(recipient),
          child: SizedBox(
            height: _avatarSize,
@@ -49,12 +47,16 @@ class ShortListAddressBookPayout extends StatelessWidget {
          ),
        ),
      );
-        }).toList()
-          ..addAll(
-            trailingWidget == null
-                ? const []
-                : [Padding(padding: _padding, child: trailingWidget)],
-          ),
+    });
+
+    return SingleChildScrollView(
+      scrollDirection: Axis.horizontal,
+      child: Row(
+        children: [
+          if (leadingWidget != null)
+            Padding(padding: _padding, child: leadingWidget),
+          ...recipientItems,
+        ],
      ),
    );
  }
--- a/frontend/pweb/lib/pages/dashboard/payouts/single/address_book/widget.dart
+++ b/frontend/pweb/lib/pages/dashboard/payouts/single/address_book/widget.dart
@@ -21,10 +21,7 @@ import 'package:pweb/generated/i18n/app_localizations.dart';
 class AddressBookPayout extends StatefulWidget {
  final ValueChanged<Recipient> onSelected;

-  const AddressBookPayout({
-    super.key,
-    required this.onSelected,
-  });
+  const AddressBookPayout({super.key, required this.onSelected});

  @override
  State<AddressBookPayout> createState() => _AddressBookPayoutState();
@@ -71,6 +68,7 @@ class _AddressBookPayoutState extends State<AddressBookPayout> {
      provider.setCurrentObject(null);
      context.pushNamed(PayoutRoutes.addRecipient);
    }
+
    final filteredRecipients = filterRecipients(
      recipients: recipients,
      query: _query,
@@ -81,16 +79,18 @@ class _AddressBookPayoutState extends State<AddressBookPayout> {
    }

    if (provider.error != null) {
-      return Center(child: Text(loc.notificationError(provider.error ?? loc.noErrorInformation)));
+      return Center(
+        child: Text(
+          loc.notificationError(provider.error ?? loc.noErrorInformation),
+        ),
+      );
    }

    return SizedBox(
      height: _isExpanded ? _expandedHeight : _collapsedHeight,
      child: Card(
        margin: const EdgeInsets.all(_cardMargin),
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(12),
-        ),
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
        elevation: 4,
        color: Theme.of(context).colorScheme.onSecondary,
        child: Padding(
@@ -121,7 +121,7 @@ class _AddressBookPayoutState extends State<AddressBookPayout> {
                    : ShortListAddressBookPayout(
                        recipients: recipients,
                        onSelected: widget.onSelected,
-                          trailing: AddRecipientTile(
+                        leading: AddRecipientTile(
                          label: loc.addRecipient,
                          onTap: onAddRecipient,
                        ),
--- a/frontend/pweb/lib/pages/payout_page/send/page.dart
+++ b/frontend/pweb/lib/pages/payout_page/send/page.dart
@@ -5,19 +5,21 @@ import 'package:pshared/models/recipient/recipient.dart';

 import 'package:pweb/widgets/sidebar/destinations.dart';
 import 'package:pweb/controllers/payments/page_ui.dart';
-import 'package:pweb/pages/payout_page/send/page_handlers.dart';
+import 'package:pweb/utils/payment/page_handlers.dart';
 import 'package:pweb/pages/payout_page/send/page_view.dart';


 class PaymentPage extends StatefulWidget {
  final ValueChanged<Recipient?>? onBack;
  final PaymentType? initialPaymentType;
+  final String? initialDestinationLedgerAccountRef;
  final PayoutDestination fallbackDestination;

  const PaymentPage({
    super.key,
    this.onBack,
    this.initialPaymentType,
+    this.initialDestinationLedgerAccountRef,
    this.fallbackDestination = PayoutDestination.dashboard,
  });

@@ -34,7 +36,11 @@ class _PaymentPageState extends State<PaymentPage> {
    _uiController = PaymentPageUiController();

    WidgetsBinding.instance.addPostFrameCallback(
-      (_) => initializePaymentPage(context, widget.initialPaymentType),
+      (_) => initializePaymentPage(
+        context,
+        widget.initialPaymentType,
+        destinationLedgerAccountRef: widget.initialDestinationLedgerAccountRef,
+      ),
    );
  }

--- a/frontend/pweb/lib/pages/payout_page/send/page_view.dart
+++ b/frontend/pweb/lib/pages/payout_page/send/page_view.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

 import 'package:pshared/models/recipient/recipient.dart';
+import 'package:pshared/provider/payment/flow.dart';
 import 'package:pshared/provider/payment/quotation/quotation.dart';
 import 'package:pshared/provider/recipient/pmethods.dart';
 import 'package:pshared/provider/recipient/provider.dart';
@@ -14,6 +15,7 @@ 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;
@@ -47,6 +49,7 @@ class PaymentPageView extends StatelessWidget {
          final uiController = context.watch<PaymentPageUiController>();
          final methodsProvider = context.watch<PaymentMethodsProvider>();
          final recipientProvider = context.watch<RecipientsProvider>();
+          final flowProvider = context.watch<PaymentFlowProvider>();
          final quotationProvider = context.watch<QuotationProvider>();
          final verificationController = context
              .watch<PayoutVerificationController>();
@@ -58,10 +61,12 @@ class PaymentPageView extends StatelessWidget {
            recipients: recipientProvider.recipients,
            query: uiController.query,
          );
+          final hasDestinationSelection =
+              flowProvider.selectedPaymentData != null;
          final sendState =
              verificationController.isCooldownActiveFor(verificationContextKey)
              ? ControlState.disabled
-              : (recipient == null
+              : (!hasDestinationSelection
                    ? ControlState.disabled
                    : ControlState.enabled);

--- a/frontend/pweb/lib/pages/payout_page/send/widgets/payment_info/manual_details.dart
+++ b/frontend/pweb/lib/pages/payout_page/send/widgets/payment_info/manual_details.dart
@@ -0,0 +1,51 @@
+import 'package:flutter/material.dart';
+
+import 'package:pshared/models/payment/methods/data.dart';
+import 'package:pshared/models/recipient/payment_method_draft.dart';
+
+import 'package:pweb/pages/address_book/form/widgets/payment_methods/panel.dart';
+import 'package:pweb/pages/payout_page/send/widgets/payment_info/header.dart';
+import 'package:pweb/models/state/control_state.dart';
+import 'package:pweb/models/state/visibility.dart';
+import 'package:pweb/utils/dimensions.dart';
+
+
+class PaymentInfoManualDetailsSection extends StatelessWidget {
+  final AppDimensions dimensions;
+  final String title;
+  final VisibilityState titleVisibility;
+  final PaymentMethodData data;
+
+  const PaymentInfoManualDetailsSection({
+    super.key,
+    required this.dimensions,
+    required this.title,
+    required this.titleVisibility,
+    required this.data,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final entry = RecipientMethodDraft(type: data.type, data: data);
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        PaymentInfoHeader(
+          dimensions: dimensions,
+          title: title,
+          visibility: titleVisibility,
+        ),
+        PaymentMethodPanel(
+          selectedType: data.type,
+          selectedIndex: 0,
+          entries: [entry],
+          onRemove: (_) {},
+          onChanged: (_, ignored) {},
+          editState: ControlState.disabled,
+          deleteVisibility: VisibilityState.hidden,
+        ),
+      ],
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/payout_page/send/widgets/payment_info/section.dart
+++ b/frontend/pweb/lib/pages/payout_page/send/widgets/payment_info/section.dart
@@ -6,6 +6,7 @@ import 'package:pshared/provider/payment/flow.dart';

 import 'package:pweb/pages/payout_page/send/widgets/payment_info/methods_section.dart';
 import 'package:pweb/pages/payout_page/send/widgets/payment_info/methods_state.dart';
+import 'package:pweb/pages/payout_page/send/widgets/payment_info/manual_details.dart';
 import 'package:pweb/pages/payout_page/send/widgets/payment_info/no_methods.dart';
 import 'package:pweb/pages/payout_page/send/widgets/payment_info/no_recipient.dart';
 import 'package:pweb/models/state/visibility.dart';
@@ -35,8 +36,9 @@ class PaymentInfoSection extends StatelessWidget {
  Widget build(BuildContext context) {
    final loc = AppLocalizations.of(context)!;
    final flowProvider = context.watch<PaymentFlowProvider>();
+    final manualData = flowProvider.manualPaymentData;

-    if (!flowProvider.hasRecipient) {
+    if (!flowProvider.hasRecipient && manualData == null) {
      return PaymentInfoNoRecipientSection(
        dimensions: dimensions,
        title: loc.paymentInfo,
@@ -44,6 +46,15 @@ class PaymentInfoSection extends StatelessWidget {
      );
    }

+    if (!flowProvider.hasRecipient && manualData != null) {
+      return PaymentInfoManualDetailsSection(
+        dimensions: dimensions,
+        title: loc.paymentInfo,
+        titleVisibility: titleVisibility,
+        data: manualData,
+      );
+    }
+
    final methods = flowProvider.methodsForRecipient;
    final types = visiblePaymentTypes;

--- a/frontend/pweb/lib/pages/payout_page/send/widgets/recipient/section.dart
+++ b/frontend/pweb/lib/pages/payout_page/send/widgets/recipient/section.dart
@@ -81,7 +81,7 @@ class RecipientSection extends StatelessWidget {
              ShortListAddressBookPayout(
                recipients: recipientProvider.recipients,
                onSelected: onRecipientSelected,
-                trailing: AddRecipientTile(
+                leading: AddRecipientTile(
                  label: loc.addRecipient,
                  onTap: onAddRecipient,
                ),
--- a/frontend/pweb/lib/pages/payout_page/send/widgets/recipient_details_card.dart
+++ b/frontend/pweb/lib/pages/payout_page/send/widgets/recipient_details_card.dart
@@ -1,6 +1,9 @@
 import 'package:flutter/material.dart';

+import 'package:provider/provider.dart';
+
 import 'package:pshared/models/recipient/recipient.dart';
+import 'package:pshared/provider/payment/flow.dart';
 import 'package:pshared/provider/recipient/provider.dart';

 import 'package:pweb/pages/payout_page/send/widgets/payment_info/section.dart';
@@ -46,10 +49,15 @@ class PaymentRecipientDetailsCard extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final flowProvider = context.watch<PaymentFlowProvider>();
+    final isRecipientSelectionLocked =
+        !flowProvider.hasRecipient && flowProvider.manualPaymentData != null;
+
    return PaymentSectionCard(
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
+          if (!isRecipientSelectionLocked) ...[
            RecipientSection(
              recipient: recipient,
              dimensions: dimensions,
@@ -64,6 +72,7 @@ class PaymentRecipientDetailsCard extends StatelessWidget {
              onAddRecipient: onAddRecipient,
            ),
            SizedBox(height: dimensions.paddingMedium),
+          ],
          PaymentInfoSection(
            dimensions: dimensions,
            titleVisibility: VisibilityState.hidden,
--- a/frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/buttons.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/buttons.dart
@@ -2,9 +2,10 @@ import 'package:flutter/material.dart';

 import 'package:provider/provider.dart';

+import 'package:pshared/controllers/payment/source.dart';
+
 import 'package:pweb/pages/payout_page/wallet/edit/buttons/send.dart';
 import 'package:pweb/pages/payout_page/wallet/edit/buttons/top_up.dart';
-import 'package:pshared/provider/payment/wallets.dart';


 class ButtonsWalletWidget extends StatelessWidget {
@@ -12,24 +13,19 @@ class ButtonsWalletWidget extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    final provider = context.watch<WalletsProvider>();
-    
-    if (provider.wallets.isEmpty) return const SizedBox.shrink();
+    final source = context.watch<PaymentSourceController>();
+    if (!source.hasSources) return const SizedBox.shrink();

    return Row(
      mainAxisAlignment: MainAxisAlignment.spaceAround,
      children: [
-          Expanded(
-            child: SendPayoutButton(),
-          ),
+        Expanded(child: SendPayoutButton()),
        VerticalDivider(
          color: Theme.of(context).colorScheme.primary,
          thickness: 1,
          width: 10,
        ),
-          Expanded(
-            child: TopUpButton(),
-          ),
+        Expanded(child: TopUpButton()),
      ],
    );
  }
--- a/frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/send.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/send.dart
@@ -4,7 +4,8 @@ import 'package:go_router/go_router.dart';

 import 'package:provider/provider.dart';

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

 import 'package:pweb/app/router/payout_routes.dart';
@@ -18,23 +19,26 @@ class SendPayoutButton extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    final loc = AppLocalizations.of(context)!;
-    return ElevatedButton(
-      style: ElevatedButton.styleFrom(
-        shadowColor: null,
-        elevation: 0,
-      ),
-      onPressed: () {
-        final wallets = context.read<WalletsController>();
-        final wallet = wallets.selectedWallet;
+    final source = context.watch<PaymentSourceController>();

-        if (wallet != null) {
+    final sourceType = source.selectedType;
+    final paymentType = switch (sourceType) {
+      PaymentSourceType.wallet => PaymentType.wallet,
+      PaymentSourceType.ledger => PaymentType.ledger,
+      _ => null,
+    };
+
+    return ElevatedButton(
+      style: ElevatedButton.styleFrom(shadowColor: null, elevation: 0),
+      onPressed: paymentType == null
+          ? null
+          : () {
              context.pushNamed(
                PayoutRoutes.payment,
                queryParameters: PayoutRoutes.buildQueryParameters(
-              paymentType: PaymentType.wallet,
+                  paymentType: paymentType,
                ),
              );
-        }
            },
      child: Text(loc.payoutNavSendPayout),
    );
--- a/frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/top_up.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/top_up.dart
@@ -1,8 +1,13 @@
 import 'package:flutter/material.dart';

+import 'package:go_router/go_router.dart';
+
 import 'package:provider/provider.dart';

-import 'package:pshared/controllers/balance_mask/wallets.dart';
+import 'package:pshared/controllers/payment/source.dart';
+import 'package:pshared/models/payment/source_type.dart';
+import 'package:pshared/models/payment/type.dart';
+import 'package:pshared/provider/recipient/provider.dart';

 import 'package:pweb/app/router/payout_routes.dart';

@@ -15,20 +20,35 @@ class TopUpButton extends StatelessWidget{
  @override
  Widget build(BuildContext context) {
    final loc = AppLocalizations.of(context)!;
+    final source = context.watch<PaymentSourceController>();
+    final selectedType = source.selectedType;
+    final selectedLedger = source.selectedLedgerAccount;
+    final canTopUp =
+        selectedType == PaymentSourceType.wallet ||
+        (selectedType == PaymentSourceType.ledger && selectedLedger != null);
+
    return ElevatedButton(
-      style: ElevatedButton.styleFrom(
-        shadowColor: null,
-        elevation: 0,
-      ),
-      onPressed: () {
-        final wallet = context.read<WalletsController>().selectedWallet;
-        if (wallet == null) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(loc.noWalletSelected)),
-          );
+      style: ElevatedButton.styleFrom(shadowColor: null, elevation: 0),
+      onPressed: !canTopUp
+          ? null
+          : () {
+              if (selectedType == PaymentSourceType.wallet) {
+                context.pushToWalletTopUp();
                return;
              }
-        context.pushToWalletTopUp();
+
+              if (selectedType == PaymentSourceType.ledger &&
+                  selectedLedger != null) {
+                context.read<RecipientsProvider>().setCurrentObject(null);
+                context.pushNamed(
+                  PayoutRoutes.payment,
+                  queryParameters: PayoutRoutes.buildQueryParameters(
+                    paymentType: PaymentType.ledger,
+                    destinationLedgerAccountRef:
+                        selectedLedger.ledgerAccountRef,
+                  ),
+                );
+              }
            },
      child: Text(loc.topUpBalance),
    );
--- a/frontend/pweb/lib/pages/payout_page/wallet/edit/fields.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/edit/fields.dart
@@ -1,55 +1,30 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';

 import 'package:provider/provider.dart';

-import 'package:pshared/controllers/balance_mask/wallets.dart';
-
-import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
-import 'package:pweb/widgets/refresh_balance/wallet.dart';
+import 'package:pshared/controllers/payment/source.dart';

+import 'package:pweb/pages/payout_page/wallet/edit/fields/ledger/section.dart';
+import 'package:pweb/pages/payout_page/wallet/edit/fields/wallet/wallet_section.dart';

 class WalletEditFields extends StatelessWidget {
  const WalletEditFields({super.key});

  @override
  Widget build(BuildContext context) {
-    return Consumer<WalletsController>(
-      builder: (context, controller, _) {
-        final wallet = controller.selectedWallet;
-        
-        if (wallet == null) {
-          return SizedBox.shrink();
+    return Consumer<PaymentSourceController>(
+      builder: (context, sourceController, _) {
+        final wallet = sourceController.selectedWallet;
+        if (wallet != null) {
+          return WalletSection(wallet: wallet);
        }

-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Row(
-              children: [
-                Expanded(
-                  child: BalanceAmount(
-                    wallet: wallet,
-                    onToggleMask: () => controller.toggleBalanceMask(wallet.id),
-                  ),
-                ),
-                WalletBalanceRefreshButton(walletRef: wallet.id),
-              ],
-            ),
-            const SizedBox(height: 8),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Text(wallet.walletUserID, style: Theme.of(context).textTheme.bodyLarge),
-                IconButton(
-                  icon: Icon(Icons.copy), 
-                  iconSize: 18,
-                  onPressed: () => Clipboard.setData(ClipboardData(text: wallet.walletUserID)),
-                ),
-              ],
-            ),
-          ],
-        );
+        final ledger = sourceController.selectedLedgerAccount;
+        if (ledger != null) {
+          return LedgerSection(ledger: ledger);
+        }
+
+        return const SizedBox.shrink();
      },
    );
  }
--- a/frontend/pweb/lib/pages/payout_page/wallet/edit/fields/ledger/balance_formatter.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/edit/fields/ledger/balance_formatter.dart
@@ -0,0 +1,44 @@
+import 'package:pshared/models/ledger/account.dart';
+import 'package:pshared/utils/currency.dart';
+import 'package:pshared/utils/money.dart';
+
+
+class LedgerBalanceFormatter {
+  const LedgerBalanceFormatter._();
+
+  static String format(LedgerAccount account) {
+    final money = account.balance?.balance;
+    if (money == null) return '--';
+
+    final amount = parseMoneyAmount(money.amount, fallback: double.nan);
+    if (amount.isNaN) {
+      return '${money.amount} ${money.currency}';
+    }
+
+    try {
+      final currency = currencyStringToCode(money.currency);
+      final symbol = currencyCodeToSymbol(currency);
+      if (symbol.trim().isEmpty) {
+        return '${amountToString(amount)} ${money.currency}';
+      }
+      return '${amountToString(amount)} $symbol';
+    } catch (_) {
+      return '${amountToString(amount)} ${money.currency}';
+    }
+  }
+
+  static String formatMasked(LedgerAccount account) {
+    final currency = account.currency.trim();
+    if (currency.isEmpty) return '••••';
+
+    try {
+      final symbol = currencyCodeToSymbol(currencyStringToCode(currency));
+      if (symbol.trim().isEmpty) {
+        return '•••• $currency';
+      }
+      return '•••• $symbol';
+    } catch (_) {
+      return '•••• $currency';
+    }
+  }
+}
--- a/frontend/pweb/lib/pages/payout_page/wallet/edit/fields/ledger/balance_row.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/edit/fields/ledger/balance_row.dart
@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+
+
+class LedgerBalanceRow extends StatelessWidget {
+  final String balance;
+  final bool isMasked;
+  final VoidCallback onToggleMask;
+
+  const LedgerBalanceRow({
+    super.key,
+    required this.balance,
+    required this.isMasked,
+    required this.onToggleMask,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        Flexible(
+          child: Text(
+            balance,
+            style: Theme.of(
+              context,
+            ).textTheme.headlineSmall?.copyWith(fontWeight: FontWeight.bold),
+          ),
+        ),
+        const SizedBox(width: 8),
+        GestureDetector(
+          onTap: onToggleMask,
+          child: Icon(
+            isMasked ? Icons.visibility_off : Icons.visibility,
+            size: 22,
+          ),
+        ),
+      ],
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/payout_page/wallet/edit/fields/ledger/section.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/edit/fields/ledger/section.dart
@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import 'package:provider/provider.dart';
+
+import 'package:pshared/controllers/balance_mask/ledger_accounts.dart';
+import 'package:pshared/models/ledger/account.dart';
+
+import 'package:pweb/pages/payout_page/wallet/edit/fields/ledger/balance_formatter.dart';
+import 'package:pweb/pages/payout_page/wallet/edit/fields/ledger/balance_row.dart';
+import 'package:pweb/pages/payout_page/wallet/edit/fields/shared/copyable_value_row.dart';
+import 'package:pweb/widgets/refresh_balance/ledger.dart';
+
+
+class LedgerSection extends StatelessWidget {
+  final LedgerAccount ledger;
+
+  const LedgerSection({super.key, required this.ledger});
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<LedgerBalanceMaskController>(
+      builder: (context, balanceMask, _) {
+        final isMasked = balanceMask.isBalanceMasked(ledger.ledgerAccountRef);
+        final accountCode = ledger.accountCode.trim();
+        final hasAccountCode = accountCode.isNotEmpty;
+        final balance = isMasked
+            ? LedgerBalanceFormatter.formatMasked(ledger)
+            : LedgerBalanceFormatter.format(ledger);
+
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Expanded(
+                  child: LedgerBalanceRow(
+                    balance: balance,
+                    isMasked: isMasked,
+                    onToggleMask: () {
+                      balanceMask.toggleBalanceMask(ledger.ledgerAccountRef);
+                    },
+                  ),
+                ),
+                LedgerBalanceRefreshButton(
+                  ledgerAccountRef: ledger.ledgerAccountRef,
+                ),
+              ],
+            ),
+            const SizedBox(height: 8),
+            CopyableValueRow(
+              value: hasAccountCode ? accountCode : '-',
+              canCopy: hasAccountCode,
+              onCopy: hasAccountCode
+                  ? () {
+                      Clipboard.setData(ClipboardData(text: accountCode));
+                    }
+                  : null,
+              overflow: TextOverflow.ellipsis,
+              wrapValueWithFlexible: true,
+            ),
+          ],
+        );
+      },
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/payout_page/wallet/edit/fields/shared/copyable_value_row.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/edit/fields/shared/copyable_value_row.dart
@@ -0,0 +1,40 @@
+import 'package:flutter/material.dart';
+
+
+class CopyableValueRow extends StatelessWidget {
+  final String value;
+  final bool canCopy;
+  final VoidCallback? onCopy;
+  final TextOverflow overflow;
+  final bool wrapValueWithFlexible;
+
+  const CopyableValueRow({
+    super.key,
+    required this.value,
+    required this.canCopy,
+    required this.onCopy,
+    this.overflow = TextOverflow.visible,
+    this.wrapValueWithFlexible = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final valueText = Text(
+      value,
+      style: Theme.of(context).textTheme.bodyLarge,
+      overflow: overflow,
+    );
+
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        if (wrapValueWithFlexible) Flexible(child: valueText) else valueText,
+        IconButton(
+          icon: const Icon(Icons.copy),
+          iconSize: 18,
+          onPressed: canCopy ? onCopy : null,
+        ),
+      ],
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/payout_page/wallet/edit/fields/wallet/wallet_section.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/edit/fields/wallet/wallet_section.dart
@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import 'package:provider/provider.dart';
+
+import 'package:pshared/controllers/balance_mask/wallets.dart';
+import 'package:pshared/models/payment/wallet.dart';
+
+import 'package:pweb/pages/dashboard/buttons/balance/amount.dart';
+import 'package:pweb/pages/payout_page/wallet/edit/fields/shared/copyable_value_row.dart';
+import 'package:pweb/widgets/refresh_balance/wallet.dart';
+
+
+class WalletSection extends StatelessWidget {
+  final Wallet wallet;
+
+  const WalletSection({super.key, required this.wallet});
+
+  @override
+  Widget build(BuildContext context) {
+    final depositAddress = wallet.depositAddress?.trim();
+    final hasDepositAddress =
+        depositAddress != null && depositAddress.isNotEmpty;
+    final copyAddress = hasDepositAddress ? depositAddress : '';
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          children: [
+            Expanded(
+              child: BalanceAmount(
+                wallet: wallet,
+                onToggleMask: () {
+                  context.read<WalletsController>().toggleBalanceMask(
+                    wallet.id,
+                  );
+                },
+              ),
+            ),
+            WalletBalanceRefreshButton(walletRef: wallet.id),
+          ],
+        ),
+        const SizedBox(height: 8),
+        CopyableValueRow(
+          value: hasDepositAddress ? depositAddress : '-',
+          canCopy: hasDepositAddress,
+          onCopy: hasDepositAddress
+              ? () {
+                  Clipboard.setData(ClipboardData(text: copyAddress));
+                }
+              : null,
+        ),
+      ],
+    );
+  }
+}
--- a/frontend/pweb/lib/pages/payout_page/wallet/edit/header.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/edit/header.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';

 import 'package:provider/provider.dart';

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

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

@@ -12,15 +12,20 @@ class WalletEditHeader extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    final controller = context.watch<WalletsController>();
+    final controller = context.watch<PaymentSourceController>();
    final wallet = controller.selectedWallet;
+    final ledger = controller.selectedLedgerAccount;
    final loc = AppLocalizations.of(context)!;

-    if (wallet == null) {
+    if (wallet == null && ledger == null) {
      return const SizedBox.shrink();
    }

    final theme = Theme.of(context);
+    final title = wallet != null
+        ? loc.paymentTypeCryptoWallet
+        : loc.paymentTypeLedger;
+    final subtitle = wallet?.tokenSymbol;

    return Row(
      spacing: 8,
@@ -32,14 +37,14 @@ class WalletEditHeader extends StatelessWidget {
            spacing: 4,
            children: [
              Text(
-                loc.paymentTypeCryptoWallet,
-                style: theme.textTheme.headlineMedium!.copyWith(
+                title,
+                style: theme.textTheme.headlineMedium?.copyWith(
                  fontWeight: FontWeight.bold,
                ),
              ),
-              if (wallet.tokenSymbol != null)
+              if (subtitle != null && subtitle.trim().isNotEmpty)
                Text(
-                  wallet.tokenSymbol!,
+                  subtitle,
                  style: theme.textTheme.bodyMedium?.copyWith(
                    color: theme.colorScheme.onSurfaceVariant,
                  ),
--- a/frontend/pweb/lib/pages/payout_page/wallet/edit/page.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/edit/page.dart
@@ -2,17 +2,16 @@ import 'package:flutter/material.dart';

 import 'package:provider/provider.dart';

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

 import 'package:pweb/pages/payout_page/wallet/edit/buttons/buttons.dart';
 import 'package:pweb/pages/payout_page/wallet/edit/fields.dart';
 import 'package:pweb/pages/payout_page/wallet/edit/header.dart';
-import 'package:pweb/pages/payout_page/wallet/history/history.dart';
 import 'package:pweb/utils/dimensions.dart';

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

-
+//TODO make this page more generic and reusable
 class WalletEditPage extends StatelessWidget {
  final VoidCallback onBack;

@@ -23,11 +22,11 @@ class WalletEditPage extends StatelessWidget {
    final dimensions = AppDimensions();
    final loc = AppLocalizations.of(context)!;

-    return Consumer<WalletsController>(
+    return Consumer<PaymentSourceController>(
      builder: (context, controller, child) {
-        final wallet = controller.selectedWallet;
+        final sourceType = controller.selectedType;

-        if (wallet == null) {
+        if (sourceType == null) {
          return Center(child: Text(loc.noWalletSelected));
        }

@@ -36,11 +35,15 @@ class WalletEditPage extends StatelessWidget {
          child: Column(
            children: [
              ConstrainedBox(
-                constraints: BoxConstraints(maxWidth: dimensions.maxContentWidth),
+                constraints: BoxConstraints(
+                  maxWidth: dimensions.maxContentWidth,
+                ),
                child: Material(
                  elevation: dimensions.elevationSmall,
                  color: Theme.of(context).colorScheme.onSecondary,
-                  borderRadius: BorderRadius.circular(dimensions.borderRadiusMedium),
+                  borderRadius: BorderRadius.circular(
+                    dimensions.borderRadiusMedium,
+                  ),
                  child: Padding(
                    padding: EdgeInsets.all(dimensions.paddingLarge),
                    child: SingleChildScrollView(
@@ -55,19 +58,12 @@ class WalletEditPage extends StatelessWidget {
                          WalletEditFields(),
                          const SizedBox(height: 24),
                          ButtonsWalletWidget(),
-                          const SizedBox(height: 24),
                        ],
                      ),
                    ),
                  ),
                ),
              ),
-              const SizedBox(height: 24),
-              Expanded(
-                child: SingleChildScrollView(
-                  child: WalletHistory(wallet: wallet),
-                ),
-              ),
            ],
          ),
        );
--- a/frontend/pweb/lib/pages/payout_page/wallet/history/history.dart
+++ b/frontend/pweb/lib/pages/payout_page/wallet/history/history.dart
@@ -2,118 +2,87 @@ import 'package:flutter/material.dart';

 import 'package:provider/provider.dart';

-import 'package:pshared/models/payment/wallet.dart';
+import 'package:pshared/models/payment/source_type.dart';
+import 'package:pshared/provider/payment/payments.dart';

-import 'package:pweb/pages/payout_page/wallet/history/filters.dart';
-import 'package:pweb/pages/payout_page/wallet/history/table.dart';
-import 'package:pweb/controllers/operations/wallet_transactions.dart';
-import 'package:pweb/providers/wallet_transactions.dart';
+import 'package:pweb/controllers/operations/report_operations.dart';
+import 'package:pweb/models/state/load_more_state.dart';
+import 'package:pweb/pages/report/cards/list.dart';
+import 'package:pweb/pages/report/operations/actions.dart';
+import 'package:pweb/pages/report/operations/states/error.dart';
+import 'package:pweb/pages/report/operations/states/loading.dart';

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


-class WalletHistory extends StatefulWidget {
-  final Wallet wallet;
+class WalletHistory extends StatelessWidget {
+  final String sourceRef;
+  final PaymentSourceType sourceType;
+  final List<String> sourceRefs;

-  const WalletHistory({super.key, required this.wallet});
-
-  @override
-  State<WalletHistory> createState() => _WalletHistoryState();
-}
-
-class _WalletHistoryState extends State<WalletHistory> {
-  @override
-  void initState() {
-    super.initState();
-    _load();
-  }
-
-  @override
-  void didUpdateWidget(covariant WalletHistory oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.wallet.id != widget.wallet.id) {
-      _load();
-    }
-  }
-
-  void _load() {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      context
-          .read<WalletTransactionsProvider>()
-          .load(walletId: widget.wallet.id);
+  const WalletHistory({
+    super.key,
+    required this.sourceRef,
+    required this.sourceType,
+    required this.sourceRefs,
  });
-  }
-
-  Future<void> _pickRange() async {
-    final provider = context.read<WalletTransactionsController>();
-    final now = DateTime.now();
-    final initial = provider.dateRange ??
-        DateTimeRange(
-          start: now.subtract(const Duration(days: 30)),
-          end: now,
-        );
-
-    final picked = await showDateRangePicker(
-      context: context,
-      firstDate: now.subtract(const Duration(days: 365)),
-      lastDate: now.add(const Duration(days: 1)),
-      initialDateRange: initial,
-    );
-
-    if (picked != null) {
-      provider.setDateRange(picked);
-    }
-  }

  @override
  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
+    return ChangeNotifierProxyProvider<
+      PaymentsProvider,
+      ReportOperationsController
+    >(
+      create: (_) => ReportOperationsController(),
+      update: (_, payments, controller) => controller!
+        ..update(
+          payments,
+          sourceType: sourceType,
+          sourceRef: sourceRef,
+          sourceRefs: sourceRefs,
+        ),
+      child: const _WalletHistoryContent(),
+    );
+  }
+}
+
+class _WalletHistoryContent extends StatelessWidget {
+  const _WalletHistoryContent();
+
+  @override
+  Widget build(BuildContext context) {
    final loc = AppLocalizations.of(context)!;

-    return Consumer<WalletTransactionsController>(
-      builder: (context, provider, child) {
-        if (provider.isLoading) {
-          return const Padding(
-            padding: EdgeInsets.all(16.0),
-            child: Center(child: CircularProgressIndicator()),
+    return Consumer<ReportOperationsController>(
+      builder: (context, controller, child) {
+        if (controller.isLoading) {
+          return const OperationHistoryLoading();
+        }
+
+        if (controller.error != null) {
+          final message =
+              controller.error?.toString() ?? loc.noErrorInformation;
+          return OperationHistoryError(
+            message: loc.notificationError(message),
+            retryLabel: loc.retry,
+            onRetry: controller.refresh,
          );
        }

-        if (provider.error != null) {
+        final hasLoadMore = controller.loadMoreState != LoadMoreState.hidden;
        return Padding(
-            padding: const EdgeInsets.all(16.0),
+          padding: const EdgeInsets.symmetric(horizontal: 16.0),
          child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  loc.failedToLoadHistory,
-                  style: theme.textTheme.titleMedium!
-                      .copyWith(color: theme.colorScheme.error),
-                ),
-                const SizedBox(height: 8),
-                Text(loc.notificationError(provider.error ?? loc.noErrorInformation)),
-                const SizedBox(height: 8),
-                OutlinedButton(
-                  onPressed: _load,
-                  child: Text(loc.retry),
-                ),
-              ],
-            ),
-          );
-        }
-
-        final transactions = provider.filteredTransactions;
-
-        return Column(
            crossAxisAlignment: CrossAxisAlignment.stretch,
            children: [
-            WalletHistoryFilters(
-              provider: provider,
-              onPickRange: _pickRange,
+              OperationsCardsList(
+                operations: controller.filteredOperations,
+                onTap: (operation) => openPaymentDetails(context, operation),
+                loadMoreState: controller.loadMoreState,
+                onLoadMore: hasLoadMore ? controller.loadMore : null,
              ),
-            const SizedBox(height: 12),
-            WalletTransactionsTable(transactions: transactions),
            ],
+          ),
        );
      },
    );
--- a/frontend/pweb/lib/pages/report/details/content.dart
+++ b/frontend/pweb/lib/pages/report/details/content.dart
@@ -13,7 +13,6 @@ import 'package:pweb/generated/i18n/app_localizations.dart';
 class PaymentDetailsContent extends StatelessWidget {
  final Payment payment;
  final VoidCallback onBack;
-  final VoidCallback? onDownloadAct;
  final bool Function(PaymentExecutionOperation operation)?
  canDownloadOperationDocument;
  final ValueChanged<PaymentExecutionOperation>? onDownloadOperationDocument;
@@ -22,7 +21,6 @@ class PaymentDetailsContent extends StatelessWidget {
    super.key,
    required this.payment,
    required this.onBack,
-    this.onDownloadAct,
    this.canDownloadOperationDocument,
    this.onDownloadOperationDocument,
  });
@@ -37,7 +35,7 @@ class PaymentDetailsContent extends StatelessWidget {
        children: [
          PaymentDetailsHeader(title: loc.paymentInfo, onBack: onBack),
          const SizedBox(height: 16),
-          PaymentSummaryCard(payment: payment, onDownloadAct: onDownloadAct),
+          PaymentSummaryCard(payment: payment),
          const SizedBox(height: 16),
          PaymentDetailsSections(
            payment: payment,
--- a/frontend/pweb/lib/pages/report/details/page.dart
+++ b/frontend/pweb/lib/pages/report/details/page.dart
@@ -64,17 +64,6 @@ class _PaymentDetailsView extends StatelessWidget {
          return PaymentDetailsContent(
            payment: payment,
            onBack: () => _handleBack(context),
-            onDownloadAct: controller.canDownload
-                ? () {
-                    final request = controller.primaryOperationDocumentRequest;
-                    if (request == null) return;
-                    downloadPaymentAct(
-                      context,
-                      gatewayService: request.gatewayService,
-                      operationRef: request.operationRef,
-                    );
-                  }
-                : null,
            canDownloadOperationDocument:
                controller.canDownloadOperationDocument,
            onDownloadOperationDocument: (operation) {
--- a/frontend/pweb/lib/pages/report/details/sections/operations/section.dart
+++ b/frontend/pweb/lib/pages/report/details/sections/operations/section.dart
@@ -44,12 +44,12 @@ class PaymentOperationsSection extends StatelessWidget {
      );
      if (i < operations.length - 1) {
        children.addAll([
-          const SizedBox(height: 8),
+          const SizedBox(height: 10),
          Divider(
            height: 1,
            color: Theme.of(context).dividerColor.withAlpha(20),
          ),
-          const SizedBox(height: 8),
+          const SizedBox(height: 10),
        ]);
      }
    }
--- a/frontend/pweb/lib/pages/report/details/summary_card/widget.dart
+++ b/frontend/pweb/lib/pages/report/details/summary_card/widget.dart
@@ -14,15 +14,11 @@ import 'package:pweb/utils/clipboard.dart';

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

+
 class PaymentSummaryCard extends StatelessWidget {
  final Payment payment;
-  final VoidCallback? onDownloadAct;

-  const PaymentSummaryCard({
-    super.key,
-    required this.payment,
-    this.onDownloadAct,
-  });
+  const PaymentSummaryCard({super.key, required this.payment});

  @override
  Widget build(BuildContext context) {
@@ -93,14 +89,6 @@ class PaymentSummaryCard extends StatelessWidget {
                text: feeText,
                muted: true,
              ),
-            if (onDownloadAct != null) ...[
-              const SizedBox(height: 12),
-              OutlinedButton.icon(
-                onPressed: onDownloadAct,
-                icon: const Icon(Icons.download),
-                label: Text(loc.downloadAct),
-              ),
-            ],
            if (showPaymentId) ...[
              const SizedBox(height: 16),
              Divider(color: theme.dividerColor.withAlpha(35), height: 1),
--- a/frontend/pweb/lib/providers/multiple_payouts.dart
+++ b/frontend/pweb/lib/providers/multiple_payouts.dart
@@ -13,8 +13,9 @@ import 'package:pshared/utils/payment/quote_helpers.dart';

 import 'package:pweb/models/payment/multiple_payouts/csv_row.dart';
 import 'package:pweb/models/payment/multiple_payouts/state.dart';
-import 'package:pweb/utils/payment/multiple_csv_parser.dart';
-import 'package:pweb/utils/payment/multiple_intent_builder.dart';
+import 'package:pweb/utils/payment/multiple/csv_parser.dart';
+import 'package:pweb/utils/payment/multiple/intent_builder.dart';
+

 class MultiplePayoutsProvider extends ChangeNotifier {
  final MultipleCsvParser _csvParser;
--- a/frontend/pweb/lib/providers/wallet_transactions.dart
+++ b/frontend/pweb/lib/providers/wallet_transactions.dart
@@ -13,6 +13,7 @@ class WalletTransactionsProvider extends ChangeNotifier {
  bool _isLoading = false;
  String? _error;
  String? _walletId;
+  int _loadSeq = 0;

  List<WalletTransaction> get transactions => List.unmodifiable(_transactions);
  bool get isLoading => _isLoading;
@@ -20,18 +21,28 @@ class WalletTransactionsProvider extends ChangeNotifier {
  String? get walletId => _walletId;

  Future<void> load({String? walletId}) async {
+    final targetWalletId = walletId ?? _walletId;
+    final requestSeq = ++_loadSeq;
+    _walletId = targetWalletId;
    _isLoading = true;
    _error = null;
    notifyListeners();

    try {
-      _walletId = walletId ?? _walletId;
-      _transactions = await _service.fetchHistory(walletId: _walletId);
+      final fetched = await _service.fetchHistory(walletId: targetWalletId);
+      if (requestSeq != _loadSeq) return;
+
+      _transactions = targetWalletId == null
+          ? fetched
+          : fetched.where((tx) => tx.walletId == targetWalletId).toList();
    } catch (e) {
+      if (requestSeq != _loadSeq) return;
      _error = e.toString();
    } finally {
+      if (requestSeq == _loadSeq) {
        _isLoading = false;
        notifyListeners();
      }
    }
  }
+}
--- a/frontend/pweb/lib/utils/payment/multiple/csv_parser.dart
+++ b/frontend/pweb/lib/utils/payment/multiple/csv_parser.dart
--- a/frontend/pweb/lib/utils/payment/multiple/intent_builder.dart
+++ b/frontend/pweb/lib/utils/payment/multiple/intent_builder.dart
--- a/frontend/pweb/lib/pages/payout_page/send/page_handlers.dart
+++ b/frontend/pweb/lib/pages/payout_page/send/page_handlers.dart
@@ -4,6 +4,7 @@ import 'package:go_router/go_router.dart';

 import 'package:provider/provider.dart';

+import 'package:pshared/models/payment/methods/ledger.dart';
 import 'package:pshared/models/payment/type.dart';
 import 'package:pshared/models/recipient/recipient.dart';
 import 'package:pshared/provider/payment/flow.dart';
@@ -17,14 +18,30 @@ import 'package:pweb/widgets/dialogs/payment_status_dialog.dart';
 import 'package:pweb/controllers/payments/page.dart';
 import 'package:pweb/controllers/payments/page_ui.dart';
 import 'package:pweb/controllers/payouts/payout_verification.dart';
-import 'package:pweb/utils/payment/payout_verification_flow.dart';
+import 'package:pweb/utils/payment/verification_flow.dart';
+

 void initializePaymentPage(
  BuildContext context,
-  PaymentType? initialPaymentType,
-) {
+  PaymentType? initialPaymentType, {
+  String? destinationLedgerAccountRef,
+}) {
  final flowProvider = context.read<PaymentFlowProvider>();
+  final recipientsProvider = context.read<RecipientsProvider>();
+
  flowProvider.setPreferredType(initialPaymentType);
+
+  final destinationRef = destinationLedgerAccountRef?.trim();
+  if (destinationRef != null && destinationRef.isNotEmpty) {
+    recipientsProvider.setCurrentObject(null);
+    flowProvider.setPreferredType(PaymentType.ledger);
+    flowProvider.setManualPaymentData(
+      LedgerPaymentMethod(ledgerAccountRef: destinationRef),
+    );
+    return;
+  }
+
+  flowProvider.setManualPaymentData(null);
 }

 void handleSearchChanged(PaymentPageUiController uiController, String query) {
--- a/frontend/pweb/lib/utils/payment/payout_verification_flow.dart
+++ b/frontend/pweb/lib/utils/payment/payout_verification_flow.dart
--- a/frontend/pweb/lib/utils/report/payment_mapper.dart
+++ b/frontend/pweb/lib/utils/report/payment_mapper.dart
@@ -1,12 +1,13 @@
+import 'package:pshared/models/payment/operation_document.dart';
 import 'package:pshared/models/payment/operation.dart';
 import 'package:pshared/models/payment/payment.dart';
 import 'package:pshared/models/payment/state.dart';
 import 'package:pshared/models/payment/status.dart';
 import 'package:pshared/utils/money.dart';

-import 'package:pweb/models/report/operation/document.dart';
 import 'package:pweb/utils/report/operations/document_rule.dart';

+
 OperationItem mapPaymentToOperation(Payment payment) {
  final debit = payment.lastQuote?.amounts?.sourceDebitTotal;
  final settlement = payment.lastQuote?.amounts?.destinationSettlement;
@@ -55,7 +56,7 @@ OperationItem mapPaymentToOperation(Payment payment) {
  );
 }

-OperationDocumentInfo? _resolveOperationDocument(Payment payment) {
+OperationDocumentRef? _resolveOperationDocument(Payment payment) {
  for (final operation in payment.operations) {
    final operationRef = operation.operationRef;
    final gatewayService = operation.gateway;
@@ -64,7 +65,7 @@ OperationDocumentInfo? _resolveOperationDocument(Payment payment) {

    if (!isOperationDocumentEligible(operation.code)) continue;

-    return OperationDocumentInfo(
+    return OperationDocumentRef(
      operationRef: operationRef,
      gatewayService: gatewayService,
    );
--- a/frontend/pweb/lib/utils/report/source_filter.dart
+++ b/frontend/pweb/lib/utils/report/source_filter.dart
@@ -0,0 +1,112 @@
+import 'package:pshared/models/payment/intent.dart';
+import 'package:pshared/models/payment/methods/data.dart';
+import 'package:pshared/models/payment/methods/ledger.dart';
+import 'package:pshared/models/payment/methods/managed_wallet.dart';
+import 'package:pshared/models/payment/methods/wallet.dart';
+import 'package:pshared/models/payment/payment.dart';
+import 'package:pshared/models/payment/source_type.dart';
+
+
+bool paymentMatchesSource(
+  Payment payment, {
+  required PaymentSourceType sourceType,
+  required String sourceRef,
+}) {
+  final normalizedSourceRef = _normalize(sourceRef);
+  if (normalizedSourceRef == null) return false;
+
+  final paymentSourceRef = _paymentSourceRef(payment, sourceType);
+  return paymentSourceRef != null && paymentSourceRef == normalizedSourceRef;
+}
+
+String? _paymentSourceRef(Payment payment, PaymentSourceType sourceType) {
+  final fromIntent = _sourceRefFromIntent(payment.intent, sourceType);
+  if (fromIntent != null) return fromIntent;
+  return _sourceRefFromMetadata(payment.metadata, sourceType);
+}
+
+String? _sourceRefFromIntent(
+  PaymentIntent? intent,
+  PaymentSourceType sourceType,
+) {
+  final source = intent?.source;
+  if (source == null) return null;
+
+  final fromIntentAttributes = _sourceRefFromMetadata(
+    intent?.attributes,
+    sourceType,
+  );
+  if (fromIntentAttributes != null) return fromIntentAttributes;
+
+  switch (sourceType) {
+    case PaymentSourceType.wallet:
+      return _walletSourceRef(source);
+    case PaymentSourceType.ledger:
+      return _ledgerSourceRef(source);
+  }
+}
+
+String? _walletSourceRef(PaymentMethodData source) {
+  if (source is ManagedWalletPaymentMethod) {
+    return _normalize(source.managedWalletRef) ??
+        _sourceRefFromMetadata(source.metadata, PaymentSourceType.wallet);
+  }
+  if (source is WalletPaymentMethod) {
+    return _normalize(source.walletId) ??
+        _sourceRefFromMetadata(source.metadata, PaymentSourceType.wallet);
+  }
+  return null;
+}
+
+String? _ledgerSourceRef(PaymentMethodData source) {
+  if (source is LedgerPaymentMethod) {
+    return _normalize(source.ledgerAccountRef) ??
+        _sourceRefFromMetadata(source.metadata, PaymentSourceType.ledger);
+  }
+  return null;
+}
+
+String? _sourceRefFromMetadata(
+  Map<String, String>? metadata,
+  PaymentSourceType sourceType,
+) {
+  if (metadata == null || metadata.isEmpty) return null;
+
+  final keys = switch (sourceType) {
+    PaymentSourceType.wallet => const <String>[
+      'source_wallet_ref',
+      'managed_wallet_ref',
+      'wallet_ref',
+      'wallet_id',
+      'source_wallet_id',
+      'source_wallet_user_id',
+      'wallet_user_id',
+      'wallet_user_ref',
+      'wallet_number',
+      'source_wallet_number',
+      'source_managed_wallet_ref',
+      'source_ref',
+    ],
+    PaymentSourceType.ledger => const <String>[
+      'source_ledger_account_ref',
+      'ledger_account_ref',
+      'source_account_code',
+      'ledger_account_code',
+      'account_code',
+      'source_ref',
+    ],
+  };
+
+  for (final key in keys) {
+    final value = _normalize(metadata[key]);
+    if (value != null) return value;
+  }
+
+  return null;
+}
+
+String? _normalize(String? value) {
+  final normalized = value?.trim();
+  if (normalized == null || normalized.isEmpty) return null;
+  return normalized;
+}
Author	SHA1	Message	Date
Arseni	0aceb2f441	added missed loc instead of hardcode	2026-03-06 18:05:04 +03:00
Arseni	281b3834d3	wallet card redesign	2026-03-06 17:48:36 +03:00
Arseni	2b0ada1541	Merge remote-tracking branch 'origin/main' into SEND066 merge fresh main into SEND66	2026-03-06 17:18:39 +03:00
Arseni	b67d199427	Merge remote-tracking branch 'origin/main' into SEND066 merge lastest updates in main	2026-03-06 01:14:40 +03:00
Arseni	97b16542c2	ledger top up functionality and few small fixes for project architechture and design	2026-03-05 21:49:23 +03:00
Arseni	39c04beb21	Merge remote-tracking branch 'origin/main' into SEND066 merge main into SEND066	2026-03-05 21:12:43 +03:00
Arseni	d6a3a0cc5b	solyanka iz fix for payout page design, ledger wallet now clickable	2026-03-05 15:48:52 +03:00