Merge 4.18.0 into master

.eslintignore

@@ -1,6 +1,6 @@
 __tests__
 node_modules
 coverage
-e2e
+e2e/docker
 android
 ios

.eslintrc.js

@@ -29,7 +29,8 @@ module.exports = {
 		"commonjs": true,
 		"es6": true,
 		"node": true,
-		"jquery": true
+		"jquery": true,
+		"mocha": true
 	},
 	"rules": {
 		"react/jsx-filename-extension": [1, {
@@ -155,5 +156,23 @@ module.exports = {
 	},
 	"globals": {
 		"__DEV__": true
-	}
+	},
+	overrides: [
+		{
+			files: ['e2e/**'],
+			globals: {
+				by: true,
+				detox: true,
+				device: true,
+				element: true,
+				expect: true,
+				waitFor: true
+			},
+			rules: {
+				'import/no-extraneous-dependencies': 0,
+				'no-await-in-loop': 0,
+				'no-restricted-syntax': 0
+			}
+		}
+	]
 };

__tests__/__snapshots__/Storyshots.test.js.snap

@@ -11490,7 +11490,7 @@ exports[`Storyshots LoadMore black theme 1`] = `
                       },
                       undefined,
                       Object {
-                        "color": "#e8ebed",
+                        "color": "#cbced1",
                       },
                     ]
                   }
@@ -11593,7 +11593,7 @@ exports[`Storyshots LoadMore black theme 1`] = `
                       },
                       undefined,
                       Object {
-                        "color": "#e8ebed",
+                        "color": "#cbced1",
                       },
                     ]
                   }
@@ -11696,7 +11696,7 @@ exports[`Storyshots LoadMore black theme 1`] = `
                       },
                       undefined,
                       Object {
-                        "color": "#e8ebed",
+                        "color": "#cbced1",
                       },
                     ]
                   }
@@ -11973,7 +11973,7 @@ exports[`Storyshots LoadMore black theme 1`] = `
                       },
                       undefined,
                       Object {
-                        "color": "#e8ebed",
+                        "color": "#cbced1",
                       },
                     ]
                   }
@@ -12076,7 +12076,7 @@ exports[`Storyshots LoadMore black theme 1`] = `
                       },
                       undefined,
                       Object {
-                        "color": "#e8ebed",
+                        "color": "#cbced1",
                       },
                     ]
                   }
@@ -12179,7 +12179,7 @@ exports[`Storyshots LoadMore black theme 1`] = `
                       },
                       undefined,
                       Object {
-                        "color": "#e8ebed",
+                        "color": "#cbced1",
                       },
                     ]
                   }
@@ -12420,7 +12420,7 @@ exports[`Storyshots LoadMore black theme 1`] = `
                       },
                       undefined,
                       Object {
-                        "color": "#e8ebed",
+                        "color": "#cbced1",
                       },
                     ]
                   }
@@ -12692,7 +12692,7 @@ exports[`Storyshots LoadMore dark theme 1`] = `
                       },
                       undefined,
                       Object {
-                        "color": "#e8ebed",
+                        "color": "#cbced1",
                       },
                     ]
                   }
@@ -12795,7 +12795,7 @@ exports[`Storyshots LoadMore dark theme 1`] = `
                       },
                       undefined,
                       Object {
-                        "color": "#e8ebed",
+                        "color": "#cbced1",
                       },
                     ]
                   }
@@ -12898,7 +12898,7 @@ exports[`Storyshots LoadMore dark theme 1`] = `
                       },
                       undefined,
                       Object {
-                        "color": "#e8ebed",
+                        "color": "#cbced1",
                       },
                     ]
                   }
@@ -13175,7 +13175,7 @@ exports[`Storyshots LoadMore dark theme 1`] = `
                       },
                       undefined,
                       Object {
-                        "color": "#e8ebed",
+                        "color": "#cbced1",
                       },
                     ]
                   }
@@ -13278,7 +13278,7 @@ exports[`Storyshots LoadMore dark theme 1`] = `
                       },
                       undefined,
                       Object {
-                        "color": "#e8ebed",
+                        "color": "#cbced1",
                       },
                     ]
                   }
