diff --git a/lib/ui/transaction/transaction_presenter.dart b/lib/ui/transaction/transaction_presenter.dart index 0cd54b5aa..23ee2d01a 100644 --- a/lib/ui/transaction/transaction_presenter.dart +++ b/lib/ui/transaction/transaction_presenter.dart @@ -17,7 +17,6 @@ class TransactionPresenter extends EntityPresenter { TransactionFields.date, TransactionFields.description, TransactionFields.category, - TransactionFields.bankAccount, TransactionFields.invoice, TransactionFields.expense, ]; @@ -27,6 +26,7 @@ class TransactionPresenter extends EntityPresenter { return [ ...getDefaultTableFields(userCompany), ...EntityPresenter.getBaseFields(), + TransactionFields.bankAccount, TransactionFields.currency, ]; } diff --git a/lib/ui/transaction/view/transaction_view.dart b/lib/ui/transaction/view/transaction_view.dart index 7d0bb90bc..f815ce725 100644 --- a/lib/ui/transaction/view/transaction_view.dart +++ b/lib/ui/transaction/view/transaction_view.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:invoiceninja_flutter/ui/app/entity_header.dart'; +import 'package:invoiceninja_flutter/ui/app/lists/list_divider.dart'; import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart'; import 'package:invoiceninja_flutter/ui/transaction/view/transaction_view_vm.dart'; import 'package:invoiceninja_flutter/ui/app/view_scaffold.dart'; @@ -33,10 +34,24 @@ class _TransactionViewState extends State { body: ScrollableListView( children: [ EntityHeader( - entity: transaction, - label: localization.amount, - value: formatNumber(transaction.amount, context, - currencyId: transaction.currencyId)), + entity: transaction, + label: transaction.isDeposit + ? localization.deposit + : localization.withdrawal, + value: formatNumber(transaction.amount, context, + currencyId: transaction.currencyId), + secondLabel: localization.date, + secondValue: formatDate(transaction.date, context), + ), + ListDivider(), + Padding( + padding: EdgeInsets.all(20), + child: Text( + transaction.description, + style: TextStyle(fontSize: 16), + ), + ), + ListDivider(), ], ), );