From fbf79c5e67c3cec29f896af47d1d689ca666397d Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 12 Mar 2023 09:37:26 +0200
Subject: [PATCH] Changing light/dark mode in wizard clears first/last names

---
 lib/ui/dashboard/dashboard_screen.dart |  1 +
 lib/ui/settings/settings_wizard.dart   | 15 ++++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/ui/dashboard/dashboard_screen.dart b/lib/ui/dashboard/dashboard_screen.dart
index 207ae6ae2..4e6467acb 100644
--- a/lib/ui/dashboard/dashboard_screen.dart
+++ b/lib/ui/dashboard/dashboard_screen.dart
@@ -105,6 +105,7 @@ class _DashboardScreenState extends State<DashboardScreen>
             builder: (BuildContext context) {
               return SettingsWizard(
                 user: state.user,
+                company: state.company,
               );
             });
       });
diff --git a/lib/ui/settings/settings_wizard.dart b/lib/ui/settings/settings_wizard.dart
index 5a4bdb833..6c9dd6e79 100644
--- a/lib/ui/settings/settings_wizard.dart
+++ b/lib/ui/settings/settings_wizard.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'dart:convert';
 
 // Flutter imports:
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -12,6 +13,7 @@ import 'package:flutter_redux/flutter_redux.dart';
 
 // Project imports:
 import 'package:invoiceninja_flutter/constants.dart';
+import 'package:invoiceninja_flutter/data/models/company_model.dart';
 import 'package:invoiceninja_flutter/data/models/entities.dart';
 import 'package:invoiceninja_flutter/data/models/user_model.dart';
 import 'package:invoiceninja_flutter/data/web_client.dart';
@@ -34,9 +36,11 @@ import 'package:invoiceninja_flutter/utils/platforms.dart';
 class SettingsWizard extends StatefulWidget {
   const SettingsWizard({
     @required this.user,
+    @required this.company,
   });
 
   final UserEntity user;
+  final CompanyEntity company;
 
   @override
   _SettingsWizardState createState() => _SettingsWizardState();
@@ -73,17 +77,10 @@ class _SettingsWizardState extends State<SettingsWizard> {
       _lastNameController,
       _subdomainController,
     ];
-  }
-
-  @override
-  void didChangeDependencies() {
-    final store = StoreProvider.of<AppState>(context);
 
     _firstNameController.text = widget.user.firstName;
     _lastNameController.text = widget.user.lastName;
-    _subdomainController.text = store.state.company.subdomain;
-
-    super.didChangeDependencies();
+    _subdomainController.text = widget.company.subdomain;
   }
 
   @override
@@ -313,7 +310,7 @@ class _SettingsWizardState extends State<SettingsWizard> {
     );
 
     var showNameFields = true;
-    if (state.companies.length > 1) {
+    if (state.companies.length > 1 && kReleaseMode) {
       showNameFields = false;
     }
     if (state.user.isConnectedToApple && state.user.fullName.isEmpty) {