From e71b09816b854ca5fa7ae9b83c3f12ee475a150d Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 30 Oct 2019 17:16:05 +0200
Subject: [PATCH] Settings

---
 lib/data/models/user_model.dart | 8 --------
 lib/ui/user/edit/user_edit.dart | 2 +-
 lib/ui/user/user_screen.dart    | 2 +-
 lib/ui/user/view/user_view.dart | 7 +++++++
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/data/models/user_model.dart b/lib/data/models/user_model.dart
index 41823aad7..cfd636e12 100644
--- a/lib/data/models/user_model.dart
+++ b/lib/data/models/user_model.dart
@@ -148,14 +148,6 @@ abstract class UserEntity extends Object
       if (includeEdit && userCompany.canEditEntity(this)) {
         actions.add(EntityAction.edit);
       }
-
-      if (userCompany.canEditEntity(this)) {
-        actions.add(EntityAction.settings);
-      }
-
-      if (userCompany.canCreate(EntityType.client)) {
-        actions.add(EntityAction.newClient);
-      }
     }
 
     if (actions.isNotEmpty) {
diff --git a/lib/ui/user/edit/user_edit.dart b/lib/ui/user/edit/user_edit.dart
index f7c7d5b0c..d7169f7ba 100644
--- a/lib/ui/user/edit/user_edit.dart
+++ b/lib/ui/user/edit/user_edit.dart
@@ -43,7 +43,7 @@ class _UserEditState extends State<UserEdit> {
 
     _controllers.forEach((controller) => controller.removeListener(_onChanged));
 
-    final user = widget.viewModel.state.user;
+    final user = widget.viewModel.user;
     _firstNameController.text = user.firstName;
     _lastNameController.text = user.lastName;
     _emailController.text = user.email;
diff --git a/lib/ui/user/user_screen.dart b/lib/ui/user/user_screen.dart
index 64163b34b..bb2adea7f 100644
--- a/lib/ui/user/user_screen.dart
+++ b/lib/ui/user/user_screen.dart
@@ -20,7 +20,7 @@ class UserScreen extends StatelessWidget {
     @required this.viewModel,
   }) : super(key: key);
 
-  static const String route = '/$kSettings';
+  static const String route = '/$kSettings/$kSettingsUserManagement';
 
   final UserScreenVM viewModel;
 
diff --git a/lib/ui/user/view/user_view.dart b/lib/ui/user/view/user_view.dart
index 7dc82ecb8..f2b56ccda 100644
--- a/lib/ui/user/view/user_view.dart
+++ b/lib/ui/user/view/user_view.dart
@@ -5,6 +5,7 @@ import 'package:invoiceninja_flutter/ui/app/actions_menu_button.dart';
 import 'package:invoiceninja_flutter/ui/user/view/user_view_vm.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
 import 'package:invoiceninja_flutter/ui/app/entities/entity_state_title.dart';
+import 'package:invoiceninja_flutter/utils/platforms.dart';
 
 class UserView extends StatefulWidget {
   const UserView({
@@ -27,6 +28,12 @@ class _UserViewState extends State<UserView> {
 
     return Scaffold(
       appBar: AppBar(
+        leading: !isMobile(context)
+            ? IconButton(
+                icon: Icon(Icons.arrow_back),
+                onPressed: viewModel.onBackPressed,
+              )
+            : null,
         title: EntityStateTitle(entity: user),
         actions: [
           userCompany.canEditEntity(user)