Settings

lib/redux/app/app_state.dart

@@ -289,7 +289,7 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
   String toString() {
     //return 'Settings: ${selectedCompanyState.company.settings}';
     //return 'URL: ${authState.url}, ${selectedCompany.plan}';
-    return 'Route: ${uiState.currentRoute}, name: ${user.firstName}/${uiState.settingsUIState.editing.user.firstName}';
+    return 'Route: ${uiState.currentRoute}, updatedAt: ${settingsUIState.updatedAt}';
     //return 'Route: ${uiState.currentRoute}, Previous: ${uiState.previousRoute}, Layout: ${uiState.layout}, Menu: ${uiState.isMenuVisible}, History: ${uiState.isHistoryVisible}';
   }
 }

lib/ui/settings/client_portal_vm.dart

@@ -17,7 +17,10 @@ class ClientPortalBuilder extends StatelessWidget {
     return StoreConnector<AppState, ClientPortalVM>(
       converter: ClientPortalVM.fromStore,
       builder: (context, viewModel) {
-        return ClientPortal(viewModel: viewModel);
+        return ClientPortal(
+          viewModel: viewModel,
+          key: ValueKey(viewModel.state.settingsUIState.updatedAt),
+        );
       },
     );
   }

lib/ui/settings/company_details.dart

