Tablet layout

lib/redux/client/client_actions.dart

@@ -36,15 +36,13 @@ class EditClient implements PersistUI {
       @required this.context,
       this.contact,
       this.completer,
-      this.force = false,
+      this.force = false});
-      this.trackRoute = true});
 
   final ClientEntity client;
   final ContactEntity contact;
   final BuildContext context;
   final Completer completer;
   final bool force;
-  final bool trackRoute;
 }
 
 class EditContact implements PersistUI {

lib/redux/document/document_actions.dart

@@ -23,12 +23,11 @@ class ViewDocument implements PersistUI {
 
 class EditDocument implements PersistUI {
   EditDocument(
-      {this.document, this.context, this.completer, this.trackRoute = true});
+      {this.document, this.context, this.completer,});
 
   final DocumentEntity document;
   final BuildContext context;
   final Completer completer;
-  final bool trackRoute;
 }
 
 class UpdateDocument implements PersistUI {

lib/redux/expense/expense_actions.dart

@@ -35,13 +35,11 @@ class EditExpense implements PersistUI {
       {@required this.expense,
       @required this.context,
       this.completer,
-      this.force = false,
+      this.force = false});
-      this.trackRoute = true});
 
   final ExpenseEntity expense;
   final BuildContext context;
   final Completer completer;
-  final bool trackRoute;
   final bool force;
 }
 

lib/redux/payment/payment_actions.dart

@@ -32,13 +32,11 @@ class EditPayment implements PersistUI {
       {@required this.payment,
       @required this.context,
       this.completer,
-      this.force = false,
+      this.force = false});
-      this.trackRoute = true});
 
   final PaymentEntity payment;
   final BuildContext context;
   final Completer completer;
-  final bool trackRoute;
   final bool force;
 }
 

lib/redux/project/project_actions.dart

@@ -36,13 +36,11 @@ class EditProject implements PersistUI {
       {@required this.project,
       @required this.context,
       this.completer,
-      this.force = false,
+      this.force = false});
-      this.trackRoute = true});
 
   final ProjectEntity project;
   final BuildContext context;
   final Completer completer;
-  final bool trackRoute;
   final bool force;
 }
 

lib/redux/task/task_actions.dart

@@ -38,7 +38,6 @@ class EditTask implements PersistUI {
       this.taskTime,
       this.context,
       this.completer,
-      this.trackRoute = true,
       this.force = false,
       this.taskTimeIndex});
 
@@ -47,7 +46,6 @@ class EditTask implements PersistUI {
   final TaskTime taskTime;
   final BuildContext context;
   final Completer completer;
-  final bool trackRoute;
   final bool force;
 }
 

lib/redux/vendor/vendor_actions.dart

@@ -34,14 +34,12 @@ class EditVendor implements PersistUI {
       @required this.context,
       this.contact,
       this.completer,
-      this.force = false,
+      this.force = false});
-      this.trackRoute = true});
 
   final VendorEntity vendor;
   final VendorContactEntity contact;
   final BuildContext context;
   final Completer completer;
-  final bool trackRoute;
   final bool force;
 }
 

lib/ui/document/edit/document_edit.dart

