From dd4f591cf43db39ecc096695d4fdfb45412f5622 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 8 Dec 2020 15:04:46 +1100 Subject: [PATCH] deleteAccount => show warning when recover will generate new SessionID --- stylesheets/_session.scss | 1 + stylesheets/manifest.scss | 6 +++--- ts/components/session/LeftPaneSettingSection.tsx | 7 ++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index 5c82977ac..abf534c9c 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -565,6 +565,7 @@ label { &-wrapper { .session-modal__body .session-modal__centered { margin: $session-margin-lg; + text-align: center; } } diff --git a/stylesheets/manifest.scss b/stylesheets/manifest.scss index 9691f822c..6e95cb3fd 100644 --- a/stylesheets/manifest.scss +++ b/stylesheets/manifest.scss @@ -4,9 +4,9 @@ @import 'node_modules/react-contexify/dist/ReactContexify.min.css'; @import 'node_modules/react-toastify/dist/ReactToastify.css'; -@import 'node_modules/sanitize.css/sanitize.css'; -@import 'node_modules/sanitize.css/forms.css'; -@import 'node_modules/sanitize.css/typography.css'; +// @import url(sanitize.css); +// @import url(forms.css); +// @import url(typography.css); // Global Settings, Variables, and Mixins @import 'themes.scss'; diff --git a/ts/components/session/LeftPaneSettingSection.tsx b/ts/components/session/LeftPaneSettingSection.tsx index dc2de5e4c..6934093ba 100644 --- a/ts/components/session/LeftPaneSettingSection.tsx +++ b/ts/components/session/LeftPaneSettingSection.tsx @@ -178,7 +178,7 @@ export class LeftPaneSettingSection extends React.Component { isSecondaryDevice ? 'unpairDevice' : 'clearAllData' ); - const message = window.i18n( + let message = window.i18n( isSecondaryDevice ? 'unpairDeviceWarning' : 'deleteAccountWarning' ); @@ -186,6 +186,11 @@ export class LeftPaneSettingSection extends React.Component { ? window.i18n('unpairDeviceWarningSub') : ''; + const identityKey = window.textsecure.storage.get('identityKey'); + if (identityKey && identityKey.ed25519KeyPair === undefined) { + message = `${message} We've updated the way Session IDs are generated, so you will not be able to restore your current Session ID.`; + } + window.confirmationDialog({ title, message,