toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MM-24451 Set prev app version to current on logout/reset cache (#4224)

Browse source 
* MM-24451 Set prev app version to current on logout/reset cache

* Fix unit tests for release-1.30
This commit is contained in:
Elias Nahum 2020-04-24 14:11:52 -04:00 committed by GitHub
parent 8388ae1a30
commit 87abcce7fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/init/global_event_handler.js
View file

@ -280,7 +280,7 @@ class GlobalEventHandler {
app: {
build: DeviceInfo.getBuildNumber(),
version: DeviceInfo.getVersion(),
previousVersion: state.app?.previousVersion || DeviceInfo.getVersion(),
previousVersion: DeviceInfo.getVersion(),
},
},
},

6
app/store/utils.js
View file

@ -2,6 +2,7 @@
// See LICENSE.txt for license information.
import merge from 'deepmerge';
import DeviceInfo from 'react-native-device-info';
function transformFromSet(incoming) {
const state = {...incoming};
@ -78,7 +79,10 @@ export function getStateForReset(initialState, currentState) {
});
const resetState = merge(initialState, {
app,
app: {
...app,
previousVersion: DeviceInfo.getVersion(),
},
entities: {
users: {
currentUserId,

10
app/store/utils.test.js
View file

@ -1,6 +1,8 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
import DeviceInfo from 'react-native-device-info';
import initialState from 'app/initial_state';
import {getStateForReset} from 'app/store/utils';
@ -21,8 +23,8 @@ describe('getStateForReset', () => {
const currentTeamId = 'current-team-id';
const currentState = {
app: {
build: 'build',
version: 'version',
build: DeviceInfo.getBuildNumber(),
version: DeviceInfo.getVersion(),
previousVersion: 'previousVersion',
},
entities: {
@ -82,9 +84,9 @@ describe('getStateForReset', () => {
expect(themeKeys.length).toEqual(preferenceKeys.length);
});
it('should keep app', () => {
it('should set previous version as current', () => {
const resetState = getStateForReset(initialState, currentState);
const {app} = resetState;
expect(app).toStrictEqual(currentState.app);
expect(app.previousVersion).toStrictEqual(currentState.app.version);
});
});