Update

README.md

@@ -7,7 +7,7 @@
 
 - **Supported server versions:** 0.70.0+
 - **Supported iOS versions**: 11+
-- **Supported Android versions**: 5.0+
+- **Supported Android versions**: 6.0+
 
 ## Download
 
@@ -35,7 +35,7 @@ Do you want to make the app run on your own server only? [Follow our whitelabel
 
 ## Engage with us
 ### Share your story
-We’d love to hear about [your experience](https://survey.zohopublic.com/zs/e4BUFG) and potentially feature it on our [Blog](https://rocket.chat/case-studies/?utm_source=github&utm_medium=readme&utm_campaign=community).
+We’d love to hear about [your experience](https://survey.zohopublic.com/zs/e4BUFG) and potentially feature it on our [blog](https://rocket.chat/case-studies/?utm_source=github&utm_medium=readme&utm_campaign=community).
 
 ### Subscribe for Updates
-Once a month our marketing team releases an email update with news about product releases, company related topics, events and use cases. [Sign Up!](https://rocket.chat/newsletter/?utm_source=github&utm_medium=readme&utm_campaign=community)
+Once a month our marketing team releases an email update with news about product releases, company related topics, events and use cases. [Sign up!](https://rocket.chat/newsletter/?utm_source=github&utm_medium=readme&utm_campaign=community)

android/app/src/main/AndroidManifest.xml

@@ -8,11 +8,12 @@
 
 	<application
 		android:name=".MainApplication"
-		android:allowBackup="true"
 		android:label="@string/app_name"
 		android:icon="@mipmap/ic_launcher"
 		android:theme="@style/AppTheme"
 		android:networkSecurityConfig="@xml/network_security_config"
+		android:allowBackup="false"
+		tools:replace="android:allowBackup"
 	>
 		<activity
       android:name="com.zoontek.rnbootsplash.RNBootSplashActivity"

android/app/src/play/AndroidManifest.xml

@@ -8,7 +8,6 @@
 
 	<application
 		android:name=".MainApplication"
-		android:allowBackup="true"
 		android:label="@string/app_name"
 		android:icon="@mipmap/ic_launcher"
 		android:theme="@style/AppTheme"

app/containers/message/Thread.js

@@ -23,7 +23,7 @@ const Thread = React.memo(({
 	} = useContext(MessageContext);
 	const time = formatDateThreads(tlm);
 	const buttonText = formatMessageCount(tcount, THREAD);
-	const badgeColor = getBadgeColor(id);
+	const badgeColor = getBadgeColor?.(id);
 	const isFollowing = replies?.find(u => u === user.id);
 	return (
 		<View style={styles.buttonContainer}>

app/utils/moment.js

@@ -9,7 +9,7 @@ const localeKeys = {
 	it: 'it',
 	ja: 'ja',
 	nl: 'nl',
-	'es-ES': 'es-es',
+	'es-ES': 'es',
 	'zh-TW': 'zh-tw'
 };
 

app/views/UserNotificationPreferencesView/index.js

@@ -51,30 +51,33 @@ class UserNotificationPreferencesView extends React.Component {
 		this.setState({ preferences, loading: true });
 	}
 
-	findOption = (key) => {
+	findDefaultOption = (key) => {
 		const { preferences } = this.state;
 		const option = preferences[key] ? OPTIONS[key].find(item => item.value === preferences[key]) : OPTIONS[key][0];
 		return option;
 	}
 
 	renderPickerOption = (key) => {
 		const { theme } = this.props;
-		const text = this.findOption(key);
+		const text = this.findDefaultOption(key);
 		return <Text style={[styles.pickerText, { color: themes[theme].actionTintColor }]}>{I18n.t(text?.label, { defaultValue: text?.label, second: text?.second })}</Text>;
 	}
 
 	pickerSelection = (title, key) => {
 		const { preferences } = this.state;
 		const { navigation } = this.props;
 		let values = OPTIONS[key];
+
+		const defaultOption = this.findDefaultOption(key);
 		if (OPTIONS[key][0]?.value !== 'default') {
-			values = [{ label: `${ I18n.t('Default') } (${ I18n.t(this.findOption(key).label) })`, value: preferences[key]?.value }, ...OPTIONS[key]];
+			values = [{ label: `${ I18n.t('Default') } (${ I18n.t(defaultOption.label) })` }, ...OPTIONS[key]];
 		}
+
 		navigation.navigate('PickerView', {
 			title,
 			data: values,
 			value: preferences[key],
-			onChangeValue: value => this.onValueChangePicker(key, value)
+			onChangeValue: value => this.onValueChangePicker(key, value ?? defaultOption.value)
 		});
 	}