tech/sendico
2
0
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed ledger account listing + quotation listing

Browse Source
This commit is contained in:
Stephan D
2026-01-23 02:48:10 +01:00
parent 218c4e20b3
commit 41f653775f
60 changed files with 469 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
frontend/pshared/lib/controllers/balance_mask/ledger_accounts.dart Normal file
View File

@@ -0,0 +1,46 @@
import 'package:flutter/foundation.dart';
import 'package:pshared/provider/ledger.dart';
class LedgerBalanceMaskController with ChangeNotifier {
String? _orgRef;
final Set<String> _maskedBalanceRefs = <String>{};
Set<String> _knownAccountRefs = <String>{};
void update(LedgerAccountsProvider accountsProvider) {
final nextOrgRef = accountsProvider.organizationRef;
final orgChanged = nextOrgRef != _orgRef;
if (orgChanged) {
_orgRef = nextOrgRef;
_maskedBalanceRefs.clear();
_knownAccountRefs = <String>{};
}
final refs = accountsProvider.accounts.map((a) => a.ledgerAccountRef).toSet();
_maskedBalanceRefs.removeWhere((id) => !refs.contains(id));
final newRefs = refs.difference(_knownAccountRefs);
if (newRefs.isNotEmpty) {
_maskedBalanceRefs.addAll(newRefs);
}
_knownAccountRefs = refs;
notifyListeners();
}
bool isBalanceMasked(String ledgerAccountRef) => _maskedBalanceRefs.contains(ledgerAccountRef);
bool isBalanceVisible(String ledgerAccountRef) => !isBalanceMasked(ledgerAccountRef);
void toggleBalanceMask(String ledgerAccountRef) {
final existed = _maskedBalanceRefs.remove(ledgerAccountRef);
if (!existed) _maskedBalanceRefs.add(ledgerAccountRef);
notifyListeners();
}
void unmaskAllBalances() {
_maskedBalanceRefs.clear();
notifyListeners();
}
}

106
frontend/pshared/lib/controllers/balance_mask/wallets.dart Normal file
View File

@@ -0,0 +1,106 @@
import 'package:flutter/foundation.dart';
import 'package:collection/collection.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/provider/payment/wallets.dart';
class WalletsController with ChangeNotifier {
late WalletsProvider _wallets;
String? _orgRef;
/// UI-only: wallet refs with masked balances
final Set<String> _maskedBalanceWalletRefs = <String>{};
Set<String> _knownWalletRefs = <String>{};
String? _selectedWalletRef;
bool get isLoading => _wallets.isLoading;
Exception? get error => _wallets.error;
void update(WalletsProvider wallets) {
_wallets = wallets;
final nextOrgRef = wallets.organizationRef;
final orgChanged = nextOrgRef != _orgRef;
if (orgChanged) {
_orgRef = nextOrgRef;
_maskedBalanceWalletRefs.clear();
_knownWalletRefs = <String>{};
_selectedWalletRef = null;
}
// Remove ids that no longer exist
final ids = wallets.wallets.map((w) => w.id).toSet();
_maskedBalanceWalletRefs.removeWhere((id) => !ids.contains(id));
final newIds = ids.difference(_knownWalletRefs);
if (newIds.isNotEmpty) {
_maskedBalanceWalletRefs.addAll(newIds);
}
_knownWalletRefs = ids;
_selectedWalletRef = _resolveSelectedId(
currentRef: _selectedWalletRef,
wallets: wallets.wallets,
);
notifyListeners();
}
List<Wallet> get wallets => _wallets.wallets;
bool isBalanceMasked(String walletRef) => _maskedBalanceWalletRefs.contains(walletRef);
bool isBalanceVisible(String walletRef) => !isBalanceMasked(walletRef);
List<Wallet> get unmaskedWallets =>
wallets.where((w) => !_maskedBalanceWalletRefs.contains(w.id)).toList(growable: false);
Wallet? get selectedWallet {
final id = _selectedWalletRef;
if (id == null) return null;
return wallets.firstWhereOrNull((w) => w.id == id);
}
String? get selectedWalletRef => _selectedWalletRef;
void selectWallet(Wallet wallet) => selectWalletByRef(wallet.id);
void selectWalletByRef(String walletRef) {
if (_selectedWalletRef == walletRef) return;
_selectedWalletRef = walletRef;
notifyListeners();
}
/// Toggle wallet balance masking
void toggleBalanceMask(String walletRef) {
final existed = _maskedBalanceWalletRefs.remove(walletRef);
if (!existed) _maskedBalanceWalletRefs.add(walletRef);
notifyListeners();
}
/// Unmask balances for all wallets (bulk action)
void unmaskAllBalances() {
_maskedBalanceWalletRefs.clear();
notifyListeners();
}
String? _resolveSelectedId({
required String? currentRef,
required List<Wallet> wallets,
}) {
if (wallets.isEmpty) return null;
// Keep current selection if it still exists
if (currentRef != null && wallets.any((w) => w.id == currentRef)) {
return currentRef;
}
// Fallback to the first wallet
return wallets.first.id;
}
}

