moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'delete-account-text' into 'develop' 

DeleteAccount: Do not show explanation related to federation if not federating

See merge request soapbox-pub/soapbox-fe!1439
This commit is contained in:
marcin mikołajczak 2022-05-21 12:32:03 +00:00
parent 66ff9de83e 76cf741bf8
commit 414abfb448
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/soapbox/features/delete_account/index.tsx
View File

@ -4,12 +4,13 @@ import { defineMessages, useIntl } from 'react-intl';
import { deleteAccount } from 'soapbox/actions/security'; import { deleteAccount } from 'soapbox/actions/security';
import snackbar from 'soapbox/actions/snackbar'; import snackbar from 'soapbox/actions/snackbar';
import { Button, Card, CardBody, CardHeader, CardTitle, Form, FormActions, FormGroup, Input } from 'soapbox/components/ui'; import { Button, Card, CardBody, CardHeader, CardTitle, Form, FormActions, FormGroup, Input } from 'soapbox/components/ui';
import { useAppDispatch } from 'soapbox/hooks'; import { useAppDispatch, useFeatures } from 'soapbox/hooks';
const messages = defineMessages({ const messages = defineMessages({
passwordFieldLabel: { id: 'security.fields.password.label', defaultMessage: 'Password' }, passwordFieldLabel: { id: 'security.fields.password.label', defaultMessage: 'Password' },
deleteHeader: { id: 'security.headers.delete', defaultMessage: 'Delete Account' }, deleteHeader: { id: 'security.headers.delete', defaultMessage: 'Delete Account' },
deleteText: { id: 'security.text.delete', defaultMessage: 'To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It\'s not guaranteed that all servers will purge your account.' }, deleteText: { id: 'security.text.delete', defaultMessage: 'To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It\'s not guaranteed that all servers will purge your account.' },
localDeleteText: { id: 'security.text.delete.local', defaultMessage: 'To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone.' },
deleteSubmit: { id: 'security.submit.delete', defaultMessage: 'Delete Account' }, deleteSubmit: { id: 'security.submit.delete', defaultMessage: 'Delete Account' },
deleteAccountSuccess: { id: 'security.delete_account.success', defaultMessage: 'Account successfully deleted.' }, deleteAccountSuccess: { id: 'security.delete_account.success', defaultMessage: 'Account successfully deleted.' },
deleteAccountFail: { id: 'security.delete_account.fail', defaultMessage: 'Account deletion failed.' }, deleteAccountFail: { id: 'security.delete_account.fail', defaultMessage: 'Account deletion failed.' },
@ -18,6 +19,7 @@ const messages = defineMessages({
const DeleteAccount = () => { const DeleteAccount = () => {
const intl = useIntl(); const intl = useIntl();
const dispatch = useAppDispatch(); const dispatch = useAppDispatch();
const features = useFeatures();
const [password, setPassword] = React.useState(''); const [password, setPassword] = React.useState('');
const [isLoading, setLoading] = React.useState(false); const [isLoading, setLoading] = React.useState(false);
@ -49,7 +51,7 @@ const DeleteAccount = () => {
<CardBody> <CardBody>
<p className='text-gray-400 mb-4'> <p className='text-gray-400 mb-4'>
{intl.formatMessage(messages.deleteText)} {intl.formatMessage(features.federating ? messages.deleteText : messages.localDeleteText)}
</p> </p>
<Form onSubmit={handleSubmit}> <Form onSubmit={handleSubmit}>