From 9a6c8663948b9f0d82d32b698c51f6aedc0dfa5e Mon Sep 17 00:00:00 2001
From: miko <sauce47@posteo.net>
Date: Mon, 9 Oct 2023 09:52:41 +0300
Subject: [PATCH] Account deletion, note about merged accounts

---
 static/app-strings.json              |  1 +
 ui/modal/modalRemoveAccount/view.jsx | 48 +++++++++++++++++-----------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/static/app-strings.json b/static/app-strings.json
index ef357c3fb6..f91e31c712 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -2952,6 +2952,7 @@
   "Remove content and send deletion request" : "Remove content and send deletion request",
   "Remove content" : "Remove content",
   "IMPORTANT: this donation is sent without a comment. If you want to include a comment, click the $ next to the comment input area.": "IMPORTANT: this donation is sent without a comment. If you want to include a comment, click the $ next to the comment input area.",
+  "Note: If some other Odysee account is merged with this one, the merged content will be removed from both accounts.": "Note: If some other Odysee account is merged with this one, the merged content will be removed from both accounts.",
 
   "--end--": "--end--"
 }
diff --git a/ui/modal/modalRemoveAccount/view.jsx b/ui/modal/modalRemoveAccount/view.jsx
index 103ed39055..283888b50e 100644
--- a/ui/modal/modalRemoveAccount/view.jsx
+++ b/ui/modal/modalRemoveAccount/view.jsx
@@ -42,25 +42,35 @@ export default function ModalRemoveAccount(props: Props) {
       <Card
         title={__('Delete account')}
         subtitle={
-          isBusy
-            ? ''
-            : status === 'error_occurred'
-            ? __(
-                'Sorry, there may have been an issue when wiping the account and/or sending the deletion request. Please check back in few minutes, and try again. If the issue persists please contact help@odysee.com for possible next steps.'
-              )
-            : isPendingDeletion && isWalletEmpty && !buttonClicked
-            ? __('Account has already been queued for deletion.')
-            : isPendingDeletion && !isWalletEmpty && !buttonClicked
-            ? __(
-                'Account has already been queued for deletion. If you still have content/credits on the account which you want removed, click "Remove content".'
-              )
-            : !isPendingDeletion && !buttonClicked
-            ? __(
-                "Remove all content from the account and send a deletion request to Odysee. Removing the content is a permanent action and can't be undone."
-              )
-            : __(
-                'Account has been queued for deletion, and content has been removed. You will receive an email confirmation once the deletion is completed. It may take few minutes for content to completely disappear.'
-              )
+          <>
+            { isBusy
+              ? ''
+              : status === 'error_occurred'
+              ? __(
+                  'Sorry, there may have been an issue when wiping the account and/or sending the deletion request. Please check back in few minutes, and try again. If the issue persists please contact help@odysee.com for possible next steps.'
+                )
+              : isPendingDeletion && isWalletEmpty && !buttonClicked
+              ? __('Account has already been queued for deletion.')
+              : isPendingDeletion && !isWalletEmpty && !buttonClicked
+              ? __(
+                  'Account has already been queued for deletion. If you still have content/credits on the account which you want removed, click "Remove content".'
+                )
+              : !isPendingDeletion && !buttonClicked
+              ? __(
+                  "Remove all content from the account and send a deletion request to Odysee. Removing the content is a permanent action and can't be undone."
+                )
+              : __(
+                  'Account has been queued for deletion, and content has been removed. You will receive an email confirmation once the deletion is completed. It may take few minutes for content to completely disappear.'
+                )
+            }
+            { showButton && (
+              <p className="form-field__help">
+                {__(
+                   'Note: If some other Odysee account is merged with this one, the merged content will be removed from both accounts.'
+                )}
+              </p>
+           )}
+          </>
         }
         className="confirm__wrapper"
         actions={