124
frontend/pshared/lib/controllers/wallets.dart
View File

@@ -1,124 +0,0 @@
import 'package:flutter/foundation.dart';
import 'package:collection/collection.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/provider/payment/wallets.dart';
class WalletsController with ChangeNotifier {
late WalletsProvider _wallets;
String? _orgRef;
/// UI-only: which wallets are allowed to be visible
final Set<String> _visibleWalletRefs = <String>{};
String? _selectedWalletRef;
bool get isLoading => _wallets.isLoading;
Exception? get error => _wallets.error;
void update(WalletsProvider wallets) {
_wallets = wallets;
final nextOrgRef = wallets.organizationRef;
final orgChanged = nextOrgRef != _orgRef;
if (orgChanged) {
_orgRef = nextOrgRef;
_visibleWalletRefs.clear(); // All wallets hidden on org change
_selectedWalletRef = null;
}
// Remove ids that no longer exist
final ids = wallets.wallets.map((w) => w.id).toSet();
_visibleWalletRefs.removeWhere((id) => !ids.contains(id));
_selectedWalletRef = _resolveSelectedId(
currentRef: _selectedWalletRef,
wallets: wallets.wallets,
visibleRefs: _visibleWalletRefs,
);
notifyListeners();
}
List<Wallet> get wallets => _wallets.wallets;
bool isVisible(String walletRef) => _visibleWalletRefs.contains(walletRef);
bool isHidden(String walletRef) => !isVisible(walletRef);
List<Wallet> get visibleWallets =>
wallets.where((w) => _visibleWalletRefs.contains(w.id)).toList(growable: false);
Wallet? get selectedWallet {
final id = _selectedWalletRef;
if (id == null) return null;
return wallets.firstWhereOrNull((w) => w.id == id);
}
String? get selectedWalletRef => _selectedWalletRef;
void selectWallet(Wallet wallet, {bool allowHidden = false}) =>
selectWalletByRef(wallet.id, allowHidden: allowHidden);
void selectWalletByRef(String walletRef, {bool allowHidden = false}) {
if (_selectedWalletRef == walletRef) return;
// Prevent selecting a hidden wallet
if (!allowHidden && !_visibleWalletRefs.contains(walletRef)) return;
_selectedWalletRef = walletRef;
notifyListeners();
}
/// Toggle wallet visibility
void toggleVisibility(String accountRef) {
final existed = _visibleWalletRefs.remove(accountRef);
if (!existed) _visibleWalletRefs.add(accountRef);
_selectedWalletRef = _resolveSelectedId(
currentRef: _selectedWalletRef,
wallets: wallets,
visibleRefs: _visibleWalletRefs,
);
notifyListeners();
}
/// Show all wallets (bulk action)
void showAll() {
final allRefs = wallets.map((w) => w.id);
_visibleWalletRefs
..clear()
..addAll(allRefs);
_selectedWalletRef = _resolveSelectedId(
currentRef: _selectedWalletRef,
wallets: wallets,
visibleRefs: _visibleWalletRefs,
);
notifyListeners();
}
String? _resolveSelectedId({
required String? currentRef,
required List<Wallet> wallets,
required Set<String> visibleRefs,
}) {
if (wallets.isEmpty) return null;
// Keep current selection if it still exists and is visible
if (currentRef != null &&
visibleRefs.contains(currentRef) &&
wallets.any((w) => w.id == currentRef)) {
return currentRef;
}
// Select the first visible wallet
final firstVisible = wallets.firstWhereOrNull((w) => visibleRefs.contains(w.id));
return firstVisible?.id;
}
}

6
frontend/pshared/lib/data/dto/ledger/account.dart
View File

