Merge 4.25.0 into master (#3789)

.circleci/config.yml

@@ -359,7 +359,7 @@ jobs:
       - run:
           name: Test
           command: |
-            yarn test
+            yarn test -w 8
 
       - run:
           name: Codecov

__tests__/Storyshots.test.js

-import initStoryshots from '@storybook/addon-storyshots';
+import initStoryshots, { Stories2SnapsConverter } from '@storybook/addon-storyshots';
+import { render } from '@testing-library/react-native';
 
 jest.mock('rn-fetch-blob', () => ({
 	fs: {
@@ -19,4 +20,15 @@ jest.mock('react-native-file-viewer', () => ({
 jest.mock('../app/lib/database', () => jest.fn(() => null));
 global.Date.now = jest.fn(() => new Date('2019-10-10').getTime());
 
-initStoryshots();
+const converter = new Stories2SnapsConverter();
+
+initStoryshots({
+	test: ({ story, context }) => {
+		const snapshotFilename = converter.getSnapshotFileName(context);
+		const storyElement = story.render();
+		const { update, toJSON } = render(storyElement);
+		update(storyElement);
+		const json = toJSON();
+		expect(JSON.stringify(json)).toMatchSpecificSnapshot(snapshotFilename);
+	}
+});

android/app/build.gradle

@@ -144,7 +144,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.24.0"
+        versionName "4.25.0"
         vectorDrawables.useSupportLibrary = true
         if (!isFoss) {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]

app/AppContainer.tsx

@@ -6,7 +6,7 @@ import { connect } from 'react-redux';
 import { SetUsernameStackParamList, StackParamList } from './definitions/navigationTypes';
 import Navigation from './lib/Navigation';
 import { defaultHeader, getActiveRouteName, navigationTheme } from './utils/navigation';
-import { ROOT_INSIDE, ROOT_LOADING, ROOT_OUTSIDE, ROOT_SET_USERNAME } from './actions/app';
+import { RootEnum } from './definitions';
 // Stacks
 import AuthLoadingView from './views/AuthLoadingView';
 // SetUsername Stack
@@ -56,13 +56,13 @@ const App = React.memo(({ root, isMasterDetail }: { root: string; isMasterDetail
 			}}>
 			<Stack.Navigator screenOptions={{ headerShown: false, animationEnabled: false }}>
 				<>
-					{root === ROOT_LOADING ? <Stack.Screen name='AuthLoading' component={AuthLoadingView} /> : null}
-					{root === ROOT_OUTSIDE ? <Stack.Screen name='OutsideStack' component={OutsideStack} /> : null}
-					{root === ROOT_INSIDE && isMasterDetail ? (
+					{root === RootEnum.ROOT_LOADING ? <Stack.Screen name='AuthLoading' component={AuthLoadingView} /> : null}
+					{root === RootEnum.ROOT_OUTSIDE ? <Stack.Screen name='OutsideStack' component={OutsideStack} /> : null}
+					{root === RootEnum.ROOT_INSIDE && isMasterDetail ? (
 						<Stack.Screen name='MasterDetailStack' component={MasterDetailStack} />
 					) : null}
-					{root === ROOT_INSIDE && !isMasterDetail ? <Stack.Screen name='InsideStack' component={InsideStack} /> : null}
-					{root === ROOT_SET_USERNAME ? <Stack.Screen name='SetUsernameStack' component={SetUsernameStack} /> : null}
+					{root === RootEnum.ROOT_INSIDE && !isMasterDetail ? <Stack.Screen name='InsideStack' component={InsideStack} /> : null}
+					{root === RootEnum.ROOT_SET_USERNAME ? <Stack.Screen name='SetUsernameStack' component={SetUsernameStack} /> : null}
 				</>
 			</Stack.Navigator>
 		</NavigationContainer>

app/ReactotronConfig.js

 /* eslint-disable */
+import AsyncStorage from '@react-native-community/async-storage';
 import { NativeModules } from 'react-native';
 import Reactotron from 'reactotron-react-native';
 import { reactotronRedux } from 'reactotron-redux';
@@ -7,7 +8,12 @@ import sagaPlugin from 'reactotron-redux-saga';
 if (__DEV__) {
 	const scriptURL = NativeModules.SourceCode.scriptURL;
 	const scriptHostname = scriptURL.split('://')[1].split(':')[0];
-	Reactotron.configure({ host: scriptHostname }).useReactNative().use(reactotronRedux()).use(sagaPlugin()).connect();
+	Reactotron.setAsyncStorageHandler(AsyncStorage)
+		.configure({ host: scriptHostname })
+		.useReactNative()
+		.use(reactotronRedux())
+		.use(sagaPlugin())
+		.connect();
 	// Running on android device
 	// $ adb reverse tcp:9090 tcp:9090
 	Reactotron.clear();

app/actions/actionsTypes.ts

@@ -2,8 +2,8 @@ const REQUEST = 'REQUEST';
 const SUCCESS = 'SUCCESS';
 const FAILURE = 'FAILURE';
 const defaultTypes = [REQUEST, SUCCESS, FAILURE];
-function createRequestTypes(base = {}, types = defaultTypes): Record<any, any> {
-	const res: Record<any, any> = {};
+function createRequestTypes(base = {}, types = defaultTypes): Record<string, string> {
+	const res: Record<string, string> = {};
 	types.forEach(type => (res[type] = `${base}_${type}`));
 	return res;
 }
@@ -58,7 +58,7 @@ export const SNIPPETED_MESSAGES = createRequestTypes('SNIPPETED_MESSAGES', ['OPE
 export const DEEP_LINKING = createRequestTypes('DEEP_LINKING', ['OPEN']);
 export const SORT_PREFERENCES = createRequestTypes('SORT_PREFERENCES', ['SET_ALL', 'SET']);
 export const SET_CUSTOM_EMOJIS = 'SET_CUSTOM_EMOJIS';
-export const SET_ACTIVE_USERS = 'SET_ACTIVE_USERS';
+export const ACTIVE_USERS = createRequestTypes('ACTIVE_USERS', ['SET', 'CLEAR']);
 export const USERS_TYPING = createRequestTypes('USERS_TYPING', ['ADD', 'REMOVE', 'CLEAR']);
 export const INVITE_LINKS = createRequestTypes('INVITE_LINKS', [
 	'SET_TOKEN',

app/actions/activeUsers.ts

 import { Action } from 'redux';
 
 import { IActiveUsers } from '../reducers/activeUsers';
-import { SET_ACTIVE_USERS } from './actionsTypes';
+import { ACTIVE_USERS } from './actionsTypes';
 
-export interface ISetActiveUsers extends Action {
+interface ISetActiveUsers extends Action {
 	activeUsers: IActiveUsers;
 }
 
 export type TActionActiveUsers = ISetActiveUsers;
 
 export const setActiveUsers = (activeUsers: IActiveUsers): ISetActiveUsers => ({
-	type: SET_ACTIVE_USERS,
+	type: ACTIVE_USERS.SET,
 	activeUsers
 });
+
+export const clearActiveUsers = (): Action => ({
+	type: ACTIVE_USERS.CLEAR
+});

app/actions/app.js → app/actions/app.ts

+import { Action } from 'redux';
+
+import { RootEnum } from '../definitions';
 import { APP } from './actionsTypes';
 
-export const ROOT_OUTSIDE = 'outside';
-export const ROOT_INSIDE = 'inside';
-export const ROOT_LOADING = 'loading';
-export const ROOT_SET_USERNAME = 'setUsername';
+interface IAppStart extends Action {
+	root: RootEnum;
+	text?: string;
+}
+
+interface ISetMasterDetail extends Action {
+	isMasterDetail: boolean;
+}
+
+export type TActionApp = IAppStart & ISetMasterDetail;
+
+interface Params {
+	root: RootEnum;
+	[key: string]: any;
+}
 
-export function appStart({ root, ...args }) {
+export function appStart({ root, ...args }: Params): IAppStart {
 	return {
 		type: APP.START,
 		root,
@@ -13,25 +27,25 @@ export function appStart({ root, ...args }) {
 	};
 }
 
-export function appReady() {
+export function appReady(): Action {
 	return {
 		type: APP.READY
 	};
 }
 
-export function appInit() {
+export function appInit(): Action {
 	return {
 		type: APP.INIT
 	};
 }
 
-export function appInitLocalSettings() {
+export function appInitLocalSettings(): Action {
 	return {
 		type: APP.INIT_LOCAL_SETTINGS
 	};
 }
 
-export function setMasterDetail(isMasterDetail) {
+export function setMasterDetail(isMasterDetail: boolean): ISetMasterDetail {
 	return {
 		type: APP.SET_MASTER_DETAIL,
 		isMasterDetail

app/actions/connect.js → app/actions/connect.ts

+import { Action } from 'redux';
+
 import * as types from './actionsTypes';
 
-export function connectRequest() {
+export function connectRequest(): Action {
 	return {
 		type: types.METEOR.REQUEST
 	};
 }
 
-export function connectSuccess() {
+export function connectSuccess(): Action {
 	return {
 		type: types.METEOR.SUCCESS
 	};
 }
 
-export function disconnect(err) {
+export function disconnect(): Action {
 	return {
-		type: types.METEOR.DISCONNECT,
-		err
+		type: types.METEOR.DISCONNECT
 	};
 }

app/actions/createChannel.js

-import * as types from './actionsTypes';
-
-export function createChannelRequest(data) {
-	return {
-		type: types.CREATE_CHANNEL.REQUEST,
-		data
-	};
-}
-
-export function createChannelSuccess(data) {
-	return {
-		type: types.CREATE_CHANNEL.SUCCESS,
-		data
-	};
-}
-
-export function createChannelFailure(err, isTeam) {
-	return {
-		type: types.CREATE_CHANNEL.FAILURE,
-		err,
-		isTeam
-	};
-}

app/actions/createChannel.ts

+import { Action } from 'redux';
+
+import { TCreateChannelResult } from '../reducers/createChannel';
+import { CREATE_CHANNEL } from './actionsTypes';
+
+interface ICreateChannelRequest extends Action {
+	data: TCreateChannelResult;
+}
+
+interface ICreateChannelSuccess extends Action {
+	data: TCreateChannelResult;
+}
+
+interface ICreateChannelFailure extends Action {
+	err: any;
+	isTeam: boolean;
+}
+
+export type TActionCreateChannel = ICreateChannelRequest & ICreateChannelSuccess & ICreateChannelFailure;
+
+export function createChannelRequest(data: TCreateChannelResult): ICreateChannelRequest {
+	return {
+		type: CREATE_CHANNEL.REQUEST,
+		data
+	};
+}
+
+export function createChannelSuccess(data: TCreateChannelResult): ICreateChannelSuccess {
+	return {
+		type: CREATE_CHANNEL.SUCCESS,
+		data
+	};
+}
+
+export function createChannelFailure(err: any, isTeam: boolean): ICreateChannelFailure {
+	return {
+		type: CREATE_CHANNEL.FAILURE,
+		err,
+		isTeam
+	};
+}

app/actions/createDiscussion.js

-import * as types from './actionsTypes';
-
-export function createDiscussionRequest(data) {
-	return {
-		type: types.CREATE_DISCUSSION.REQUEST,
-		data
-	};
-}
-
-export function createDiscussionSuccess(data) {
-	return {
-		type: types.CREATE_DISCUSSION.SUCCESS,
-		data
-	};
-}
-
-export function createDiscussionFailure(err) {
-	return {
-		type: types.CREATE_DISCUSSION.FAILURE,
-		err
-	};
-}

app/actions/createDiscussion.ts

+import { Action } from 'redux';
+
+import { CREATE_DISCUSSION } from './actionsTypes';
+
+interface ICreateDiscussionRequest extends Action {
+	data: any;
+}
+
+interface ICreateDiscussionSuccess extends Action {
+	data: any;
+}
+
+interface ICreateDiscussionFailure extends Action {
+	err: any;
+}
+
+export type TActionCreateDiscussion = ICreateDiscussionRequest & ICreateDiscussionSuccess & ICreateDiscussionFailure;
+
+export function createDiscussionRequest(data: any): ICreateDiscussionRequest {
+	return {
+		type: CREATE_DISCUSSION.REQUEST,
+		data
+	};
+}
+
+export function createDiscussionSuccess(data: any): ICreateDiscussionSuccess {
+	return {
+		type: CREATE_DISCUSSION.SUCCESS,
+		data
+	};
+}
+
+export function createDiscussionFailure(err: any): ICreateDiscussionFailure {
+	return {
+		type: CREATE_DISCUSSION.FAILURE,
+		err
+	};
+}

app/actions/customEmojis.js

-import * as types from './actionsTypes';
-
-export function setCustomEmojis(emojis) {
-	return {
-		type: types.SET_CUSTOM_EMOJIS,
-		emojis
-	};
-}

app/actions/customEmojis.ts

+import { Action } from 'redux';
+
+import { ICustomEmojis } from '../reducers/customEmojis';
+import { SET_CUSTOM_EMOJIS } from './actionsTypes';
+
+export interface ISetCustomEmojis extends Action {
+	emojis: ICustomEmojis;
+}
+
+export type TActionCustomEmojis = ISetCustomEmojis;
+
+export function setCustomEmojis(emojis: ICustomEmojis): ISetCustomEmojis {
+	return {
+		type: SET_CUSTOM_EMOJIS,
+		emojis
+	};
+}

app/actions/deepLinking.js

-import * as types from './actionsTypes';
-
-export function deepLinkingOpen(params) {
-	return {
-		type: types.DEEP_LINKING.OPEN,
-		params
-	};
-}

app/actions/deepLinking.ts

+import { Action } from 'redux';
+
+import { DEEP_LINKING } from './actionsTypes';
+
+interface IParams {
+	path: string;
+	rid: string;
+	messageId: string;
+	host: string;
+	isCall: boolean;
+	fullURL: string;
+	type: string;
+	token: string;
+}
+
+interface IDeepLinkingOpen extends Action {
+	params: Partial<IParams>;
+}
+
+export function deepLinkingOpen(params: Partial<IParams>): IDeepLinkingOpen {
+	return {
+		type: DEEP_LINKING.OPEN,
+		params
+	};
+}

app/actions/encryption.js

-import * as types from './actionsTypes';
-
-export function encryptionInit() {
-	return {
-		type: types.ENCRYPTION.INIT
-	};
-}
-
-export function encryptionStop() {
-	return {
-		type: types.ENCRYPTION.STOP
-	};
-}
-
-export function encryptionSet(enabled = false, banner = null) {
-	return {
-		type: types.ENCRYPTION.SET,
-		enabled,
-		banner
-	};
-}
-
-export function encryptionSetBanner(banner) {
-	return {
-		type: types.ENCRYPTION.SET_BANNER,
-		banner
-	};
-}
-
-export function encryptionDecodeKey(password) {
-	return {
-		type: types.ENCRYPTION.DECODE_KEY,
-		password
-	};
-}

app/actions/encryption.ts

+import { Action } from 'redux';
+
+import { IBanner } from '../reducers/encryption';
+import { ENCRYPTION } from './actionsTypes';
+
+export interface IEncryptionSet extends Action {
+	enabled: boolean;
+	banner: IBanner;
+}
+
+export interface IEncryptionSetBanner extends Action {
+	banner: IBanner;
+}
+export interface IEncryptionDecodeKey extends Action {
+	password: string;
+}
+
+export type TActionEncryption = IEncryptionSet & IEncryptionSetBanner & IEncryptionDecodeKey;
+
+export function encryptionInit(): Action {
+	return {
+		type: ENCRYPTION.INIT
+	};
+}
+
+export function encryptionStop(): Action {
+	return {
+		type: ENCRYPTION.STOP
+	};
+}
+
+export function encryptionSet(enabled = false, banner: IBanner = ''): IEncryptionSet {
+	return {
+		type: ENCRYPTION.SET,
+		enabled,
+		banner
+	};
+}
+
+export function encryptionSetBanner(banner: IBanner = ''): IEncryptionSetBanner {
+	return {
+		type: ENCRYPTION.SET_BANNER,
+		banner
+	};
+}
+
+export function encryptionDecodeKey(password: string): IEncryptionDecodeKey {
+	return {
+		type: ENCRYPTION.DECODE_KEY,
+		password
+	};
+}