From 2a1d969fa53034feb7149843cc9b847220eca569 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@getsession.org>
Date: Fri, 6 Sep 2024 11:10:02 +1000
Subject: [PATCH] fix: delete account failed modal strings
---
ts/components/dialog/DeleteAccountModal.tsx | 1 -
ts/util/accountManager.ts | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ts/components/dialog/DeleteAccountModal.tsx b/ts/components/dialog/DeleteAccountModal.tsx
index 46cae8f0d..a391b9e17 100644
--- a/ts/components/dialog/DeleteAccountModal.tsx
+++ b/ts/components/dialog/DeleteAccountModal.tsx
@@ -44,7 +44,6 @@ const DescriptionBeforeAskingConfirmation = (props: {
);
};
-// NODE: strings - check merge conflict
const DescriptionWhenAskingConfirmation = (props: { deleteMode: DeleteModes }) => {
return (
<span className="session-confirm-main-message">
diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts
index 5771b6bb7..c4ac79798 100644
--- a/ts/util/accountManager.ts
+++ b/ts/util/accountManager.ts
@@ -333,10 +333,10 @@ export async function deleteEverythingAndNetworkData() {
window?.inboxStore?.dispatch(updateDeleteAccountModal(null));
window?.inboxStore?.dispatch(
updateConfirmModal({
- title: window.i18n('clearDeviceAndNetworkConfirm'),
+ title: window.i18n('clearDataAll'),
i18nMessage: { token: 'clearDataErrorDescriptionGeneric' },
okTheme: SessionButtonColor.Danger,
- okText: window.i18n('clearDeviceOnly'),
+ okText: window.i18n('clearDevice'),
onClickOk: async () => {
await deleteDbLocally();
window.restart();
@@ -360,7 +360,7 @@ export async function deleteEverythingAndNetworkData() {
// open a new confirm dialog to ask user what to do
window?.inboxStore?.dispatch(
updateConfirmModal({
- title: window.i18n('clearDeviceAndNetworkConfirm'),
+ title: window.i18n('clearDataAll'),
i18nMessage: {
token: 'clearDataErrorDescription',
args: {
@@ -370,7 +370,7 @@ export async function deleteEverythingAndNetworkData() {
},
i18nMessageSub: { token: 'clearDeviceAndNetworkConfirm' },
okTheme: SessionButtonColor.Danger,
- okText: window.i18n('clearDeviceOnly'),
+ okText: window.i18n('clearDevice'),
onClickOk: async () => {
await deleteDbLocally();
window.restart();