matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert 'error' usage to Toast

Browse Source
This commit is contained in:
Chewbacca
2022-12-20 11:34:53 -05:00
parent b7d0b4abe8
commit b348ca71b9
27 changed files with 55 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/soapbox/features/security/mfa/disable-otp-form.tsx
View File

@@ -3,7 +3,6 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
import { useHistory } from 'react-router-dom';
import { disableMfa } from 'soapbox/actions/mfa';
import snackbar from 'soapbox/actions/snackbar';
import { Button, Form, FormGroup, Input, FormActions, Stack, Text } from 'soapbox/components/ui';
import { useAppDispatch } from 'soapbox/hooks';
import toast from 'soapbox/toast';
@@ -31,7 +30,7 @@ const DisableOtpForm: React.FC = () => {
}).finally(() => {
setIsLoading(false);
}).catch(() => {
dispatch(snackbar.error(intl.formatMessage(messages.disableFail)));
toast.error(intl.formatMessage(messages.disableFail));
});
}, [password, dispatch, intl]);

4
app/soapbox/features/security/mfa/enable-otp-form.tsx
View File

@@ -3,9 +3,9 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
import { useHistory } from 'react-router-dom';
import { fetchBackupCodes } from 'soapbox/actions/mfa';
import snackbar from 'soapbox/actions/snackbar';
import { Button, FormActions, Spinner, Stack, Text } from 'soapbox/components/ui';
import { useAppDispatch } from 'soapbox/hooks';
import toast from 'soapbox/toast';
const messages = defineMessages({
mfaCancelButton: { id: 'column.mfa_cancel', defaultMessage: 'Cancel' },
@@ -30,7 +30,7 @@ const EnableOtpForm: React.FC<IEnableOtpForm> = ({ displayOtpForm, handleSetupPr
setBackupCodes(backupCodes);
})
.catch(() => {
dispatch(snackbar.error(intl.formatMessage(messages.codesFail)));
toast.error(intl.formatMessage(messages.codesFail));
});
}, []);

5
app/soapbox/features/security/mfa/otp-confirm-form.tsx
View File

@@ -7,7 +7,6 @@ import {
setupMfa,
confirmMfa,
} from 'soapbox/actions/mfa';
import snackbar from 'soapbox/actions/snackbar';
import { Button, Form, FormActions, FormGroup, Input, Stack, Text } from 'soapbox/components/ui';
import { useAppDispatch } from 'soapbox/hooks';
import toast from 'soapbox/toast';
@@ -39,7 +38,7 @@ const OtpConfirmForm: React.FC = () => {
dispatch(setupMfa('totp')).then((data: any) => {
setState((prevState) => ({ ...prevState, qrCodeURI: data.provisioning_uri, confirmKey: data.key }));
}).catch(() => {
dispatch(snackbar.error(intl.formatMessage(messages.qrFail)));
toast.error(intl.formatMessage(messages.qrFail));
});
}, []);
@@ -56,7 +55,7 @@ const OtpConfirmForm: React.FC = () => {
toast.success(intl.formatMessage(messages.mfaConfirmSuccess));
history.push('../auth/edit');
}).catch(() => {
dispatch(snackbar.error(intl.formatMessage(messages.confirmFail)));
toast.error(intl.formatMessage(messages.confirmFail));
setState((prevState) => ({ ...prevState, isLoading: false }));
});