added ledger as souec of funds for payouts

This commit is contained in:
Arseni
2026-03-03 21:03:30 +03:00
parent 3f578353da
commit 51c72a87ae
29 changed files with 796 additions and 385 deletions

View File

@@ -1,21 +1,124 @@
import 'package:flutter/foundation.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/provider/ledger.dart';
class CarouselIndexController with ChangeNotifier {
import 'package:pweb/pages/dashboard/buttons/balance/balance_item.dart';
class BalanceCarouselController with ChangeNotifier {
WalletsController? _walletsController;
List<BalanceItem> _items = const <BalanceItem>[BalanceItem.addAction()];
int _index = 0;
List<BalanceItem> get items => _items;
int get index => _index;
void setIndex(int value, int max) {
final next = value.clamp(0, max > 0 ? max - 1 : 0);
if (next == _index) return;
void update({
required WalletsController walletsController,
required LedgerAccountsProvider ledgerProvider,
}) {
_walletsController = walletsController;
final nextItems = <BalanceItem>[
...walletsController.wallets.map(BalanceItem.wallet),
...ledgerProvider.accounts.map(BalanceItem.ledger),
const BalanceItem.addAction(),
];
final nextIndex = _resolveNextIndex(nextItems, walletsController);
final hasItemsChanged = !_isSameItems(_items, nextItems);
final hasIndexChanged = _index != nextIndex;
_items = nextItems;
_index = nextIndex;
if (hasItemsChanged || hasIndexChanged) {
notifyListeners();
}
}
void onPageChanged(int value) {
final next = _clampIndex(value, _items.length);
if (_index == next) {
_syncSelectedWallet();
return;
}
_index = next;
_syncSelectedWallet();
notifyListeners();
}
void reset() {
if (_index == 0) return;
_index = 0;
notifyListeners();
void goBack() => onPageChanged(_index - 1);
void goForward() => onPageChanged(_index + 1);
int _resolveNextIndex(
List<BalanceItem> nextItems,
WalletsController walletsController,
) {
final currentWalletRef = _currentWalletRef(_items, _index);
if (currentWalletRef != null) {
final byCurrentWallet = _walletIndexByRef(nextItems, currentWalletRef);
if (byCurrentWallet != null) return byCurrentWallet;
final selectedWalletRef = walletsController.selectedWalletRef;
final bySelectedWallet = _walletIndexByRef(nextItems, selectedWalletRef);
if (bySelectedWallet != null) return bySelectedWallet;
}
return _clampIndex(_index, nextItems.length);
}
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;
}
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,
);
if (idx < 0) return null;
return idx;
}
int _clampIndex(int value, int itemCount) {
if (itemCount <= 0) return 0;
return value.clamp(0, itemCount - 1);
}
bool _isSameItems(List<BalanceItem> left, List<BalanceItem> right) {
if (left.length != right.length) return false;
for (var i = 0; i < left.length; i++) {
final a = left[i];
final b = right[i];
if (a.type != b.type) 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',
};
void _syncSelectedWallet() {
final walletsController = _walletsController;
if (walletsController == null || _items.isEmpty) return;
final current = _items[_index];
if (!current.isWallet || current.wallet == null) return;
final wallet = current.wallet!;
if (walletsController.selectedWallet?.id == wallet.id) return;
walletsController.selectWallet(wallet);
}
}

View File

@@ -0,0 +1,31 @@
import 'package:flutter/material.dart';
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';
class BalanceWidgetProviders extends StatelessWidget {
final Widget child;
const BalanceWidgetProviders({super.key, required this.child});
@override
Widget build(BuildContext context) {
return ChangeNotifierProxyProvider2<
WalletsController,
LedgerAccountsProvider,
BalanceCarouselController
>(
create: (_) => BalanceCarouselController(),
update: (_, walletsController, ledgerProvider, controller) => controller!
..update(
walletsController: walletsController,
ledgerProvider: ledgerProvider,
),
child: child,
);
}
}

View File

@@ -8,11 +8,9 @@ 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/balance_item.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class BalanceWidget extends StatelessWidget {
final ValueChanged<Wallet> onTopUp;
final ValueChanged<Wallet> onWalletTap;
@@ -27,12 +25,13 @@ class BalanceWidget extends StatelessWidget {
Widget build(BuildContext context) {
final walletsController = context.watch<WalletsController>();
final ledgerProvider = context.watch<LedgerAccountsProvider>();
final carousel = context.watch<CarouselIndexController>();
final carousel = context.watch<BalanceCarouselController>();
final loc = AppLocalizations.of(context)!;
final wallets = walletsController.wallets;
final accounts = ledgerProvider.accounts;
final isLoading = walletsController.isLoading &&
final isLoading =
walletsController.isLoading &&
ledgerProvider.isLoading &&
wallets.isEmpty &&
accounts.isEmpty;
@@ -41,40 +40,10 @@ class BalanceWidget extends StatelessWidget {
return const Center(child: CircularProgressIndicator());
}
final items = [
...wallets.map(BalanceItem.wallet),
...accounts.map(BalanceItem.ledger),
const BalanceItem.addAction(),
];
if (items.isEmpty) {
return const SizedBox.shrink();
}
// Ensure index is always valid when list changes
carousel.setIndex(carousel.index, items.length);
final index = carousel.index;
final current = items[index];
// Single source of truth: controller
if (current.isWallet) {
final wallet = current.wallet!;
if (walletsController.selectedWallet?.id != wallet.id) {
walletsController.selectWallet(wallet);
}
}
final carouselWidget = BalanceCarousel(
items: items,
currentIndex: index,
onIndexChanged: (i) {
carousel.setIndex(i, items.length);
final next = items[carousel.index];
if (next.isWallet) {
walletsController.selectWallet(next.wallet!);
}
},
items: carousel.items,
currentIndex: carousel.index,
onIndexChanged: carousel.onPageChanged,
onTopUp: onTopUp,
onWalletTap: onWalletTap,
);

View File

@@ -1,14 +1,12 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/models/payment/type.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/models/dashboard/dashboard_payment_mode.dart';
import 'package:pweb/pages/dashboard/buttons/balance/balance.dart';
import 'package:pweb/pages/dashboard/buttons/balance/controller.dart';
import 'package:pweb/pages/dashboard/buttons/balance/widget.dart';
import 'package:pweb/pages/dashboard/buttons/balance/providers.dart';
import 'package:pweb/pages/dashboard/buttons/buttons.dart';
import 'package:pweb/pages/dashboard/payouts/multiple/widgets/title.dart';
import 'package:pweb/pages/dashboard/payouts/multiple/widget.dart';
@@ -17,7 +15,6 @@ 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;
@@ -86,8 +83,7 @@ class _DashboardPageState extends State<DashboardPage> {
],
),
const SizedBox(height: AppSpacing.medium),
ChangeNotifierProvider(
create: (_) => CarouselIndexController(),
BalanceWidgetProviders(
child: BalanceWidget(
onTopUp: widget.onTopUp,
onWalletTap: widget.onWalletTap,

View File

@@ -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:pshared/provider/payment/amount.dart';
import 'package:pweb/controllers/payments/amount_field.dart';
@@ -15,15 +15,15 @@ class PaymentAmountWidget extends StatelessWidget {
Widget build(BuildContext context) {
return ChangeNotifierProxyProvider2<
PaymentAmountProvider,
WalletsController,
PaymentSourceController,
PaymentAmountFieldController
>(
create: (ctx) {
final initialAmount = ctx.read<PaymentAmountProvider>().amount;
return PaymentAmountFieldController(initialAmount: initialAmount);
},
update: (ctx, amountProvider, wallets, controller) {
controller!.update(amountProvider, wallets);
update: (ctx, amountProvider, source, controller) {
controller!.update(amountProvider, source);
return controller;
},
child: const PaymentAmountField(),

View File

@@ -1,68 +0,0 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/payment/methods/data.dart';
import 'package:pshared/models/payment/type.dart';
import 'package:pweb/pages/payment_methods/form.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class PaymentDetailsSection extends StatelessWidget {
final bool isFormVisible;
final bool isEditable;
final VoidCallback? onToggle;
final PaymentType? selectedType;
final PaymentMethodData? data;
const PaymentDetailsSection({
super.key,
required this.isFormVisible,
this.onToggle,
required this.selectedType,
required this.data,
required this.isEditable,
});
static const double toggleSpacing = 8.0;
static const double formVisibleSpacing = 30.0;
static const double formHiddenSpacing = 20.0;
static const Duration animationDuration = Duration(milliseconds: 200);
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final loc = AppLocalizations.of(context)!;
final toggleIcon = isFormVisible ? Icons.expand_less : Icons.expand_more;
final toggleText = isFormVisible ? loc.hideDetails : loc.showDetails;
return Column(
children: [
if (!isEditable && onToggle != null)
TextButton.icon(
onPressed: onToggle,
icon: Icon(toggleIcon, color: theme.colorScheme.primary),
label: Text(
toggleText,
style: TextStyle(color: theme.colorScheme.primary),
),
),
const SizedBox(height: toggleSpacing),
AnimatedCrossFade(
duration: animationDuration,
crossFadeState: isFormVisible ? CrossFadeState.showFirst : CrossFadeState.showSecond,
firstChild: PaymentMethodForm(
key: const ValueKey('formVisible'),
isEditable: isEditable,
selectedType: selectedType,
onChanged: (_) {},
initialData: data,
),
secondChild: const SizedBox.shrink(key: ValueKey('formHidden')),
),
SizedBox(height: isFormVisible ? formVisibleSpacing : formHiddenSpacing),
],
);
}
}

View File

@@ -1,32 +0,0 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pweb/pages/dashboard/payouts/single/address_book/avatar.dart';
class RecipientHeader extends StatelessWidget{
final Recipient recipient;
const RecipientHeader({super.key, required this.recipient});
final double _avatarRadius = 20;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
return ListTile(
contentPadding: EdgeInsets.zero,
leading: RecipientAvatar(
isVisible: false,
name: recipient.name,
avatarUrl: recipient.avatarUrl,
avatarRadius: _avatarRadius,
nameStyle: Theme.of(context).textTheme.bodyMedium,
),
title: Text(recipient.name, style: theme.textTheme.titleLarge),
subtitle: Text(recipient.email, style: theme.textTheme.bodyLarge),
);
}
}

View File

@@ -14,10 +14,15 @@ class PaymentFeeRow extends StatelessWidget {
@override
Widget build(BuildContext context) => Consumer<QuotationProvider>(
builder: (context, provider, _) => PaymentSummaryRow(
labelFactory: AppLocalizations.of(context)!.fee,
asset: provider.fee,
style: Theme.of(context).textTheme.titleMedium,
),
builder: (context, provider, _) {
final fee = provider.fee;
final l10 = AppLocalizations.of(context)!;
return PaymentSummaryRow(
labelFactory: l10.fee,
asset: fee,
value: fee == null ? l10.noFee : null,
style: Theme.of(context).textTheme.titleMedium,
);
},
);
}

View File

@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/provider/recipient/pmethods.dart';
import 'package:pshared/provider/recipient/provider.dart';
@@ -13,7 +12,6 @@ import 'package:pweb/models/state/visibility.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class PaymentPageBody extends StatelessWidget {
final ValueChanged<Recipient?>? onBack;
final Recipient? recipient;
@@ -23,7 +21,6 @@ class PaymentPageBody extends StatelessWidget {
final PaymentMethodsProvider methodsProvider;
final ControlState sendState;
final int cooldownRemainingSeconds;
final ValueChanged<Wallet> onWalletSelected;
final PayoutDestination fallbackDestination;
final TextEditingController searchController;
final FocusNode searchFocusNode;
@@ -46,7 +43,6 @@ class PaymentPageBody extends StatelessWidget {
required this.methodsProvider,
required this.sendState,
required this.cooldownRemainingSeconds,
required this.onWalletSelected,
required this.fallbackDestination,
required this.searchController,
required this.searchFocusNode,
@@ -70,7 +66,9 @@ class PaymentPageBody extends StatelessWidget {
if (methodsProvider.error != null) {
return PaymentMethodsErrorView(
message: loc.notificationError(methodsProvider.error ?? loc.noErrorInformation),
message: loc.notificationError(
methodsProvider.error ?? loc.noErrorInformation,
),
);
}
@@ -80,7 +78,6 @@ class PaymentPageBody extends StatelessWidget {
recipientProvider: recipientProvider,
searchQuery: searchQuery,
filteredRecipients: filteredRecipients,
onWalletSelected: onWalletSelected,
fallbackDestination: fallbackDestination,
sendState: sendState,
cooldownRemainingSeconds: cooldownRemainingSeconds,

View File

@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/recipient/provider.dart';
@@ -13,14 +12,12 @@ import 'package:pweb/models/state/visibility.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';
class PaymentPageContent extends StatelessWidget {
final ValueChanged<Recipient?>? onBack;
final Recipient? recipient;
final RecipientsProvider recipientProvider;
final String searchQuery;
final List<Recipient> filteredRecipients;
final ValueChanged<Wallet> onWalletSelected;
final PayoutDestination fallbackDestination;
final ControlState sendState;
final int cooldownRemainingSeconds;
@@ -42,7 +39,6 @@ class PaymentPageContent extends StatelessWidget {
required this.recipientProvider,
required this.searchQuery,
required this.filteredRecipients,
required this.onWalletSelected,
required this.fallbackDestination,
required this.sendState,
required this.cooldownRemainingSeconds,
@@ -79,7 +75,6 @@ class PaymentPageContent extends StatelessWidget {
recipientProvider: recipientProvider,
searchQuery: searchQuery,
filteredRecipients: filteredRecipients,
onWalletSelected: onWalletSelected,
fallbackDestination: fallbackDestination,
sendState: sendState,
cooldownRemainingSeconds: cooldownRemainingSeconds,

View File

@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/recipient/provider.dart';
@@ -13,7 +12,6 @@ import 'package:pweb/widgets/sidebar/destinations.dart';
import 'package:pweb/models/state/control_state.dart';
import 'package:pweb/models/state/visibility.dart';
class PaymentPageContentSections extends StatelessWidget {
final AppDimensions dimensions;
final String sourceOfFundsTitle;
@@ -22,7 +20,6 @@ class PaymentPageContentSections extends StatelessWidget {
final RecipientsProvider recipientProvider;
final String searchQuery;
final List<Recipient> filteredRecipients;
final ValueChanged<Wallet> onWalletSelected;
final PayoutDestination fallbackDestination;
final ControlState sendState;
final int cooldownRemainingSeconds;
@@ -46,7 +43,6 @@ class PaymentPageContentSections extends StatelessWidget {
required this.recipientProvider,
required this.searchQuery,
required this.filteredRecipients,
required this.onWalletSelected,
required this.fallbackDestination,
required this.sendState,
required this.cooldownRemainingSeconds,
@@ -77,7 +73,6 @@ class PaymentPageContentSections extends StatelessWidget {
PaymentPageSourceSection(
dimensions: dimensions,
title: sourceOfFundsTitle,
onWalletSelected: onWalletSelected,
),
SizedBox(height: dimensions.paddingXLarge),
PaymentPageRecipientSection(

View File

@@ -1,29 +1,20 @@
import 'package:flutter/material.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/pages/payout_page/send/widgets/source_of_funds_card.dart';
import 'package:pweb/utils/dimensions.dart';
class PaymentPageSourceSection extends StatelessWidget {
final AppDimensions dimensions;
final String title;
final ValueChanged<Wallet> onWalletSelected;
const PaymentPageSourceSection({
super.key,
required this.dimensions,
required this.title,
required this.onWalletSelected,
});
@override
Widget build(BuildContext context) {
return PaymentSourceOfFundsCard(
dimensions: dimensions,
title: title,
onWalletSelected: onWalletSelected,
);
return PaymentSourceOfFundsCard(dimensions: dimensions, title: title);
}
}

View File

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/payment/quotation/quotation.dart';
import 'package:pshared/provider/recipient/pmethods.dart';
@@ -15,7 +14,6 @@ import 'package:pweb/controllers/payments/page_ui.dart';
import 'package:pweb/controllers/payouts/payout_verification.dart';
import 'package:pweb/models/state/control_state.dart';
class PaymentPageView extends StatelessWidget {
final PaymentPageUiController uiController;
final ValueChanged<Recipient?>? onBack;
@@ -50,8 +48,8 @@ class PaymentPageView extends StatelessWidget {
final methodsProvider = context.watch<PaymentMethodsProvider>();
final recipientProvider = context.watch<RecipientsProvider>();
final quotationProvider = context.watch<QuotationProvider>();
final verificationController =
context.watch<PayoutVerificationController>();
final verificationController = context
.watch<PayoutVerificationController>();
final verificationContextKey =
quotationProvider.quotation?.quoteRef ??
quotationProvider.quotation?.idempotencyKey;
@@ -62,10 +60,10 @@ class PaymentPageView extends StatelessWidget {
);
final sendState =
verificationController.isCooldownActiveFor(verificationContextKey)
? ControlState.disabled
: (recipient == null
? ControlState.disabled
: ControlState.enabled);
? ControlState.disabled
: (recipient == null
? ControlState.disabled
: ControlState.enabled);
return PaymentPageBody(
onBack: onBack,
@@ -76,10 +74,8 @@ class PaymentPageView extends StatelessWidget {
filteredRecipients: filteredRecipients,
methodsProvider: methodsProvider,
sendState: sendState,
cooldownRemainingSeconds:
verificationController
.cooldownRemainingSecondsFor(verificationContextKey),
onWalletSelected: context.read<WalletsController>().selectWallet,
cooldownRemainingSeconds: verificationController
.cooldownRemainingSecondsFor(verificationContextKey),
searchController: uiController.searchController,
searchFocusNode: uiController.searchFocusNode,
onSearchChanged: onSearchChanged,

View File

@@ -2,25 +2,16 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/controllers/payment/source.dart';
import 'package:pweb/widgets/payment/source_wallet_selector.dart';
class PaymentMethodSelector extends StatelessWidget {
final ValueChanged<Wallet> onMethodChanged;
const PaymentMethodSelector({
super.key,
required this.onMethodChanged,
});
const PaymentMethodSelector({super.key});
@override
Widget build(BuildContext context) => Consumer<WalletsController>(
builder: (context, provider, _) => SourceWalletSelector(
walletsController: provider,
onChanged: onMethodChanged,
),
);
Widget build(BuildContext context) => Consumer<PaymentSourceController>(
builder: (context, provider, _) =>
SourceWalletSelector(sourceController: provider),
);
}

View File

@@ -2,26 +2,23 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/controllers/payment/source.dart';
import 'package:pweb/pages/payout_page/send/widgets/method_selector.dart';
import 'package:pweb/pages/payout_page/send/widgets/section/title.dart';
import 'package:pweb/pages/payout_page/send/widgets/section/card.dart';
import 'package:pweb/utils/dimensions.dart';
import 'package:pweb/widgets/refresh_balance/ledger.dart';
import 'package:pweb/widgets/refresh_balance/wallet.dart';
class PaymentSourceOfFundsCard extends StatelessWidget {
final AppDimensions dimensions;
final String title;
final ValueChanged<Wallet> onWalletSelected;
const PaymentSourceOfFundsCard({
super.key,
required this.dimensions,
required this.title,
required this.onWalletSelected,
});
@override
@@ -33,21 +30,29 @@ class PaymentSourceOfFundsCard extends StatelessWidget {
Row(
children: [
Expanded(child: SectionTitle(title)),
Consumer<WalletsController>(
Consumer<PaymentSourceController>(
builder: (context, provider, _) {
final selectedWalletId = provider.selectedWallet?.id;
if (selectedWalletId == null) {
return const SizedBox.shrink();
final selectedWallet = provider.selectedWallet;
if (selectedWallet != null) {
return WalletBalanceRefreshButton(
walletRef: selectedWallet.id,
);
}
return WalletBalanceRefreshButton(walletRef: selectedWalletId);
final selectedLedger = provider.selectedLedgerAccount;
if (selectedLedger != null) {
return LedgerBalanceRefreshButton(
ledgerAccountRef: selectedLedger.ledgerAccountRef,
);
}
return const SizedBox.shrink();
},
),
],
),
SizedBox(height: dimensions.paddingSmall),
PaymentMethodSelector(
onMethodChanged: onWalletSelected,
),
const PaymentMethodSelector(),
],
),
);