@@ -59,6 +59,8 @@ class _CompanyDetailsState extends State<CompanyDetails>
 
   @override
   void didChangeDependencies() {
+    print('### didChangeDependencies...');
+
     _controllers = [
       _nameController,
       _idNumberController,
@@ -141,7 +143,6 @@ class _CompanyDetailsState extends State<CompanyDetails>
       body: Form(
         key: _formKey,
         child: TabBarView(
-          key: ValueKey(viewModel.state.selectedCompany.companyKey),
           controller: _controller,
           children: <Widget>[
             ListView(

lib/ui/settings/company_details_vm.dart

@@ -17,7 +17,9 @@ class CompanyDetailsBuilder extends StatelessWidget {
     return StoreConnector<AppState, CompanyDetailsVM>(
       converter: CompanyDetailsVM.fromStore,
       builder: (context, viewModel) {
-        return CompanyDetails(viewModel: viewModel);
+        return CompanyDetails(
+            key: ValueKey(viewModel.state.settingsUIState.updatedAt),
+            viewModel: viewModel);
       },
     );
   }
@@ -39,9 +41,9 @@ class CompanyDetailsVM {
         state: state,
         company: state.selectedCompany,
         onChanged: (company) =>
-            store.dispatch(ResetCompanySettings(company: company)),
+            store.dispatch(UpdateCompanySettings(company: company)),
         onCancelPressed: (context) => store
-            .dispatch(UpdateCompanySettings(company: state.selectedCompany)),
+            .dispatch(ResetCompanySettings(company: state.selectedCompany)),
         onSavePressed: (context) {
           final completer = snackBarCompleter(
               context, AppLocalization.of(context).refreshData);

lib/ui/settings/email_settings_vm.dart

@@ -13,7 +13,10 @@ class EmailSettingsBuilder extends StatelessWidget {
     return StoreConnector<AppState, EmailSettingsVM>(
       converter: EmailSettingsVM.fromStore,
       builder: (context, viewModel) {
-        return EmailSettings(viewModel: viewModel);
+        return EmailSettings(
+          viewModel: viewModel,
+          key: ValueKey(viewModel.state.settingsUIState.updatedAt),
+        );
       },
     );
   }

lib/ui/settings/invoice_design_vm.dart

@@ -13,7 +13,10 @@ class InvoiceDesignBuilder extends StatelessWidget {
     return StoreConnector<AppState, InvoiceDesignVM>(
       converter: InvoiceDesignVM.fromStore,
       builder: (context, viewModel) {
-        return InvoiceDesign(viewModel: viewModel);
+        return InvoiceDesign(
+          viewModel: viewModel,
+          key: ValueKey(viewModel.state.settingsUIState.updatedAt),
+        );
       },
     );
   }

lib/ui/settings/invoice_settings_vm.dart

@@ -13,7 +13,10 @@ class InvoiceSettingsBuilder extends StatelessWidget {
     return StoreConnector<AppState, InvoiceSettingsVM>(
       converter: InvoiceSettingsVM.fromStore,
       builder: (context, viewModel) {
-        return InvoiceSettings(viewModel: viewModel);
+        return InvoiceSettings(
+          viewModel: viewModel,
+          key: ValueKey(viewModel.state.settingsUIState.updatedAt),
+        );
       },
     );
   }

lib/ui/settings/localization_vm.dart

@@ -17,7 +17,10 @@ class LocalizationBuilder extends StatelessWidget {
     return StoreConnector<AppState, LocalizationSettingsVM>(
       converter: LocalizationSettingsVM.fromStore,
       builder: (context, viewModel) {
-        return LocalizationSettings(viewModel: viewModel);
+        return LocalizationSettings(
+          viewModel: viewModel,
+          key: ValueKey(viewModel.state.settingsUIState.updatedAt),
+        );
       },
     );
   }

lib/ui/settings/notifications_vm.dart

@@ -13,7 +13,10 @@ class NotificationsSettingsBuilder extends StatelessWidget {
     return StoreConnector<AppState, NotificationSettingsVM>(
       converter: NotificationSettingsVM.fromStore,
       builder: (context, viewModel) {
-        return NotificationSettings(viewModel: viewModel);
+        return NotificationSettings(
+          viewModel: viewModel,
+          key: ValueKey(viewModel.state.settingsUIState.updatedAt),
+        );
       },
     );
   }

lib/ui/settings/online_payments_vm.dart

@@ -13,7 +13,10 @@ class OnlinePaymentsBuilder extends StatelessWidget {
     return StoreConnector<AppState, OnlinePaymentsVM>(
       converter: OnlinePaymentsVM.fromStore,
       builder: (context, viewModel) {
-        return OnlinePayments(viewModel: viewModel);
+        return OnlinePayments(
+          viewModel: viewModel,
+          key: ValueKey(viewModel.state.settingsUIState.updatedAt),
+        );
       },
     );
   }

lib/ui/settings/products_vm.dart

@@ -13,7 +13,10 @@ class ProductSettingsBuilder extends StatelessWidget {
     return StoreConnector<AppState, ProductSettingsVM>(
       converter: ProductSettingsVM.fromStore,
       builder: (context, viewModel) {
-        return ProductSettings(viewModel: viewModel);
+        return ProductSettings(
+          viewModel: viewModel,
+          key: ValueKey(viewModel.state.settingsUIState.updatedAt),
+        );
       },
     );
   }

lib/ui/settings/settings_scaffold.dart

@@ -30,7 +30,6 @@ class SettingsScaffold extends StatelessWidget {
         return true;
       },
       child: Scaffold(
-        key: ValueKey(state.uiState.settingsUIState.updatedAt),
         body: body,
         appBar: AppBar(
           automaticallyImplyLeading: isMobile(context),

lib/ui/settings/tax_rates_vm.dart

@@ -13,7 +13,10 @@ class TaxRatesBuilder extends StatelessWidget {
     return StoreConnector<AppState, TaxRatesVM>(
       converter: TaxRatesVM.fromStore,
       builder: (context, viewModel) {
-        return TaxRates(viewModel: viewModel);
+        return TaxRates(
+          viewModel: viewModel,
+          key: ValueKey(viewModel.state.settingsUIState.updatedAt),
+        );
       },
     );
   }

lib/ui/settings/templates_and_reminders_vm.dart

@@ -13,7 +13,10 @@ class TemplatesAndRemindersBuilder extends StatelessWidget {
     return StoreConnector<AppState, TemplatesAndRemindersVM>(
       converter: TemplatesAndRemindersVM.fromStore,
       builder: (context, viewModel) {
-        return TemplatesAndReminders(viewModel: viewModel);
+        return TemplatesAndReminders(
+          viewModel: viewModel,
+          key: ValueKey(viewModel.state.settingsUIState.updatedAt),
+        );
       },
     );
   }

lib/ui/settings/user_details_vm.dart

@@ -17,7 +17,9 @@ class UserDetailsBuilder extends StatelessWidget {
     return StoreConnector<AppState, UserDetailsVM>(
       converter: UserDetailsVM.fromStore,
       builder: (context, viewModel) {
-        return UserDetails(viewModel: viewModel);
+        return UserDetails(
+            key: ValueKey(viewModel.state.settingsUIState.updatedAt),
+            viewModel: viewModel);
       },
     );
   }