Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Account deletion: Add note about merged accounts - attempt #2988

Closed
wants to merge 1 commit into from
Closed

Account deletion: Add note about merged accounts - attempt #2988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions static/app-strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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--"
}
48 changes: 29 additions & 19 deletions ui/modal/modalRemoveAccount/view.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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={
Expand Down
Loading