Fix ghost company when deleting and then restarting

lib/redux/app/app_middleware.dart

@@ -367,20 +367,25 @@ Middleware<AppState> _createPersistData(
 
     next(action);
 
-    _persistDataDebouncer.run(() {
+    void saveState() {
-      print('## Calling Persist Data');
-      if (!store.state.isLoaded) {
-        print('## Not loaded: skipping');
-        return;
-      } else {
-        print('## Loaded: saving data');
-      }
-
       final AppState state = store.state;
       final index = state.uiState.selectedCompanyIndex;
       companyRepositories[index]
           .saveCompanyState(state.userCompanyStates[index]);
-    });
+    }
+
+    // When a company is deleted the app switches to another company
+    // so we need to save it immediately before the selection changes
+    if (action is DeleteCompanySuccess) {
+      saveState();
+    } else {
+      _persistDataDebouncer.run(() {
+        if (!store.state.isLoaded) {
+          return;
+        }
+        saveState();
+      });
+    }
   };
 }
 

lib/redux/app/app_state.dart

@@ -581,9 +581,11 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
   @override
   String toString() {
     //return 'latestVersion: ${account.latestVersion}';
-    return 'Last Updated: ${userCompanyStates.map((state) => state.lastUpdated).join(',')}';
+    //return 'Last Updated: ${userCompanyStates.map((state) => state.lastUpdated).join(',')}';
+    //return 'Names: ${userCompanyStates.map((state) => state.company.id).join(',')}';
+    //return 'Client Count: ${userCompanyState.clientState.list.length}, Last Updated: ${userCompanyState.lastUpdated}';
     //return 'Token: ${credentials.token} - ${userCompanyStates.map((state) => state?.token?.token ?? '').where((name) => name.isNotEmpty).join(',')}';
-    //return 'URL: ${authState.url}, Route: ${uiState.currentRoute} Prev: ${uiState.previousRoute}';
+    return 'URL: ${authState.url}, Route: ${uiState.currentRoute} Prev: ${uiState.previousRoute}';
   }
 }
 

lib/redux/company/company_reducer.dart

@@ -29,9 +29,7 @@ import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_reduc
 import 'package:invoiceninja_flutter/redux/group/group_reducer.dart';
 
 UserCompanyState companyReducer(UserCompanyState state, dynamic action) {
-  if (action is LoadAccountSuccess) {
+  if (action is DeleteCompanySuccess) {
-    return UserCompanyState();
-  } else if (action is DeleteCompanySuccess) {
     return UserCompanyState();
   }