refactor of money utils with new money2 package

This commit is contained in:
Arseni
2026-03-13 03:17:29 +03:00
parent b4eb1437f6
commit 0091191d97
72 changed files with 453 additions and 982 deletions

View File

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

View File

@@ -8,11 +8,9 @@ import 'package:pshared/models/currency.dart';
import 'package:pshared/models/describable.dart';
import 'package:pshared/models/payment/chain_network.dart';
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/payment/wallets.dart';
import 'package:pshared/utils/currency.dart';
import 'package:pweb/pages/dashboard/buttons/balance/add/form.dart';
import 'package:pweb/pages/dashboard/buttons/balance/add/constants.dart';
@@ -42,9 +40,9 @@ class _AddBalanceDialogState extends State<AddBalanceDialog> {
PaymentType _assetType = PaymentType.managedWallet;
String? _ownerRef;
Currency _managedCurrency = managedCurrencyDefault;
CurrencyCode _managedCurrency = managedCurrencyDefault;
ChainNetwork _network = managedNetworkDefault;
Currency _ledgerCurrency = ledgerCurrencyDefault;
CurrencyCode _ledgerCurrency = ledgerCurrencyDefault;
@override
void dispose() {
@@ -60,7 +58,7 @@ class _AddBalanceDialogState extends State<AddBalanceDialog> {
void _setOwnerRef(String? value) => setState(() => _ownerRef = value);
void _setManagedCurrency(Currency? value) {
void _setManagedCurrency(CurrencyCode? value) {
if (value == null) return;
setState(() => _managedCurrency = value);
}
@@ -70,7 +68,7 @@ class _AddBalanceDialogState extends State<AddBalanceDialog> {
setState(() => _network = value);
}
void _setLedgerCurrency(Currency? value) {
void _setLedgerCurrency(CurrencyCode? value) {
if (value == null) return;
setState(() => _ledgerCurrency = value);
}
@@ -102,7 +100,8 @@ class _AddBalanceDialogState extends State<AddBalanceDialog> {
if (_assetType == PaymentType.managedWallet) {
await context.read<WalletsProvider>().create(
describable: newDescribable(name: name, description: description),
asset: ChainAsset(chain: _network, tokenSymbol: currencyCodeToString(_managedCurrency)),
chain: _network,
currency: _managedCurrency,
ownerRef: owner?.id,
);
} else {

View File

@@ -23,12 +23,12 @@ class AddBalanceForm extends StatelessWidget {
final ValueChanged<String?> onOwnerChanged;
final TextEditingController nameController;
final TextEditingController descriptionController;
final Currency managedCurrency;
final CurrencyCode managedCurrency;
final ChainNetwork network;
final Currency ledgerCurrency;
final ValueChanged<Currency?> onManagedCurrencyChanged;
final CurrencyCode ledgerCurrency;
final ValueChanged<CurrencyCode?> onManagedCurrencyChanged;
final ValueChanged<ChainNetwork?> onNetworkChanged;
final ValueChanged<Currency?> onLedgerCurrencyChanged;
final ValueChanged<CurrencyCode?> onLedgerCurrencyChanged;
final bool showEmployeesLoading;
const AddBalanceForm({

View File

@@ -4,7 +4,7 @@ import 'package:pshared/models/currency.dart';
import 'package:pshared/utils/currency.dart';
DropdownMenuItem<Currency> currencyItem(Currency currency) => DropdownMenuItem(
DropdownMenuItem<CurrencyCode> currencyItem(CurrencyCode currency) => DropdownMenuItem(
value: currency,
child: Text(currencyCodeToString(currency)),
);

View File

@@ -10,8 +10,8 @@ import 'package:pweb/generated/i18n/app_localizations.dart';
class LedgerFields extends StatelessWidget {
final Currency currency;
final ValueChanged<Currency?>? onCurrencyChanged;
final CurrencyCode currency;
final ValueChanged<CurrencyCode?>? onCurrencyChanged;
const LedgerFields({
super.key,
@@ -20,7 +20,7 @@ class LedgerFields extends StatelessWidget {
});
@override
Widget build(BuildContext context) => DropdownButtonFormField<Currency>(
Widget build(BuildContext context) => DropdownButtonFormField<CurrencyCode>(
initialValue: currency,
decoration: getInputDecoration(context, AppLocalizations.of(context)!.currency, true),
items: [

View File

@@ -12,9 +12,9 @@ import 'package:pweb/generated/i18n/app_localizations.dart';
class ManagedWalletFields extends StatelessWidget {
final Currency currency;
final CurrencyCode currency;
final ChainNetwork network;
final ValueChanged<Currency?>? onCurrencyChanged;
final ValueChanged<CurrencyCode?>? onCurrencyChanged;
final ValueChanged<ChainNetwork?>? onNetworkChanged;
const ManagedWalletFields({
@@ -31,7 +31,7 @@ class ManagedWalletFields extends StatelessWidget {
return Column(
spacing: 12,
children: [
DropdownButtonFormField<Currency>(
DropdownButtonFormField<CurrencyCode>(
initialValue: currency,
decoration: getInputDecoration(context, l10n.currency, true),
items: [

View File

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:pshared/controllers/balance_mask/wallets.dart';
import 'package:pshared/models/money.dart';
import 'package:pshared/models/payment/wallet.dart';
import 'package:pshared/utils/currency.dart';
@@ -28,12 +27,10 @@ class BalanceAmount extends StatelessWidget {
final textTheme = Theme.of(context).textTheme;
final colorScheme = Theme.of(context).colorScheme;
final currencyBalance = currencyCodeToSymbol(wallet.currency);
final formattedBalance = formatMoneyUi(
final formattedBalance = formatAmountUi(
context,
Money(
amount: amountToString(wallet.balance),
currency: currencyCodeToString(wallet.currency),
),
amount: wallet.balance,
currency: currencyCodeToString(wallet.currency),
);
final wallets = context.watch<WalletsController>();
final isMasked = wallets.isBalanceMasked(wallet.id);