Convert 'error' usage to Toast

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

View File

@@ -3,9 +3,9 @@ import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
import { useHistory } from 'react-router-dom';
import { remoteInteraction } from 'soapbox/actions/interactions';
import snackbar from 'soapbox/actions/snackbar';
import { Button, Modal, Stack, Text } from 'soapbox/components/ui';
import { useAppSelector, useAppDispatch, useFeatures, useSoapboxConfig, useInstance } from 'soapbox/hooks';
import toast from 'soapbox/toast';
const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
@@ -55,7 +55,7 @@ const UnauthorizedModal: React.FC<IUnauthorizedModal> = ({ action, onClose, acco
})
.catch(error => {
if (error.message === 'Couldn\'t find user') {
dispatch(snackbar.error(intl.formatMessage(messages.userNotFoundError)));
toast.error(intl.formatMessage(messages.userNotFoundError));
}
});
};

View File

@@ -4,7 +4,6 @@ import OtpInput from 'react-otp-input';
import { verifyCredentials } from 'soapbox/actions/auth';
import { closeModal } from 'soapbox/actions/modals';
import snackbar from 'soapbox/actions/snackbar';
import { reConfirmPhoneVerification, reRequestPhoneVerification } from 'soapbox/actions/verification';
import { FormGroup, PhoneInput, Modal, Stack, Text } from 'soapbox/components/ui';
import { useAppDispatch, useAppSelector, useInstance } from 'soapbox/hooks';
@@ -77,11 +76,7 @@ const VerifySmsModal: React.FC<IVerifySmsModal> = ({ onClose }) => {
if (!isValid) {
setStatus(Statuses.IDLE);
dispatch(
snackbar.error(
intl.formatMessage(messages.verificationInvalid),
),
);
toast.error(intl.formatMessage(messages.verificationInvalid));
return;
}
@@ -92,11 +87,7 @@ const VerifySmsModal: React.FC<IVerifySmsModal> = ({ onClose }) => {
})
.finally(() => setStatus(Statuses.REQUESTED))
.catch(() => {
dispatch(
snackbar.error(
intl.formatMessage(messages.verificationFail),
),
);
toast.error(intl.formatMessage(messages.verificationFail));
});
};
@@ -195,11 +186,7 @@ const VerifySmsModal: React.FC<IVerifySmsModal> = ({ onClose }) => {
.then(() => dispatch(closeModal('VERIFY_SMS')));
})
.catch(() => dispatch(
snackbar.error(
intl.formatMessage(messages.verificationExpired),
),
));
.catch(() => toast.error(intl.formatMessage(messages.verificationExpired)));
};
useEffect(() => {

View File

@@ -6,7 +6,6 @@ import {
subscribeAccount,
unsubscribeAccount,
} from 'soapbox/actions/accounts';
import snackbar from 'soapbox/actions/snackbar';
import { IconButton } from 'soapbox/components/ui';
import { useAppDispatch, useFeatures } from 'soapbox/hooks';
import toast from 'soapbox/toast';
@@ -44,13 +43,13 @@ const SubscriptionButton = ({ account }: ISubscriptionButton) => {
toast.success(intl.formatMessage(messages.subscribeSuccess));
const onSubscribeFailure = () =>
dispatch(snackbar.error(intl.formatMessage(messages.subscribeFailure)));
toast.error(intl.formatMessage(messages.subscribeFailure));
const onUnsubscribeSuccess = () =>
toast.success(intl.formatMessage(messages.unsubscribeSuccess));
const onUnsubscribeFailure = () =>
dispatch(snackbar.error(intl.formatMessage(messages.unsubscribeFailure)));
toast.error(intl.formatMessage(messages.unsubscribeFailure));
const onNotifyToggle = () => {
if (account.relationship?.notifying) {