WIP: integration with ledger
This commit is contained in:
@@ -16,10 +16,92 @@ import 'package:pweb/generated/i18n/app_localizations.dart';
|
||||
class BalanceWidget extends StatelessWidget {
|
||||
final ValueChanged<Wallet> onTopUp;
|
||||
|
||||
const BalanceWidget({
|
||||
super.key,
|
||||
required this.onTopUp,
|
||||
});
|
||||
const BalanceWidget({super.key, required this.onTopUp});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) => _BalanceWidgetBody(onTopUp: onTopUp);
|
||||
}
|
||||
|
||||
class _BalanceWidgetBody extends StatefulWidget {
|
||||
final ValueChanged<Wallet> onTopUp;
|
||||
|
||||
const _BalanceWidgetBody({required this.onTopUp});
|
||||
|
||||
@override
|
||||
State<_BalanceWidgetBody> createState() => _BalanceWidgetBodyState();
|
||||
}
|
||||
|
||||
class _BalanceWidgetBodyState extends State<_BalanceWidgetBody> {
|
||||
WalletsController? _walletsController;
|
||||
LedgerAccountsProvider? _ledgerProvider;
|
||||
CarouselIndexController? _carouselController;
|
||||
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
super.didChangeDependencies();
|
||||
final nextWallets = context.read<WalletsController>();
|
||||
final nextLedger = context.read<LedgerAccountsProvider>();
|
||||
final nextCarousel = context.read<CarouselIndexController>();
|
||||
|
||||
if (!identical(_walletsController, nextWallets)) {
|
||||
_walletsController?.removeListener(_syncSelection);
|
||||
_walletsController = nextWallets;
|
||||
_walletsController?.addListener(_syncSelection);
|
||||
}
|
||||
|
||||
if (!identical(_ledgerProvider, nextLedger)) {
|
||||
_ledgerProvider?.removeListener(_syncSelection);
|
||||
_ledgerProvider = nextLedger;
|
||||
_ledgerProvider?.addListener(_syncSelection);
|
||||
}
|
||||
|
||||
if (!identical(_carouselController, nextCarousel)) {
|
||||
_carouselController?.removeListener(_syncSelection);
|
||||
_carouselController = nextCarousel;
|
||||
_carouselController?.addListener(_syncSelection);
|
||||
}
|
||||
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) => _syncSelection());
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_walletsController?.removeListener(_syncSelection);
|
||||
_ledgerProvider?.removeListener(_syncSelection);
|
||||
_carouselController?.removeListener(_syncSelection);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _syncSelection() {
|
||||
final walletsController = _walletsController;
|
||||
final carousel = _carouselController;
|
||||
final ledgerProvider = _ledgerProvider;
|
||||
if (walletsController == null ||
|
||||
carousel == null ||
|
||||
ledgerProvider == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
final items = <BalanceItem>[
|
||||
...walletsController.wallets.map(BalanceItem.wallet),
|
||||
...ledgerProvider.accounts.map(BalanceItem.ledger),
|
||||
const BalanceItem.addAction(),
|
||||
];
|
||||
if (items.isEmpty) return;
|
||||
|
||||
final safeIndex = carousel.index.clamp(0, items.length - 1);
|
||||
if (safeIndex != carousel.index) {
|
||||
carousel.setIndex(safeIndex, items.length);
|
||||
return;
|
||||
}
|
||||
|
||||
final current = items[safeIndex];
|
||||
if (!current.isWallet) return;
|
||||
final wallet = current.wallet!;
|
||||
if (walletsController.selectedWallet?.id != wallet.id) {
|
||||
walletsController.selectWallet(wallet);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -30,7 +112,8 @@ class BalanceWidget extends StatelessWidget {
|
||||
|
||||
final wallets = walletsController.wallets;
|
||||
final accounts = ledgerProvider.accounts;
|
||||
final isLoading = walletsController.isLoading &&
|
||||
final isLoading =
|
||||
walletsController.isLoading &&
|
||||
ledgerProvider.isLoading &&
|
||||
wallets.isEmpty &&
|
||||
accounts.isEmpty;
|
||||
@@ -49,19 +132,7 @@ class BalanceWidget extends StatelessWidget {
|
||||
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 index = carousel.index.clamp(0, items.length - 1);
|
||||
|
||||
final carouselWidget = BalanceCarousel(
|
||||
items: items,
|
||||
@@ -73,7 +144,7 @@ class BalanceWidget extends StatelessWidget {
|
||||
walletsController.selectWallet(next.wallet!);
|
||||
}
|
||||
},
|
||||
onTopUp: onTopUp,
|
||||
onTopUp: widget.onTopUp,
|
||||
);
|
||||
|
||||
if (wallets.isEmpty && accounts.isEmpty) {
|
||||
|
||||
@@ -2,12 +2,13 @@ import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import 'package:pshared/controllers/payment/source.dart';
|
||||
import 'package:pshared/models/payment/source.dart';
|
||||
import 'package:pshared/provider/payment/amount.dart';
|
||||
import 'package:pshared/utils/currency.dart';
|
||||
|
||||
import 'package:pweb/generated/i18n/app_localizations.dart';
|
||||
|
||||
|
||||
class PaymentAmountWidget extends StatefulWidget {
|
||||
const PaymentAmountWidget({super.key});
|
||||
|
||||
@@ -32,7 +33,8 @@ class _PaymentAmountWidgetState extends State<PaymentAmountWidget> {
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
double? _parseAmount(String value) => double.tryParse(value.replaceAll(',', '.'));
|
||||
double? _parseAmount(String value) =>
|
||||
double.tryParse(value.replaceAll(',', '.'));
|
||||
|
||||
void _syncTextWithAmount(double amount) {
|
||||
final parsedText = _parseAmount(_controller.text);
|
||||
@@ -58,14 +60,28 @@ class _PaymentAmountWidgetState extends State<PaymentAmountWidget> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final amount = context.select<PaymentAmountProvider, double>((provider) => provider.amount);
|
||||
final amount = context.select<PaymentAmountProvider, double>(
|
||||
(provider) => provider.amount,
|
||||
);
|
||||
final source = context.watch<PaymentSourceController>().selectedSource;
|
||||
_syncTextWithAmount(amount);
|
||||
final sourceCurrency = switch (source?.type) {
|
||||
null => null,
|
||||
PaymentSourceType.wallet => currencyCodeToString(
|
||||
source!.wallet!.currency,
|
||||
),
|
||||
PaymentSourceType.ledger =>
|
||||
source!.ledgerAccount?.currency.trim().toUpperCase(),
|
||||
};
|
||||
final amountLabel = sourceCurrency == null || sourceCurrency.isEmpty
|
||||
? AppLocalizations.of(context)!.amount
|
||||
: '${AppLocalizations.of(context)!.amount} ($sourceCurrency)';
|
||||
|
||||
return TextField(
|
||||
controller: _controller,
|
||||
keyboardType: const TextInputType.numberWithOptions(decimal: true),
|
||||
decoration: InputDecoration(
|
||||
labelText: AppLocalizations.of(context)!.amount,
|
||||
labelText: amountLabel,
|
||||
border: const OutlineInputBorder(),
|
||||
),
|
||||
onChanged: _onChanged,
|
||||
|
||||
@@ -2,7 +2,9 @@ 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/models/currency.dart';
|
||||
import 'package:pshared/models/payment/source.dart';
|
||||
import 'package:pshared/utils/currency.dart';
|
||||
|
||||
import 'package:pweb/pages/dashboard/payouts/summary/fee.dart';
|
||||
@@ -10,24 +12,43 @@ import 'package:pweb/pages/dashboard/payouts/summary/recipient_receives.dart';
|
||||
import 'package:pweb/pages/dashboard/payouts/summary/sent_amount.dart';
|
||||
import 'package:pweb/pages/dashboard/payouts/summary/total.dart';
|
||||
|
||||
|
||||
class PaymentSummary extends StatelessWidget {
|
||||
final double spacing;
|
||||
|
||||
const PaymentSummary({super.key, required this.spacing});
|
||||
|
||||
Currency _currencyForSource(PaymentSource? source) {
|
||||
if (source == null) return Currency.usdt;
|
||||
return switch (source.type) {
|
||||
PaymentSourceType.wallet => source.wallet!.currency,
|
||||
PaymentSourceType.ledger => () {
|
||||
final code = source.ledgerAccount?.currency.trim().toUpperCase() ?? '';
|
||||
try {
|
||||
return currencyStringToCode(code);
|
||||
} catch (_) {
|
||||
return Currency.rub;
|
||||
}
|
||||
}(),
|
||||
};
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) => Align(
|
||||
alignment: Alignment.center,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
PaymentSentAmountRow(currency: currencyStringToCode(context.read<WalletsController>().selectedWallet?.tokenSymbol ?? 'USDT')),
|
||||
const PaymentFeeRow(),
|
||||
const PaymentRecipientReceivesRow(),
|
||||
SizedBox(height: spacing),
|
||||
const PaymentTotalRow(),
|
||||
],
|
||||
),
|
||||
);
|
||||
Widget build(BuildContext context) {
|
||||
final source = context.watch<PaymentSourceController>().selectedSource;
|
||||
final sentCurrency = _currencyForSource(source);
|
||||
|
||||
return Align(
|
||||
alignment: Alignment.center,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
PaymentSentAmountRow(currency: sentCurrency),
|
||||
const PaymentFeeRow(),
|
||||
const PaymentRecipientReceivesRow(),
|
||||
SizedBox(height: spacing),
|
||||
const PaymentTotalRow(),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user