diff --git a/app/screens/settings/advanced_settings/advanced_settings.js b/app/screens/settings/advanced_settings/advanced_settings.js
index 3ba60fac2..9f23d3012 100644
--- a/app/screens/settings/advanced_settings/advanced_settings.js
+++ b/app/screens/settings/advanced_settings/advanced_settings.js
@@ -43,56 +43,37 @@ class AdvancedSettings extends PureComponent {
}
clearOfflineCache = preventDoubleTap(() => {
- const {actions, intl} = this.props;
+ const {formatMessage} = this.props.intl;
Alert.alert(
- intl.formatMessage({id: 'mobile.advanced_settings.reset_title', defaultMessage: 'Reset Cache'}),
- intl.formatMessage({id: 'mobile.advanced_settings.reset_message', defaultMessage: '\nThis will reset all offline data and restart the app. You will be automatically logged back in once the app restarts.\n'}),
+ formatMessage({id: 'mobile.advanced_settings.delete_title', defaultMessage: 'Delete Documents & Data'}),
+ formatMessage({id: 'mobile.advanced_settings.delete_message', defaultMessage: '\nThis will reset all offline data and restart the app. You will be automatically logged back in once the app restarts.\n'}),
[{
- text: intl.formatMessage({id: 'mobile.advanced_settings.reset_button', defaultMessage: 'Reset'}),
- onPress: () => actions.purgeOfflineStore(),
- }, {
- text: intl.formatMessage({id: 'channel_modal.cancel', defaultMessage: 'Cancel'}),
+ text: formatMessage({id: 'channel_modal.cancel', defaultMessage: 'Cancel'}),
+ style: 'cancel',
onPress: () => true,
- }]
+ }, {
+ text: formatMessage({id: 'mobile.advanced_settings.delete', defaultMessage: 'Delete'}),
+ style: 'destructive',
+ onPress: this.purgeDocumentsAndData,
+ }],
+ {cancelable: false},
);
});
- clearDownloadCache = preventDoubleTap(() => {
- const {intl} = this.props;
- const {cacheSize} = this.state;
-
- if (cacheSize) {
- Alert.alert(
- intl.formatMessage({
- id: 'mobile.advanced_settings.delete_file_cache',
- defaultMessage: 'Delete File Cache',
- }),
- intl.formatMessage({
- id: 'mobile.advanced_settings.delete_file_cache_message',
- defaultMessage: '\nThis will delete all the files stored in the cache. Are you sure you want to delete them?\n',
- }),
- [{
- text: intl.formatMessage({id: 'mobile.advanced_settings.delete', defaultMessage: 'Delete'}),
- onPress: () => {
- this.setState({cacheSize: null, cacheSizedFetched: false}, async () => {
- await deleteFileCache();
- this.setState({cacheSize: 0, cacheSizedFetched: true});
- });
- },
- }, {
- text: intl.formatMessage({id: 'channel_modal.cancel', defaultMessage: 'Cancel'}),
- onPress: () => true,
- }]
- );
- }
- });
-
getDownloadCacheSize = async () => {
const size = await getFileCacheSize();
this.setState({cacheSize: size, cacheSizedFetched: true});
};
+ purgeDocumentsAndData = preventDoubleTap(async () => {
+ const {actions} = this.props;
+
+ await deleteFileCache();
+ this.setState({cacheSize: 0, cacheSizedFetched: true});
+ actions.purgeOfflineStore();
+ });
+
renderCacheFileSize = () => {
const {theme} = this.props;
const {cacheSize, cacheSizedFetched} = this.state;
@@ -149,7 +130,7 @@ class AdvancedSettings extends PureComponent {
);
- }
+ };
render() {
const {theme} = this.props;
@@ -164,24 +145,14 @@ class AdvancedSettings extends PureComponent {
>
-
-
diff --git a/app/screens/settings/settings_item/index.js b/app/screens/settings/settings_item/index.js
index 6c633f345..a7ec6395c 100644
--- a/app/screens/settings/settings_item/index.js
+++ b/app/screens/settings/settings_item/index.js
@@ -62,13 +62,12 @@ export default class SettingsItem extends PureComponent {
style={textStyle}
/>
);
- }
+ };
render() {
const {
iconName,
iconType,
- isDestructor,
onPress,
rightComponent,
separator,
@@ -85,10 +84,6 @@ export default class SettingsItem extends PureComponent {
let icon;
if (iconType && iconName) {
const iconStyle = [style.icon];
- if (isDestructor) {
- iconStyle.push(style.destructor);
- }
-
icon = (