diff --git a/components/labels.js b/components/labels.js index 7c38808..7fde2b8 100644 --- a/components/labels.js +++ b/components/labels.js @@ -64,7 +64,9 @@ export const settings = { enterCurrent: "Please enter your current password", enterNew: "Please enter a new password", backupReminderTitle: 'Read this before making changes to your password', - backupReminder: 'Just to be safe, please backup your data using the export function before making changes to your password.\n\nLonger passwords are better! Consider using a passphrase.\n\nPlease also make sure you do not lose your password. There is no way to recover your data if you do.\n\nMaking any changes to your password setting will restart the app.', + backupReminder: 'Just to be safe, please backup your data using the export function before making changes to your password.\n\nLonger passwords are better! Consider using a passphrase.\n\nPlease also make sure you do not lose your password. There is no way to recover your data if you do.\n\nMaking any changes to your password setting will keep your data as it was before and restart the app.', + deleteBackupReminderTitle: 'Read this before deleting your password', + deleteBackupReminder: 'Deleting your password means your data will no longer be encrypted.\n\nJust to be safe, please backup your data using the export function before deleting your password.\n\nMaking any changes to your password setting will keep your data as it was before and restart the app.', } } diff --git a/components/settings/password/delete.js b/components/settings/password/delete.js index c4edf40..58666f5 100644 --- a/components/settings/password/delete.js +++ b/components/settings/password/delete.js @@ -59,7 +59,7 @@ export default class DeletePassword extends Component { if (!this.state.enteringCurrentPassword) { showBackUpReminder(() => { this.setState({ enteringCurrentPassword: true }) - }) + }, true) } else { requestHash('pre-delete-pw-check', this.state.currentPassword) } diff --git a/components/settings/password/show-backup-reminder.js b/components/settings/password/show-backup-reminder.js index ea50dcc..11a7d83 100644 --- a/components/settings/password/show-backup-reminder.js +++ b/components/settings/password/show-backup-reminder.js @@ -1,10 +1,19 @@ import { Alert } from 'react-native' import { settings as labels, shared } from '../../labels' -export default function showBackUpReminder(okHandler) { +export default function showBackUpReminder(okHandler, isDelete) { + let title, message + if (isDelete) { + title = labels.passwordSettings.deleteBackupReminderTitle + message = labels.passwordSettings.deleteBackupReminder + } else { + title = labels.passwordSettings.backupReminderTitle + message = labels.passwordSettings.backupReminder + } + Alert.alert( - labels.passwordSettings.backupReminderTitle, - labels.passwordSettings.backupReminder, + title, + message, [{ text: shared.cancel, style: 'cancel'