diff --git a/lib/reducers/user-reducer.js b/lib/reducers/user-reducer.js --- a/lib/reducers/user-reducer.js +++ b/lib/reducers/user-reducer.js @@ -47,7 +47,10 @@ UserStore, } from '../types/user-types.js'; import { authoritativeKeyserverID } from '../utils/authoritative-keyserver.js'; -import { relyingOnAuthoritativeKeyserver } from '../utils/services-utils.js'; +import { + relyingOnAuthoritativeKeyserver, + usingCommServicesAccessToken, +} from '../utils/services-utils.js'; function reduceCurrentUserInfo( state: ?CurrentUserInfo, @@ -83,6 +86,10 @@ const actionUserInfo = action.payload.sessionChange.currentUserInfo; if (!actionUserInfo?.id) { return actionUserInfo; + } else if (!usingCommServicesAccessToken) { + if (!_isEqual(actionUserInfo)(state)) { + return actionUserInfo; + } } else if (!state?.id || actionUserInfo.id !== state.id) { console.log( 'keyserver auth returned a different user info than identity login',