@@ -14,8 +14,10 @@ class LedgerAccountDTO {
final String organizationRef;
final String? ownerRef;
final String accountCode;
@JsonKey(fromJson: ledgerAccountTypeFromJson, toJson: ledgerAccountTypeToJson)
final LedgerAccountTypeDTO accountType;
final String currency;
@JsonKey(fromJson: ledgerAccountStatusFromJson, toJson: ledgerAccountStatusToJson)
final LedgerAccountStatusDTO status;
final bool allowNegative;
final bool isSettlement;
@@ -23,7 +25,7 @@ class LedgerAccountDTO {
final DateTime? createdAt;
final DateTime? updatedAt;
final DescribableDTO describable;
final DescribableDTO? describable;
final LedgerBalanceDTO? balance;
@@ -40,7 +42,7 @@ class LedgerAccountDTO {
this.metadata,
this.createdAt,
this.updatedAt,
required this.describable,
this.describable,
this.balance,
});

31
frontend/pshared/lib/data/dto/ledger/status.dart
View File

@@ -11,3 +11,34 @@ enum LedgerAccountStatusDTO {
@JsonValue('frozen')
frozen,
}
LedgerAccountStatusDTO ledgerAccountStatusFromJson(Object? value) {
final raw = value?.toString() ?? '';
var normalized = raw.trim().toLowerCase();
const prefix = 'account_status_';
if (normalized.startsWith(prefix)) {
normalized = normalized.substring(prefix.length);
}
switch (normalized) {
case 'active':
return LedgerAccountStatusDTO.active;
case 'frozen':
return LedgerAccountStatusDTO.frozen;
case 'unspecified':
case '':
return LedgerAccountStatusDTO.unspecified;
default:
return LedgerAccountStatusDTO.unspecified;
}
}
String ledgerAccountStatusToJson(LedgerAccountStatusDTO value) {
switch (value) {
case LedgerAccountStatusDTO.active:
return 'active';
case LedgerAccountStatusDTO.frozen:
return 'frozen';
case LedgerAccountStatusDTO.unspecified:
return 'unspecified';
}
}

39
frontend/pshared/lib/data/dto/ledger/type.dart
View File

@@ -17,3 +17,42 @@ enum LedgerAccountTypeDTO {
@JsonValue('expense')
expense,
}
LedgerAccountTypeDTO ledgerAccountTypeFromJson(Object? value) {
final raw = value?.toString() ?? '';
var normalized = raw.trim().toLowerCase();
const prefix = 'account_type_';
if (normalized.startsWith(prefix)) {
normalized = normalized.substring(prefix.length);
}
switch (normalized) {
case 'asset':
return LedgerAccountTypeDTO.asset;
case 'liability':
return LedgerAccountTypeDTO.liability;
case 'revenue':
return LedgerAccountTypeDTO.revenue;
case 'expense':
return LedgerAccountTypeDTO.expense;
case 'unspecified':
case '':
return LedgerAccountTypeDTO.unspecified;
default:
return LedgerAccountTypeDTO.unspecified;
}
}
String ledgerAccountTypeToJson(LedgerAccountTypeDTO value) {
switch (value) {
case LedgerAccountTypeDTO.asset:
return 'asset';
case LedgerAccountTypeDTO.liability:
return 'liability';
case LedgerAccountTypeDTO.revenue:
return 'revenue';
case LedgerAccountTypeDTO.expense:
return 'expense';
case LedgerAccountTypeDTO.unspecified:
return 'unspecified';
}
}

3
frontend/pshared/lib/data/mapper/ledger/account.dart
View File

@@ -3,6 +3,7 @@ import 'package:pshared/data/mapper/describable.dart';
import 'package:pshared/data/mapper/ledger/balance.dart';
import 'package:pshared/data/mapper/ledger/status.dart';
import 'package:pshared/data/mapper/ledger/type.dart';
import 'package:pshared/models/describable.dart';
import 'package:pshared/models/ledger/account.dart';
@@ -20,7 +21,7 @@ extension LedgerAccountDTOMapper on LedgerAccountDTO {
metadata: metadata,
createdAt: createdAt,
updatedAt: updatedAt,
describable: describable.toDomain(),
describable: describable?.toDomain() ?? newDescribable(name: '', description: null),
balance: balance?.toDomain(),
);
}

2
frontend/pshared/lib/provider/ledger.dart
View File

