From 9e83a2ec6ab257ff0be4d097e31090169445a5a6 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 2 May 2021 19:46:19 +0300
Subject: [PATCH] Correct save

---
 lib/ui/app/tables/entity_list.dart   |  2 +-
 lib/ui/settings/user_details.dart    | 41 ++++++++++++++--------------
 lib/ui/settings/user_details_vm.dart |  1 -
 lib/utils/dialogs.dart               |  2 --
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/lib/ui/app/tables/entity_list.dart b/lib/ui/app/tables/entity_list.dart
index 8b9488669..7c5f55283 100644
--- a/lib/ui/app/tables/entity_list.dart
+++ b/lib/ui/app/tables/entity_list.dart
@@ -437,7 +437,7 @@ class _EntityListState extends State<EntityList> {
                               .replaceFirst(':count', '$countSelected')),
                         ),
                         SaveCancelButtons(
-                          isHeader: true,
+                          isHeader: false,
                           saveLabel: localization.actions,
                           isEnabled: entities.isNotEmpty,
                           isCancelEnabled: true,
diff --git a/lib/ui/settings/user_details.dart b/lib/ui/settings/user_details.dart
index 40debdc47..c1e81fc30 100644
--- a/lib/ui/settings/user_details.dart
+++ b/lib/ui/settings/user_details.dart
@@ -295,26 +295,27 @@ class _UserDetailsState extends State<UserDetails>
                           (b) => b..userCompany.settings.accentColor = value));
                     },
                   ),
-                  AppDropdownButton<int>(
-                    labelText: localization.numberYearsActive,
-                    value: user.userCompany.settings.numberYearsActive,
-                    onChanged: (dynamic value) {
-                      widget.viewModel.onChanged(user.rebuild((b) =>
-                          b..userCompany.settings.numberYearsActive = value));
-                    },
-                    items: [
-                      DropdownMenuItem(
-                        child: Text(localization.all),
-                        value: 0,
-                      ),
-                      ...List<int>.generate(10, (i) => i + 1)
-                          .map((value) => DropdownMenuItem(
-                                child: Text('$value'),
-                                value: value,
-                              ))
-                          .toList()
-                    ],
-                  ),
+                  if (state.company.isLarge)
+                    AppDropdownButton<int>(
+                      labelText: localization.numberYearsActive,
+                      value: user.userCompany.settings.numberYearsActive,
+                      onChanged: (dynamic value) {
+                        widget.viewModel.onChanged(user.rebuild((b) =>
+                            b..userCompany.settings.numberYearsActive = value));
+                      },
+                      items: [
+                        DropdownMenuItem(
+                          child: Text(localization.all),
+                          value: 0,
+                        ),
+                        ...List<int>.generate(10, (i) => i + 1)
+                            .map((value) => DropdownMenuItem(
+                                  child: Text('$value'),
+                                  value: value,
+                                ))
+                            .toList()
+                      ],
+                    ),
                 ],
               ),
             ],
diff --git a/lib/ui/settings/user_details_vm.dart b/lib/ui/settings/user_details_vm.dart
index dab28cc6d..de3ec884e 100644
--- a/lib/ui/settings/user_details_vm.dart
+++ b/lib/ui/settings/user_details_vm.dart
@@ -209,7 +209,6 @@ class UserDetailsVM {
             appBuilder.rebuild();
           });
 
-          print('## HERE 1');
           confirmCallback(
               context: context,
               message: localization.changingPhoneDisablesTwoFactor,
diff --git a/lib/utils/dialogs.dart b/lib/utils/dialogs.dart
index d97591752..e74d7e79d 100644
--- a/lib/utils/dialogs.dart
+++ b/lib/utils/dialogs.dart
@@ -116,7 +116,6 @@ void passwordCallback({
   Function(String, String) callback,
   bool alwaysRequire = false,
 }) {
-  print('## HERE 2a');
   final state = StoreProvider.of<AppState>(context).state;
   if (state.authState.hasRecentlyEnteredPassword && !alwaysRequire) {
     print('## hasRecentlyEnteredPassword...');
@@ -125,7 +124,6 @@ void passwordCallback({
   }
 
   if (state.user.oauthProvider.isEmpty) {
-    print('## HERE 2b');
     showDialog<Null>(
       context: context,
       barrierDismissible: false,