From 1fe33ed0f9fce2668bbe233df6c9b40c606f3b49 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 14 Jun 2019 12:26:07 +0300
Subject: [PATCH] Expenses

---
 lib/ui/invoice/view/invoice_view.dart    |  3 ++-
 lib/ui/payment/view/payment_view.dart    |  8 ++++----
 lib/ui/payment/view/payment_view_vm.dart | 12 ++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/ui/invoice/view/invoice_view.dart b/lib/ui/invoice/view/invoice_view.dart
index 545c36b01..ca1bc71da 100644
--- a/lib/ui/invoice/view/invoice_view.dart
+++ b/lib/ui/invoice/view/invoice_view.dart
@@ -15,6 +15,7 @@ import 'package:invoiceninja_flutter/ui/app/icon_message.dart';
 import 'package:invoiceninja_flutter/ui/app/invoice/invoice_item_view.dart';
 import 'package:invoiceninja_flutter/ui/app/two_value_header.dart';
 import 'package:invoiceninja_flutter/ui/invoice/view/invoice_view_vm.dart';
+import 'package:invoiceninja_flutter/utils/icons.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 
 class InvoiceView extends StatefulWidget {
@@ -102,7 +103,7 @@ class _InvoiceViewState extends State<InvoiceView> {
           color: Theme.of(context).canvasColor,
           child: ListTile(
             title: Text(client?.displayName ?? ''),
-            leading: Icon(FontAwesomeIcons.users, size: 18.0),
+            leading: Icon(getEntityIcon(EntityType.client), size: 18.0),
             trailing: Icon(Icons.navigate_next),
             onTap: () => viewModel.onClientPressed(context),
             onLongPress: () => viewModel.onClientPressed(context, true),
diff --git a/lib/ui/payment/view/payment_view.dart b/lib/ui/payment/view/payment_view.dart
index 1aa25e2fd..c3900f539 100644
--- a/lib/ui/payment/view/payment_view.dart
+++ b/lib/ui/payment/view/payment_view.dart
@@ -102,8 +102,8 @@ class _PaymentViewState extends State<PaymentView> {
                 title: Text(client.displayName ?? ''),
                 leading: Icon(FontAwesomeIcons.users, size: 18.0),
                 trailing: Icon(Icons.navigate_next),
-                onTap: () => viewModel.onTapClient(context),
-                onLongPress: () => viewModel.onTapClient(context, true),
+                onTap: () => viewModel.onClientPressed(context),
+                onLongPress: () => viewModel.onClientPressed(context, true),
               ),
             ),
             Container(
@@ -116,8 +116,8 @@ class _PaymentViewState extends State<PaymentView> {
                 title: Text('${localization.invoice} ${invoice.invoiceNumber}'),
                 leading: Icon(FontAwesomeIcons.filePdf, size: 18.0),
                 trailing: Icon(Icons.navigate_next),
-                onTap: () => viewModel.onTapInvoice(context),
-                onLongPress: () => viewModel.onTapInvoice(context, true),
+                onTap: () => viewModel.onInvoicePressed(context),
+                onLongPress: () => viewModel.onInvoicePressed(context, true),
               ),
             ),
             Container(
diff --git a/lib/ui/payment/view/payment_view_vm.dart b/lib/ui/payment/view/payment_view_vm.dart
index a8a02c535..b80ed520b 100644
--- a/lib/ui/payment/view/payment_view_vm.dart
+++ b/lib/ui/payment/view/payment_view_vm.dart
@@ -39,8 +39,8 @@ class PaymentViewVM {
     @required this.company,
     @required this.onActionSelected,
     @required this.onEditPressed,
-    @required this.onTapClient,
-    @required this.onTapInvoice,
+    @required this.onClientPressed,
+    @required this.onInvoicePressed,
     @required this.isSaving,
     @required this.isLoading,
     @required this.isDirty,
@@ -61,11 +61,11 @@ class PaymentViewVM {
         onEditPressed: (BuildContext context) {
           store.dispatch(EditPayment(payment: payment, context: context));
         },
-        onTapClient: (context, [bool longPress = false]) => store.dispatch(
+        onClientPressed: (context, [bool longPress = false]) => store.dispatch(
             longPress
                 ? EditClient(client: client, context: context)
                 : ViewClient(clientId: client.id, context: context)),
-        onTapInvoice: (context, [bool longPress = false]) => store.dispatch(
+        onInvoicePressed: (context, [bool longPress = false]) => store.dispatch(
             longPress
                 ? EditInvoice(
                     invoice: state.invoiceState.map[payment.invoiceId],
@@ -101,8 +101,8 @@ class PaymentViewVM {
   final CompanyEntity company;
   final Function(BuildContext, EntityAction) onActionSelected;
   final Function(BuildContext) onEditPressed;
-  final Function(BuildContext, [bool]) onTapInvoice;
-  final Function(BuildContext, [bool]) onTapClient;
+  final Function(BuildContext, [bool]) onInvoicePressed;
+  final Function(BuildContext, [bool]) onClientPressed;
   final bool isSaving;
   final bool isLoading;
   final bool isDirty;