@@ -24,7 +24,7 @@ class LedgerAccountsProvider with ChangeNotifier {
Resource<List<LedgerAccount>> _resource = Resource(data: []);
Resource<List<LedgerAccount>> get resource => _resource;
List<LedgerAccount> get accounts => _resource.data ?? [];
List<LedgerAccount> get accounts => (_resource.data ?? []).whereNot((la)=> la.isSettlement).toList();
bool get isLoading => _resource.isLoading;
Exception? get error => _resource.error;

61
frontend/pshared/lib/provider/payment/quotation/intent_builder.dart
View File

@@ -1,12 +1,14 @@
import 'package:collection/collection.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/models/payment/currency_pair.dart';
import 'package:pshared/models/payment/customer.dart';
import 'package:pshared/models/payment/fx/intent.dart';
import 'package:pshared/models/payment/fx/side.dart';
import 'package:pshared/models/payment/kind.dart';
import 'package:pshared/models/payment/methods/card.dart';
import 'package:pshared/models/payment/methods/data.dart';
import 'package:pshared/models/payment/methods/iban.dart';
import 'package:pshared/models/payment/methods/managed_wallet.dart';
import 'package:pshared/models/payment/methods/russian_bank.dart';
import 'package:pshared/models/payment/methods/type.dart';
import 'package:pshared/models/money.dart';
import 'package:pshared/models/payment/settlement_mode.dart';
@@ -15,7 +17,6 @@ import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/payment/amount.dart';
import 'package:pshared/provider/payment/flow.dart';
import 'package:pshared/provider/recipient/provider.dart';
import 'package:pshared/provider/recipient/pmethods.dart';
import 'package:pshared/utils/currency.dart';
@@ -25,15 +26,16 @@ class QuotationIntentBuilder {
required WalletsController wallets,
required PaymentFlowProvider flow,
required RecipientsProvider recipients,
required PaymentMethodsProvider methods,
}) {
final selectedWallet = wallets.selectedWallet;
final method = methods.methods.firstWhereOrNull((m) => m.type == flow.selectedType);
if (selectedWallet == null || method == null) return null;
final paymentData = flow.selectedPaymentData;
final selectedMethod = flow.selectedMethod;
if (selectedWallet == null || paymentData == null) return null;
final customer = _buildCustomer(
recipient: recipients.currentObject,
method: method,
method: selectedMethod,
data: paymentData,
);
final amount = Money(
amount: payment.amount.toString(),
@@ -50,7 +52,7 @@ class QuotationIntentBuilder {
return PaymentIntent(
kind: PaymentKind.payout,
amount: amount,
destination: method.data,
destination: paymentData,
source: ManagedWalletPaymentMethod(
managedWalletRef: selectedWallet.id,
),
@@ -85,11 +87,19 @@ class QuotationIntentBuilder {
return amount.currency;
}
Customer _buildCustomer({
Customer? _buildCustomer({
required Recipient? recipient,
required PaymentMethod method,
required PaymentMethod? method,
required PaymentMethodData? data,
}) {
final name = _resolveCustomerName(method, recipient);
final id = recipient?.id ?? method?.recipientRef;
if (id == null || id.isEmpty) return null;
final name = _resolveCustomerName(
method: method,
data: data,
recipient: recipient,
);
final parts = name == null || name.trim().isEmpty
? const <String>[]
: name.trim().split(RegExp(r'\s+'));
@@ -99,26 +109,31 @@ class QuotationIntentBuilder {
parts.length > 2 ? parts.sublist(1, parts.length - 1).join(' ') : null;
return Customer(
id: recipient?.id ?? method.recipientRef,
id: id,
firstName: firstName,
middleName: middleName,
lastName: lastName,
country: method.cardData?.country,
country: _resolveCustomerCountry(method: method, data: data),
);
}
String? _resolveCustomerName(PaymentMethod method, Recipient? recipient) {
final card = method.cardData;
String? _resolveCustomerName({
required PaymentMethod? method,
required PaymentMethodData? data,
required Recipient? recipient,
}) {
final card = method?.cardData ?? (data is CardPaymentMethod ? data : null);
if (card != null) {
return '${card.firstName} ${card.lastName}'.trim();
final fullName = '${card.firstName} ${card.lastName}'.trim();
if (fullName.isNotEmpty) return fullName;
}
final iban = method.ibanData;
final iban = method?.ibanData ?? (data is IbanPaymentMethod ? data : null);
if (iban != null && iban.accountHolder.trim().isNotEmpty) {
return iban.accountHolder.trim();
}
final bank = method.bankAccountData;
final bank = method?.bankAccountData ?? (data is RussianBankAccountPaymentMethod ? data : null);
if (bank != null && bank.recipientName.trim().isNotEmpty) {
return bank.recipientName.trim();
}
@@ -126,4 +141,12 @@ class QuotationIntentBuilder {
final recipientName = recipient?.name.trim();
return recipientName?.isNotEmpty == true ? recipientName : null;
}
String? _resolveCustomerCountry({
required PaymentMethod? method,
required PaymentMethodData? data,
}) {
final card = method?.cardData ?? (data is CardPaymentMethod ? data : null);
return card?.country;
}
}

5
frontend/pshared/lib/provider/payment/quotation/quotation.dart
View File

@@ -7,7 +7,7 @@ import 'package:logging/logging.dart';
import 'package:uuid/uuid.dart';
import 'package:pshared/api/requests/payment/quote.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/data/mapper/payment/intent/payment.dart';
import 'package:pshared/models/asset.dart';
import 'package:pshared/models/payment/intent.dart';
@@ -38,7 +38,7 @@ class QuotationProvider extends ChangeNotifier {
WalletsController wallets,
PaymentFlowProvider flow,
RecipientsProvider recipients,
PaymentMethodsProvider methods,
PaymentMethodsProvider _methods,
) {
_organizations = venue;
final intent = _intentBuilder.build(
@@ -46,7 +46,6 @@ class QuotationProvider extends ChangeNotifier {
wallets: wallets,
flow: flow,
recipients: recipients,
methods: methods,
);
if (intent == null) return;
final intentKey = _buildIntentKey(intent);

6
frontend/pweb/lib/app/router/payout_shell.dart
View File

@@ -4,7 +4,7 @@ import 'package:go_router/go_router.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/models/payment/type.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/organizations.dart';
@@ -279,7 +279,7 @@ void _openWalletEdit(
Wallet wallet, {
required PayoutDestination returnTo,
}) {
context.read<WalletsController>().selectWallet(wallet, allowHidden: true);
context.read<WalletsController>().selectWallet(wallet);
context.pushToEditWallet(returnTo: returnTo);
}
@@ -288,7 +288,7 @@ void _openWalletTopUp(
Wallet wallet, {
required PayoutDestination returnTo,
}) {
context.read<WalletsController>().selectWallet(wallet, allowHidden: true);
context.read<WalletsController>().selectWallet(wallet);
context.pushToWalletTopUp(returnTo: returnTo);
}

8
frontend/pweb/lib/l10n/en.arb
View File

@@ -116,6 +116,14 @@
"@colDataOwner": {
"description": "Column header for who manages the payout data"
},
"assetOwner": "Owner",
"@assetOwner": {
"description": "Label for selecting the owner of a wallet or ledger account"
},
"organizationOwned": "Organization-owned",
"@organizationOwned": {
"description": "Option label for assets owned by the organization"
},
"colAvatar": "Avatar",
"@colAvatar": {

8
frontend/pweb/lib/l10n/ru.arb
View File

@@ -116,6 +116,14 @@
"@colDataOwner": {
"description": "Заголовок столбца для указания, кто управляет данными о выплатах"
},
"assetOwner": "Владелец",
"@assetOwner": {
"description": "Метка выбора владельца кошелька или счета"
},
"organizationOwned": "Организация",
"@organizationOwned": {
"description": "Опция для активов, принадлежащих организации"
},
"colAvatar": "Аватар",
"@colAvatar": {

7
frontend/pweb/lib/main.dart
View File

@@ -8,7 +8,8 @@ import 'package:provider/provider.dart';
import 'package:logging/logging.dart';
import 'package:pshared/config/constants.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/ledger_accounts.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/provider/locale.dart';
import 'package:pshared/provider/permissions.dart';
import 'package:pshared/provider/account.dart';
@@ -102,6 +103,10 @@ void main() async {
create: (_) => LedgerAccountsProvider(LedgerService()),
update: (context, organizations, provider) => provider!..update(organizations),
),
ChangeNotifierProxyProvider<LedgerAccountsProvider, LedgerBalanceMaskController>(
create: (_) => LedgerBalanceMaskController(),
update: (context, ledger, controller) => controller!..update(ledger),
),
ChangeNotifierProxyProvider<WalletsProvider, WalletsController>(
create: (_) => WalletsController(),
update: (_, wallets, controller) => controller!..update(wallets),

1
frontend/pweb/lib/pages/dashboard/buttons/balance/add/constants.dart
View File

@@ -2,7 +2,6 @@ import 'package:pshared/models/currency.dart';
import 'package:pshared/models/payment/chain_network.dart';
const String orgOwnerRef = '';
const Currency managedCurrencyDefault = Currency.usdt;
const Currency ledgerCurrencyDefault = Currency.rub;
const ChainNetwork managedNetworkDefault = ChainNetwork.tronMainnet;

75
frontend/pweb/lib/pages/dashboard/buttons/balance/add/dialog.dart
View File

@@ -11,7 +11,6 @@ import 'package:pshared/models/payment/type.dart';
import 'package:pshared/models/wallet/chain_asset.dart';
import 'package:pshared/provider/accounts/employees.dart';
import 'package:pshared/provider/ledger.dart';
import 'package:pshared/provider/organizations.dart';
import 'package:pshared/provider/payment/wallets.dart';
import 'package:pshared/utils/currency.dart';
@@ -42,7 +41,7 @@ class _AddBalanceDialogState extends State<AddBalanceDialog> {
final _descriptionController = TextEditingController();
PaymentType _assetType = PaymentType.managedWallet;
String _ownerRef = orgOwnerRef;
String? _ownerRef;
Currency _managedCurrency = managedCurrencyDefault;
ChainNetwork _network = managedNetworkDefault;
Currency _ledgerCurrency = ledgerCurrencyDefault;
@@ -59,10 +58,7 @@ class _AddBalanceDialogState extends State<AddBalanceDialog> {
setState(() => _assetType = value);
}
void _setOwnerRef(String? value) {
if (value == null) return;
setState(() => _ownerRef = value);
}
void _setOwnerRef(String? value) => setState(() => _ownerRef = value);
void _setManagedCurrency(Currency? value) {
if (value == null) return;
@@ -87,13 +83,17 @@ class _AddBalanceDialogState extends State<AddBalanceDialog> {
final name = _nameController.text.trim();
final description = _descriptionController.text.trim();
final employees = context.read<EmployeesProvider>().employees;
final effectiveOwnerRef = employees.any((employee) => employee.id == _ownerRef) ? _ownerRef : orgOwnerRef;
final isOrgWallet = effectiveOwnerRef == orgOwnerRef;
final owner = isOrgWallet ? null : employees.firstWhereOrNull((employee) => employee.id == effectiveOwnerRef);
final effectiveOwnerRef = employees.any((employee) => employee.id == _ownerRef)
? _ownerRef
: null;
final isOrgWallet = effectiveOwnerRef == null;
final owner = isOrgWallet
? null
: employees.firstWhereOrNull((employee) => employee.id == effectiveOwnerRef);
final errorMessage = _assetType == PaymentType.managedWallet
? l10n.errorCreateManagedWallet
: l10n.errorCreateLedgerAccount;
? l10n.errorCreateManagedWallet
: l10n.errorCreateLedgerAccount;
final result = await executeActionWithNotification<bool>(
context: context,
@@ -124,18 +124,18 @@ class _AddBalanceDialogState extends State<AddBalanceDialog> {
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context)!;
final orgName = context.select<OrganizationsProvider, String?>(
(provider) => provider.isOrganizationSet ? provider.current.name : null,
);
final screenWidth = MediaQuery.of(context).size.width;
final maxWidth = (screenWidth - 48).clamp(0.0, double.infinity);
final dialogWidth = maxWidth >= 360.0 ? (maxWidth > 520.0 ? 520.0 : maxWidth) : maxWidth;
final employeesProvider = context.watch<EmployeesProvider>();
final employees = employeesProvider.employees;
final isSaving = context.watch<WalletsProvider>().isLoading ||
context.watch<LedgerAccountsProvider>().isLoading;
final ownerItems = <DropdownMenuItem<String>>[
final ownerItems = <DropdownMenuItem<String?>>[
DropdownMenuItem(
value: orgOwnerRef,
child: Text(orgName ?? l10n.companyName),
value: null,
child: Text(l10n.organizationOwned),
),
...employees.map((employee) => DropdownMenuItem(
value: employee.id,
@@ -143,29 +143,30 @@ class _AddBalanceDialogState extends State<AddBalanceDialog> {
)),
];
final resolvedOwnerRef = ownerItems.any((item) => item.value == _ownerRef)
? _ownerRef
: orgOwnerRef;
final resolvedOwnerRef = ownerItems.any((item) => item.value == _ownerRef) ? _ownerRef : null;
return AlertDialog(
title: Text(l10n.actionAddNew),
content: AddBalanceForm(
formKey: _formKey,
assetType: _assetType,
isSaving: isSaving,
ownerItems: ownerItems,
ownerValue: resolvedOwnerRef,
onAssetTypeChanged: _setAssetType,
onOwnerChanged: _setOwnerRef,
nameController: _nameController,
descriptionController: _descriptionController,
managedCurrency: _managedCurrency,
network: _network,
ledgerCurrency: _ledgerCurrency,
onManagedCurrencyChanged: _setManagedCurrency,
onNetworkChanged: _setNetwork,
onLedgerCurrencyChanged: _setLedgerCurrency,
showEmployeesLoading: employeesProvider.isLoading,
content: SizedBox(
width: dialogWidth,
child: AddBalanceForm(
formKey: _formKey,
assetType: _assetType,
isSaving: isSaving,
ownerItems: ownerItems,
ownerValue: resolvedOwnerRef,
onAssetTypeChanged: _setAssetType,
onOwnerChanged: _setOwnerRef,
nameController: _nameController,
descriptionController: _descriptionController,
managedCurrency: _managedCurrency,
network: _network,
ledgerCurrency: _ledgerCurrency,
onManagedCurrencyChanged: _setManagedCurrency,
onNetworkChanged: _setNetwork,
onLedgerCurrencyChanged: _setLedgerCurrency,
showEmployeesLoading: employeesProvider.isLoading,
),
),
actions: [
DialogCancelButton(

4
frontend/pweb/lib/pages/dashboard/buttons/balance/add/form.dart
View File

@@ -17,8 +17,8 @@ class AddBalanceForm extends StatelessWidget {
final GlobalKey<FormState> formKey;
final PaymentType assetType;
final bool isSaving;
final List<DropdownMenuItem<String>> ownerItems;
final String ownerValue;
final List<DropdownMenuItem<String?>> ownerItems;
final String? ownerValue;
final ValueChanged<PaymentType?> onAssetTypeChanged;
final ValueChanged<String?> onOwnerChanged;
final TextEditingController nameController;

10
frontend/pweb/lib/pages/dashboard/buttons/balance/add/owner.dart
View File

@@ -6,8 +6,8 @@ import 'package:pweb/generated/i18n/app_localizations.dart';
class OwnerField extends StatelessWidget {
final String value;
final List<DropdownMenuItem<String>> items;
final String? value;
final List<DropdownMenuItem<String?>> items;
final ValueChanged<String?>? onChanged;
const OwnerField({
@@ -18,9 +18,9 @@ class OwnerField extends StatelessWidget {
});
@override
Widget build(BuildContext context) => DropdownButtonFormField<String>(
initialValue: value,
decoration: getInputDecoration(context, AppLocalizations.of(context)!.colDataOwner, true),
Widget build(BuildContext context) => DropdownButtonFormField<String?>(
value: value,
decoration: getInputDecoration(context, AppLocalizations.of(context)!.assetOwner, true),
items: items,
onChanged: onChanged,
);

18
frontend/pweb/lib/pages/dashboard/buttons/balance/amount.dart
View File

@@ -2,19 +2,19 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/utils/currency.dart';
class BalanceAmount extends StatelessWidget {
final Wallet wallet;
final VoidCallback onToggleVisibility;
final VoidCallback onToggleMask;
const BalanceAmount({
super.key,
required this.wallet,
required this.onToggleVisibility,
required this.onToggleMask,
});
static const double _iconSpacing = 12.0;
@@ -25,13 +25,13 @@ class BalanceAmount extends StatelessWidget {
final textTheme = Theme.of(context).textTheme;
final colorScheme = Theme.of(context).colorScheme;
final currencyBalance = currencyCodeToSymbol(wallet.currency);
final wallets = context.read<WalletsController>();
final wallets = context.watch<WalletsController>();
final isMasked = wallets.isBalanceMasked(wallet.id);
return Row(
children: [
Text(
wallets.isHidden(wallet.id) ? '•••• $currencyBalance' : '${amountToString(wallet.balance)} $currencyBalance',
isMasked ? '•••• $currencyBalance' : '${amountToString(wallet.balance)} $currencyBalance',
style: textTheme.headlineSmall?.copyWith(
fontWeight: FontWeight.bold,
color: colorScheme.onSurface,
@@ -39,9 +39,9 @@ class BalanceAmount extends StatelessWidget {
),
const SizedBox(width: _iconSpacing),
GestureDetector(
onTap: onToggleVisibility,
onTap: onToggleMask,
child: Icon(
wallets.isHidden(wallet.id) ? Icons.visibility_off : Icons.visibility,
isMasked ? Icons.visibility_off : Icons.visibility,
size: _iconSize,
color: colorScheme.onSurface,
),
@@ -49,4 +49,4 @@ class BalanceAmount extends StatelessWidget {
],
);
}
}
}

2
frontend/pweb/lib/pages/dashboard/buttons/balance/balance.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/provider/ledger.dart';
import 'package:pshared/models/payment/wallet.dart';

6
frontend/pweb/lib/pages/dashboard/buttons/balance/card.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.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';
@@ -56,8 +56,8 @@ class WalletCard extends StatelessWidget {
children: [
BalanceAmount(
wallet: wallet,
onToggleVisibility: () {
context.read<WalletsController>().toggleVisibility(wallet.id);
onToggleMask: () {
context.read<WalletsController>().toggleBalanceMask(wallet.id);
},
),
WalletBalanceRefreshButton(

50
frontend/pweb/lib/pages/dashboard/buttons/balance/ledger.dart
View File

@@ -1,13 +1,17 @@
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:pweb/generated/i18n/app_localizations.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;
@@ -38,6 +42,20 @@ class LedgerAccountCard extends StatelessWidget {
}
}
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;
@@ -64,12 +82,30 @@ class LedgerAccountCard extends StatelessWidget {
),
Row(
children: [
Text(
_formatBalance(),
style: textTheme.headlineSmall?.copyWith(
fontWeight: FontWeight.bold,
color: colorScheme.onSurface,
),
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(

2
frontend/pweb/lib/pages/dashboard/payouts/quote_status/quote_status.dart
View File

@@ -3,9 +3,9 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/models/payment/quote/status_type.dart';
import 'package:pweb/providers/quotation/quotation.dart';
import 'package:pweb/pages/dashboard/payouts/quote_status/widgets/body.dart';
import 'package:pweb/providers/quotation/quotation.dart';
import 'package:pweb/utils/quote_duration_format.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';

2
frontend/pweb/lib/pages/dashboard/payouts/summary/widget.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/utils/currency.dart';
import 'package:pweb/pages/dashboard/payouts/summary/fee.dart';

2
frontend/pweb/lib/pages/payment_methods/page.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/models/payment/type.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/payment/flow.dart';

2
frontend/pweb/lib/pages/payment_methods/payment_page/content.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/models/recipient/recipient.dart';
import 'package:pshared/provider/recipient/provider.dart';

2
frontend/pweb/lib/pages/payment_methods/payment_page/method_selector.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pweb/utils/payment/dropdown.dart';

6
frontend/pweb/lib/pages/payout_page/wallet/card.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/utils/currency.dart';
import 'package:pshared/models/payment/wallet.dart';
@@ -50,8 +50,8 @@ class WalletCard extends StatelessWidget {
children: [
BalanceAmount(
wallet: wallet,
onToggleVisibility: () {
context.read<WalletsController>().toggleVisibility(wallet.id);
onToggleMask: () {
context.read<WalletsController>().toggleBalanceMask(wallet.id);
},
),
WalletBalanceRefreshButton(

2
frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/send.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/models/payment/type.dart';
import 'package:pweb/app/router/payout_routes.dart';

2
frontend/pweb/lib/pages/payout_page/wallet/edit/buttons/top_up.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pweb/app/router/payout_routes.dart';
import 'package:pweb/widgets/sidebar/destinations.dart';

4
frontend/pweb/lib/pages/payout_page/wallet/edit/fields.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.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';
@@ -30,7 +30,7 @@ class WalletEditFields extends StatelessWidget {
Expanded(
child: BalanceAmount(
wallet: wallet,
onToggleVisibility: () => controller.toggleVisibility(wallet.id),
onToggleMask: () => controller.toggleBalanceMask(wallet.id),
),
),
WalletBalanceRefreshButton(walletRef: wallet.id),

2
frontend/pweb/lib/pages/payout_page/wallet/edit/header.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pweb/generated/i18n/app_localizations.dart';

2
frontend/pweb/lib/pages/payout_page/wallet/edit/page.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pweb/pages/payout_page/wallet/edit/buttons/buttons.dart';
import 'package:pweb/pages/payout_page/wallet/edit/fields.dart';

2
frontend/pweb/lib/pages/wallet_top_up/page.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/wallets.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pweb/pages/wallet_top_up/content.dart';