@@ -13381,7 +13381,7 @@ exports[`Storyshots LoadMore dark theme 1`] = `
                       },
                       undefined,
                       Object {
-                        "color": "#e8ebed",
+                        "color": "#cbced1",
                       },
                     ]
                   }
@@ -13622,7 +13622,7 @@ exports[`Storyshots LoadMore dark theme 1`] = `
                       },
                       undefined,
                       Object {
-                        "color": "#e8ebed",
+                        "color": "#cbced1",
                       },
                     ]
                   }
@@ -67631,7 +67631,7 @@ Array [
                   "textAlign": "left",
                 },
                 Object {
-                  "color": "#e8ebed",
+                  "color": "#cbced1",
                 },
                 Object {
                   "backgroundColor": "transparent",
@@ -67791,7 +67791,7 @@ Array [
                   "textAlign": "left",
                 },
                 Object {
-                  "color": "#e8ebed",
+                  "color": "#cbced1",
                 },
                 Object {
                   "backgroundColor": "transparent",
@@ -74309,7 +74309,7 @@ exports[`Storyshots Thread Messages.Item themes 1`] = `
                     "textAlign": "left",
                   },
                   Object {
-                    "color": "#e8ebed",
+                    "color": "#cbced1",
                   },
                   Object {
                     "flex": 1,
@@ -74661,7 +74661,7 @@ exports[`Storyshots Thread Messages.Item themes 1`] = `
                     "textAlign": "left",
                   },
                   Object {
-                    "color": "#e8ebed",
+                    "color": "#cbced1",
                   },
                   Object {
                     "flex": 1,

android/app/build.gradle

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

app/actions/actionsTypes.js

@@ -66,9 +66,10 @@ export const INVITE_LINKS = createRequestTypes('INVITE_LINKS', [
 	'CLEAR',
 	...defaultTypes
 ]);
-export const SETTINGS = createRequestTypes('SETTINGS', ['CLEAR', 'ADD']);
+export const SETTINGS = createRequestTypes('SETTINGS', ['CLEAR', 'ADD', 'UPDATE']);
 export const APP_STATE = createRequestTypes('APP_STATE', ['FOREGROUND', 'BACKGROUND']);
 export const ENTERPRISE_MODULES = createRequestTypes('ENTERPRISE_MODULES', ['CLEAR', 'SET']);
 export const ENCRYPTION = createRequestTypes('ENCRYPTION', ['INIT', 'STOP', 'DECODE_KEY', 'SET', 'SET_BANNER']);
 
-export const PERMISSIONS = createRequestTypes('PERMISSIONS', ['SET']);
+export const PERMISSIONS = createRequestTypes('PERMISSIONS', ['SET', 'UPDATE']);
+export const ROLES = createRequestTypes('ROLES', ['SET', 'UPDATE', 'REMOVE']);

app/actions/login.js

@@ -1,10 +1,11 @@
 import * as types from './actionsTypes';
 
-export function loginRequest(credentials, logoutOnError) {
+export function loginRequest(credentials, logoutOnError, isFromWebView) {
 	return {
 		type: types.LOGIN.REQUEST,
 		credentials,
-		logoutOnError
+		logoutOnError,
+		isFromWebView
 	};
 }
 

app/actions/permissions.js

@@ -6,3 +6,10 @@ export function setPermissions(permissions) {
 		permissions
 	};
 }
+
+export function updatePermission(id, roles) {
+	return {
+		type: types.PERMISSIONS.UPDATE,
+		payload: { id, roles }
+	};
+}

app/actions/roles.js

@@ -0,0 +1,20 @@
+import * as types from './actionsTypes';
+
+export function setRoles(roles) {
+	return {
+		type: types.ROLES.SET,
+		roles
+	};
+}
+export function updateRoles(id, desc) {
+	return {
+		type: types.ROLES.UPDATE,
+		payload: { id, desc }
+	};
+}
+export function removeRoles(id) {
+	return {
+		type: types.ROLES.REMOVE,
+		payload: { id }
+	};
+}

app/actions/room.js

@@ -23,11 +23,12 @@ export function leaveRoom(roomType, room, selected) {
 	};
 }
 
-export function deleteRoom(rid, t) {
+export function deleteRoom(roomType, room, selected) {
 	return {
 		type: types.ROOM.DELETE,
-		rid,
-		t
+		room,
+		roomType,
+		selected
 	};
 }
 

app/actions/settings.js

@@ -7,6 +7,13 @@ export function addSettings(settings) {
 	};
 }
 
+export function updateSettings(id, value) {
+	return {
+		type: SETTINGS.UPDATE,
+		payload: { id, value }
+	};
+}
+
 export function clearSettings() {
 	return {
 		type: SETTINGS.CLEAR

app/constants/colors.js

@@ -74,7 +74,7 @@ export const themes = {
 		auxiliaryBackground: '#07101e',
 		bannerBackground: '#0e1f38',
 		titleText: '#f9f9f9',
-		bodyText: '#e8ebed',
+		bodyText: '#cbced1',
 		backdropColor: '#000000',
 		dangerColor: '#f5455c',
 		successColor: '#2de0a5',
@@ -121,7 +121,7 @@ export const themes = {
 		auxiliaryBackground: '#080808',
 		bannerBackground: '#1f2329',
 		titleText: '#f9f9f9',
-		bodyText: '#e8ebed',
+		bodyText: '#cbced1',
 		backdropColor: '#000000',
 		dangerColor: '#f5455c',
 		successColor: '#2de0a5',

app/constants/settings.js

@@ -196,5 +196,11 @@ export default {
 	},
 	Accounts_AllowInvisibleStatusOption: {
 		type: 'valueAsString'
+	},
+	Jitsi_Enable_Teams: {
+		type: 'valueAsBoolean'
+	},
+	Jitsi_Enable_Channels: {
+		type: 'valuesAsBoolean'
 	}
 };

app/containers/InAppNotification/NotifierComponent.js

@@ -76,7 +76,7 @@ const NotifierComponent = React.memo(({ notification, isMasterDetail }) => {
 	const { title = name, avatar = name } = notification;
 
 	const onPress = () => {
-		const { prid } = payload;
+		const { prid, _id } = payload;
 		if (!rid) {
 			return;
 		}
@@ -89,7 +89,7 @@ const NotifierComponent = React.memo(({ notification, isMasterDetail }) => {
 		} else {
 			Navigation.navigate('RoomsListView');
 		}
-		goRoom({ item, isMasterDetail });
+		goRoom({ item, isMasterDetail, jumpToMessageId: _id });
 		hideNotification();
 	};
 

app/containers/Loading.js

@@ -103,7 +103,7 @@ export default class Loading extends React.PureComponent {
 				transparent
 				onRequestClose={() => {}}
 			>
-				<View style={styles.container}>
+				<View style={styles.container} testID='loading'>
 					<Animated.Image
 						source={require('../static/images/logo.png')}
 						style={[styles.image, {

app/containers/markdown/Link.js

@@ -7,15 +7,19 @@ import { themes } from '../../constants/colors';
 import { LISTENER } from '../Toast';
 import EventEmitter from '../../utils/events';
 import I18n from '../../i18n';
+import openLink from '../../utils/openLink';
 
 const Link = React.memo(({
 	children, link, theme, onLinkPress
 }) => {
 	const handlePress = () => {
-		if (!link || !onLinkPress) {
+		if (!link) {
 			return;
 		}
-		onLinkPress(link);
+		if (onLinkPress) {
+			return onLinkPress(link);
+		}
+		openLink(link, theme);
 	};
 
 	const childLength = React.Children.toArray(children).filter(o => o).length;

app/i18n/locales/ar.json

@@ -387,7 +387,6 @@
   "Preferences_saved": "تم حفظ التفضيلات",
   "Privacy_Policy": "سياسة الخصوصية",
   "Private_Channel": "قناة خاصة",
-  "Private_Groups": "مجموعات خاصة",
   "Private": "خاص",
   "Processing": "جار معالجة...",
   "Profile_saved_successfully": "تم حفظ الملف الشخصي بنجاح!",