@@ -107,6 +107,7 @@ class _DocumentEditState extends State<DocumentEdit> {
             key: _formKey,
             child: Builder(builder: (BuildContext context) {
               return ListView(
+                key: ValueKey(viewModel.document.id),
                 children: <Widget>[
                   FormCard(
                     children: <Widget>[

lib/ui/expense/edit/expense_edit_vm.dart

@@ -83,10 +83,7 @@ class ExpenseEditVM {
       },
       onAddClientPressed: (context, completer) {
         store.dispatch(EditClient(
-            client: ClientEntity(),
+            client: ClientEntity(), context: context, completer: completer));
-            context: context,
-            completer: completer,
-            trackRoute: false));
         completer.future.then((SelectableEntity client) {
           Scaffold.of(context).showSnackBar(SnackBar(
               content: SnackBarRow(
@@ -99,7 +96,7 @@ class ExpenseEditVM {
           vendor: VendorEntity(),
           context: context,
           completer: completer,
-            trackRoute: false));
+        ));
         completer.future.then((SelectableEntity client) {
           Scaffold.of(context).showSnackBar(SnackBar(
               content: SnackBarRow(

lib/ui/invoice/edit/invoice_edit_details_vm.dart

@@ -84,8 +84,7 @@ class InvoiceEditDetailsVM extends EntityEditDetailsVM {
             client: ClientEntity(),
             context: context,
             completer: completer,
-            force: true,
+            force: true));
-            trackRoute: false));
         completer.future.then((SelectableEntity client) {
           Scaffold.of(context).showSnackBar(SnackBar(
               content: SnackBarRow(

lib/ui/payment/edit/payment_edit.dart

@@ -132,6 +132,7 @@ class _PaymentEditState extends State<PaymentEdit> {
           body: Form(
             key: _formKey,
             child: ListView(
+              key: ValueKey(viewModel.payment.id),
               children: <Widget>[
                 FormCard(
                   children: <Widget>[

lib/ui/product/edit/product_edit.dart

@@ -145,6 +145,7 @@ class _ProductEditState extends State<ProductEdit> {
         body: Form(
           key: _formKey,
           child: ListView(
+            key: ValueKey(viewModel.product.id),
             children: <Widget>[
               FormCard(
                 children: <Widget>[

lib/ui/project/edit/project_edit.dart

@@ -149,6 +149,7 @@ class _ProjectEditState extends State<ProjectEdit> {
           key: _formKey,
           child: Builder(builder: (BuildContext context) {
             return ListView(
+              key: ValueKey(viewModel.project.id),
               children: <Widget>[
                 FormCard(
                   children: <Widget>[

lib/ui/project/edit/project_edit_vm.dart

@@ -81,10 +81,7 @@ class ProjectEditVM {
       },
       onAddClientPressed: (context, completer) {
         store.dispatch(EditClient(
-            client: ClientEntity(),
+            client: ClientEntity(), context: context, completer: completer));
-            context: context,
-            completer: completer,
-            trackRoute: false));
         completer.future.then((SelectableEntity client) {
           Scaffold.of(context).showSnackBar(SnackBar(
               content: SnackBarRow(

lib/ui/quote/edit/quote_edit_details_vm.dart

@@ -63,10 +63,7 @@ class QuoteEditDetailsVM extends EntityEditDetailsVM {
       clientList: state.clientState.list,
       onAddClientPressed: (context, completer) {
         store.dispatch(EditClient(
-            client: ClientEntity(),
+            client: ClientEntity(), context: context, completer: completer));
-            context: context,
-            completer: completer,
-            trackRoute: false));
         completer.future.then((SelectableEntity client) {
           Scaffold.of(context).showSnackBar(SnackBar(
               content: SnackBarRow(

lib/ui/task/edit/task_edit_details_vm.dart

@@ -63,10 +63,7 @@ class TaskEditDetailsVM {
       },
       onAddClientPressed: (context, completer) {
         store.dispatch(EditClient(
-            client: ClientEntity(),
+            client: ClientEntity(), context: context, completer: completer));
-            context: context,
-            completer: completer,
-            trackRoute: false));
         completer.future.then((SelectableEntity client) {
           Scaffold.of(context).showSnackBar(SnackBar(
               content: SnackBarRow(
@@ -79,8 +76,7 @@ class TaskEditDetailsVM {
             project: ProjectEntity()
                 .rebuild((b) => b..clientId = task.clientId ?? 0),
             context: context,
-            completer: completer,
+            completer: completer));
-            trackRoute: false));
         completer.future.then((SelectableEntity client) {
           Scaffold.of(context).showSnackBar(SnackBar(
               content: SnackBarRow(

stubs/redux/stub/stub_actions

@@ -32,13 +32,11 @@ class EditStub implements PersistUI {
                 {@required this.stub,
                 @required this.context,
                 this.completer,
-                this.force = false,
+                this.force = false);
-                this.trackRoute = true});
 
   final StubEntity stub;
   final BuildContext context;
   final Completer completer;
-  final bool trackRoute;
   final bool force;
 }