From 30c4e6ab3eb5cce87d86eba5da41dc028e372017 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 26 Mar 2021 14:45:53 +0300 Subject: [PATCH] Correct deleting primary company --- lib/redux/auth/auth_middleware.dart | 11 ++++++++--- lib/ui/settings/account_management_vm.dart | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/redux/auth/auth_middleware.dart b/lib/redux/auth/auth_middleware.dart index f7e5c4f2f..e6265250d 100644 --- a/lib/redux/auth/auth_middleware.dart +++ b/lib/redux/auth/auth_middleware.dart @@ -213,9 +213,14 @@ Middleware _createRefreshRequest(AuthRepository repository) { final SharedPreferences prefs = await SharedPreferences.getInstance(); final url = formatApiUrl(prefs.getString(kSharedPrefUrl) ?? state.authState.url); - final token = - TokenEntity.unobscureToken(prefs.getString(kSharedPrefToken)) ?? - 'TOKEN'; + + String token; + if ((state?.userCompany?.token?.token ?? '').isNotEmpty) { + token = state.userCompany.token.token; + } else { + token = TokenEntity.unobscureToken(prefs.getString(kSharedPrefToken)) ?? + 'TOKEN'; + } final updatedAt = action.clearData && !company.isLarge ? 0 diff --git a/lib/ui/settings/account_management_vm.dart b/lib/ui/settings/account_management_vm.dart index f5c80e5e4..0015d210b 100644 --- a/lib/ui/settings/account_management_vm.dart +++ b/lib/ui/settings/account_management_vm.dart @@ -72,7 +72,9 @@ class AccountManagementVM { GoogleOAuth.disconnect(); } } else { - store.dispatch(SelectCompany(companyIndex: 0)); + final selectedCompanyIndex = state.uiState.selectedCompanyIndex; + final index = selectedCompanyIndex == 0 ? 1 : 0; + store.dispatch(SelectCompany(companyIndex: index)); final refreshCompleter = Completer() ..future.then((value) { store.dispatch(SelectCompany(companyIndex: 0));