diff --git a/lib/reducers/data-loaded-reducer.js b/lib/reducers/data-loaded-reducer.js --- a/lib/reducers/data-loaded-reducer.js +++ b/lib/reducers/data-loaded-reducer.js @@ -2,12 +2,14 @@ import { setDataLoadedActionType } from '../actions/client-db-store-actions.js'; import { + keyserverAuthActionTypes, logOutActionTypes, deleteKeyserverAccountActionTypes, logInActionTypes, } from '../actions/user-actions.js'; import type { BaseAction } from '../types/redux-types.js'; import { setNewSessionActionType } from '../utils/action-utils.js'; +import { ashoatKeyserverID } from '../utils/validation-utils.js'; export default function reduceDataLoaded( state: boolean, @@ -29,6 +31,10 @@ action.type === deleteKeyserverAccountActionTypes.success ) { return false; + } else if (action.type === keyserverAuthActionTypes.success) { + if (ashoatKeyserverID in action.payload.updatesCurrentAsOf) { + return true; + } } return state; } diff --git a/lib/reducers/theme-reducer.js b/lib/reducers/theme-reducer.js --- a/lib/reducers/theme-reducer.js +++ b/lib/reducers/theme-reducer.js @@ -7,6 +7,7 @@ deleteKeyserverAccountActionTypes, logInActionTypes, registerActionTypes, + tempIdentityLoginActionTypes, } from '../actions/user-actions.js'; import type { BaseAction } from '../types/redux-types.js'; import { @@ -22,7 +23,8 @@ if ( action.type === logInActionTypes.success || action.type === siweAuthActionTypes.success || - action.type === registerActionTypes.success + action.type === registerActionTypes.success || + action.type === tempIdentityLoginActionTypes.success ) { return defaultGlobalThemeInfo; } else if (