From 20151b07a6e7491db85760c3f5cf96d9d9385f40 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 3 Sep 2018 15:23:36 -0700
Subject: [PATCH] Refactor

---
 lib/ui/client/edit/client_edit.dart   | 2 +-
 lib/ui/invoice/edit/invoice_edit.dart | 2 +-
 lib/ui/payment/edit/payment_edit.dart | 2 +-
 lib/ui/payment/view/payment_view.dart | 4 +++-
 lib/ui/product/edit/product_edit.dart | 2 +-
 stubs/ui/stub/edit/stub_edit          | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/ui/client/edit/client_edit.dart b/lib/ui/client/edit/client_edit.dart
index 830fcb5b8..47ea95d08 100644
--- a/lib/ui/client/edit/client_edit.dart
+++ b/lib/ui/client/edit/client_edit.dart
@@ -54,7 +54,7 @@ class _ClientEditState extends State<ClientEdit>
         appBar: AppBar(
           title: Text(client.isNew
               ? localization.newClient
-              : viewModel.origClient.displayName), // Text(localizations.clientDetails),
+              : localization.editClient),
           actions: <Widget>[
             RefreshIconButton(
               icon: Icons.cloud_upload,
diff --git a/lib/ui/invoice/edit/invoice_edit.dart b/lib/ui/invoice/edit/invoice_edit.dart
index fa04f628c..d3d7cad87 100644
--- a/lib/ui/invoice/edit/invoice_edit.dart
+++ b/lib/ui/invoice/edit/invoice_edit.dart
@@ -64,7 +64,7 @@ class _InvoiceEditState extends State<InvoiceEdit>
         appBar: AppBar(
           title: Text(invoice.isNew
               ? invoice.isQuote ? localization.newQuote : localization.newInvoice
-              : '${invoice.isQuote ? localization.quote : localization.invoice} ${viewModel.origInvoice.invoiceNumber}'),
+              : invoice.isQuote ? localization.editQuote: localization.editInvoice),
           actions: <Widget>[
             RefreshIconButton(
               icon: Icons.cloud_upload,
diff --git a/lib/ui/payment/edit/payment_edit.dart b/lib/ui/payment/edit/payment_edit.dart
index f6d498299..b8eed2f2a 100644
--- a/lib/ui/payment/edit/payment_edit.dart
+++ b/lib/ui/payment/edit/payment_edit.dart
@@ -91,7 +91,7 @@ class _PaymentEditState extends State<PaymentEdit> {
         appBar: AppBar(
           title: Text(viewModel.payment.isNew
               ? localization.enterPayment
-              : viewModel.payment.transactionReference),
+              : localization.editPayment),
           actions: <Widget>[
             Builder(builder: (BuildContext context) {
               return RefreshIconButton(
diff --git a/lib/ui/payment/view/payment_view.dart b/lib/ui/payment/view/payment_view.dart
index 59dc137e3..ef77c5e5d 100644
--- a/lib/ui/payment/view/payment_view.dart
+++ b/lib/ui/payment/view/payment_view.dart
@@ -54,7 +54,9 @@ class _PaymentViewState extends State<PaymentView> {
 
     return Scaffold(
         appBar: AppBar(
-          title: Text(payment.transactionReference),
+          title: Text(payment.transactionReference.isNotEmpty
+              ? payment.transactionReference
+              : localization.payment),
           actions: payment.isNew
               ? []
               : [
diff --git a/lib/ui/product/edit/product_edit.dart b/lib/ui/product/edit/product_edit.dart
index 435ddd76b..cb15543f3 100644
--- a/lib/ui/product/edit/product_edit.dart
+++ b/lib/ui/product/edit/product_edit.dart
@@ -103,7 +103,7 @@ class _ProductEditState extends State<ProductEdit> {
         appBar: AppBar(
           title: Text(viewModel.product.isNew
               ? localization.newProduct
-              : viewModel.origProduct.productKey),
+              : localization.editProduct),
           actions: <Widget>[
             Builder(builder: (BuildContext context) {
               if (!user.canEditEntity(product)) {
diff --git a/stubs/ui/stub/edit/stub_edit b/stubs/ui/stub/edit/stub_edit
index b6a0bba01..91a08e5a9 100644
--- a/stubs/ui/stub/edit/stub_edit
+++ b/stubs/ui/stub/edit/stub_edit
@@ -74,7 +74,7 @@ class _StubEditState extends State<StubEdit> {
         appBar: AppBar(
           title: Text(viewModel.stub.isNew
               ? localization.newStub
-              : viewModel.stub.displayName),
+              : localization.editStub),
           actions: <Widget>[
             Builder(builder: (BuildContext context) {
               return SaveIconButton(