kolo/Casha
1
0
Fork 0
mirror of https://github.com/koloideal/Casha.git synced 2026-06-10 10:25:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
kolo
2026-03-24 15:24:59 +03:00
parent 5888e0d196
commit bb4580ec49
4 changed files with 51 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/dashboard/widgets/account_editor_overlay.dart
+13 -16
View File
@@ -33,7 +33,6 @@ class _AccountEditorOverlayState extends State<AccountEditorOverlay> {
dynamic get dash => widget.dashboardState;
late TextEditingController _nameController;
late String _selectedCurrency;
late String _originalCurrency;
bool _showCurrencyDropdown = false;
bool _showLimitError = false;
@@ -42,7 +41,6 @@ class _AccountEditorOverlayState extends State<AccountEditorOverlay> {
super.initState();
_nameController = TextEditingController(text: dash.tempAccountName);
_selectedCurrency = dash.tempAccountCurrency;
_originalCurrency = dash.tempAccountCurrency;
_nameController.addListener(() {
final text = _nameController.text;
@@ -91,24 +89,23 @@ class _AccountEditorOverlayState extends State<AccountEditorOverlay> {
builder: (context, ref, _) {
final exchangeService = ref.watch(exchangeRateServiceProvider);
// Get the original balance from the editing account
double originalBalance = ref.read(totalBalanceProvider);
// Calculate preview balance fresh from raw transactions
double previewBalance = 0.0;
if (dash.editingAccount != null) {
// Get the account's actual balance
final txs = ref.watch(accountFilteredTransactionsProvider);
final accountTxs = txs.where((t) => t.accountId == dash.editingAccount!.id);
originalBalance = accountTxs.fold<double>(
0.0,
(sum, t) => sum + (t.type == TransactionType.income ? t.amount : -t.amount),
);
previewBalance = accountTxs.fold(0.0, (sum, t) {
final converted = exchangeService.convert(
t.amount,
t.currencyCode,
dash.tempAccountCurrency, // convert directly from tx currency to selected dropdown currency
);
return t.type == TransactionType.income ? sum + converted : sum - converted;
});
} else {
// Fallback just in case, though editingAccount should never be null here
previewBalance = ref.read(totalBalanceProvider);
}
// Convert to the preview currency
final previewBalance = exchangeService.convert(
originalBalance,
_originalCurrency,
dash.tempAccountCurrency,
);
return Material(
color: Colors.transparent,
lib/features/dashboard/widgets/balance_card_carousel.dart
+14 -1
View File
@@ -92,8 +92,21 @@ class _BalanceCardCarouselState extends ConsumerState<BalanceCardCarousel> {
final account = accounts[index - 1];
final accountColors = ref.watch(accountCardColorsProvider(account.id));
// Calculate this specific account's balance
final txs = ref.watch(transactionsProvider).valueOrNull ?? [];
final accountTxs = txs.where((t) => t.accountId == account.id).toList();
final exchangeService = ref.watch(exchangeRateServiceProvider);
final accountBalance = accountTxs.fold(0.0, (sum, t) {
final converted = exchangeService.convert(
t.amount,
t.currencyCode,
account.currency, // target is the account's own currency
);
return t.type == TransactionType.income ? sum + converted : sum - converted;
});
cardWidget = BalanceCard(
balance: widget.balance,
balance: accountBalance, // Use the dynamically calculated balance!
currencyInfo: CurrencyInfo(
currencyMap[account.currency]?.symbol ?? '\$',
account.currency,