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

Convert 'success' usage to Toast

This commit is contained in:
Chewbacca 2022-12-20 10:47:46 -05:00
parent 01eccc897b
commit b7d0b4abe8
39 changed files with 145 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/soapbox/actions/aliases.ts
View File

@ -1,5 +1,6 @@
import { defineMessages } from 'react-intl'; import { defineMessages } from 'react-intl';
import toast from 'soapbox/toast';
import { isLoggedIn } from 'soapbox/utils/auth'; import { isLoggedIn } from 'soapbox/utils/auth';
import { getFeatures } from 'soapbox/utils/features'; import { getFeatures } from 'soapbox/utils/features';
@ -8,7 +9,6 @@ import api from '../api';
import { showAlertForError } from './alerts'; import { showAlertForError } from './alerts';
import { importFetchedAccounts } from './importer'; import { importFetchedAccounts } from './importer';
import { patchMeSuccess } from './me'; import { patchMeSuccess } from './me';
import snackbar from './snackbar';
import type { AxiosError } from 'axios'; import type { AxiosError } from 'axios';
import type { AppDispatch, RootState } from 'soapbox/store'; import type { AppDispatch, RootState } from 'soapbox/store';
@ -114,7 +114,7 @@ const addToAliases = (account: Account) =>
api(getState).patch('/api/v1/accounts/update_credentials', { also_known_as: [...alsoKnownAs, account.pleroma.get('ap_id')] }) api(getState).patch('/api/v1/accounts/update_credentials', { also_known_as: [...alsoKnownAs, account.pleroma.get('ap_id')] })
.then((response => { .then((response => {
dispatch(snackbar.success(messages.createSuccess)); toast.success(messages.createSuccess);
dispatch(addToAliasesSuccess); dispatch(addToAliasesSuccess);
dispatch(patchMeSuccess(response.data)); dispatch(patchMeSuccess(response.data));
})) }))
@ -129,7 +129,7 @@ const addToAliases = (account: Account) =>
alias: account.acct, alias: account.acct,
}) })
.then(() => { .then(() => {
dispatch(snackbar.success(messages.createSuccess)); toast.success(messages.createSuccess);
dispatch(addToAliasesSuccess); dispatch(addToAliasesSuccess);
dispatch(fetchAliases); dispatch(fetchAliases);
}) })
@ -165,7 +165,7 @@ const removeFromAliases = (account: string) =>
api(getState).patch('/api/v1/accounts/update_credentials', { also_known_as: alsoKnownAs.filter((id: string) => id !== account) }) api(getState).patch('/api/v1/accounts/update_credentials', { also_known_as: alsoKnownAs.filter((id: string) => id !== account) })
.then(response => { .then(response => {
dispatch(snackbar.success(messages.removeSuccess)); toast.success(messages.removeSuccess);
dispatch(removeFromAliasesSuccess); dispatch(removeFromAliasesSuccess);
dispatch(patchMeSuccess(response.data)); dispatch(patchMeSuccess(response.data));
}) })
@ -182,7 +182,7 @@ const removeFromAliases = (account: string) =>
}, },
}) })
.then(response => { .then(response => {
dispatch(snackbar.success(messages.removeSuccess)); toast.success(messages.removeSuccess);
dispatch(removeFromAliasesSuccess); dispatch(removeFromAliasesSuccess);
dispatch(fetchAliases); dispatch(fetchAliases);
}) })

3
app/soapbox/actions/auth.ts
View File

@ -18,6 +18,7 @@ import snackbar from 'soapbox/actions/snackbar';
import { custom } from 'soapbox/custom'; import { custom } from 'soapbox/custom';
import { queryClient } from 'soapbox/queries/client'; import { queryClient } from 'soapbox/queries/client';
import KVStore from 'soapbox/storage/kv-store'; import KVStore from 'soapbox/storage/kv-store';
import toast from 'soapbox/toast';
import { getLoggedInAccount, parseBaseURL } from 'soapbox/utils/auth'; import { getLoggedInAccount, parseBaseURL } from 'soapbox/utils/auth';
import sourceCode from 'soapbox/utils/code'; import sourceCode from 'soapbox/utils/code';
import { getFeatures } from 'soapbox/utils/features'; import { getFeatures } from 'soapbox/utils/features';
@ -246,7 +247,7 @@ export const logOut = () =>
dispatch({ type: AUTH_LOGGED_OUT, account, standalone }); dispatch({ type: AUTH_LOGGED_OUT, account, standalone });
return dispatch(snackbar.success(messages.loggedOut)); toast.success(messages.loggedOut);
}); });
}; };

6
app/soapbox/actions/compose.ts
View File

@ -7,6 +7,7 @@ import snackbar from 'soapbox/actions/snackbar';
import api from 'soapbox/api'; import api from 'soapbox/api';
import { search as emojiSearch } from 'soapbox/features/emoji/emoji-mart-search-light'; import { search as emojiSearch } from 'soapbox/features/emoji/emoji-mart-search-light';
import { tagHistory } from 'soapbox/settings'; import { tagHistory } from 'soapbox/settings';
import toast from 'soapbox/toast';
import { isLoggedIn } from 'soapbox/utils/auth'; import { isLoggedIn } from 'soapbox/utils/auth';
import { getFeatures, parseVersion } from 'soapbox/utils/features'; import { getFeatures, parseVersion } from 'soapbox/utils/features';
import { formatBytes, getVideoDuration } from 'soapbox/utils/media'; import { formatBytes, getVideoDuration } from 'soapbox/utils/media';
@ -211,7 +212,10 @@ const handleComposeSubmit = (dispatch: AppDispatch, getState: () => RootState, c
dispatch(insertIntoTagHistory(composeId, data.tags || [], status)); dispatch(insertIntoTagHistory(composeId, data.tags || [], status));
dispatch(submitComposeSuccess(composeId, { ...data })); dispatch(submitComposeSuccess(composeId, { ...data }));
dispatch(snackbar.success(edit ? messages.editSuccess : messages.success, messages.view, `/@${data.account.acct}/posts/${data.id}`)); toast.success(edit ? messages.editSuccess : messages.success, {
actionLabel: messages.view,
actionLink: `/@${data.account.acct}/posts/${data.id}`,
});
}; };
const needsDescriptions = (state: RootState, composeId: string) => { const needsDescriptions = (state: RootState, composeId: string) => {

23
app/soapbox/actions/events.ts
View File

@ -1,6 +1,7 @@
import { defineMessages, IntlShape } from 'react-intl'; import { defineMessages, IntlShape } from 'react-intl';
import api, { getLinks } from 'soapbox/api'; import api, { getLinks } from 'soapbox/api';
import toast from 'soapbox/toast';
import { formatBytes } from 'soapbox/utils/media'; import { formatBytes } from 'soapbox/utils/media';
import resizeImage from 'soapbox/utils/resize-image'; import resizeImage from 'soapbox/utils/resize-image';
@ -264,7 +265,13 @@ const submitEvent = () =>
dispatch(closeModal('COMPOSE_EVENT')); dispatch(closeModal('COMPOSE_EVENT'));
dispatch(importFetchedStatus(data)); dispatch(importFetchedStatus(data));
dispatch(submitEventSuccess(data)); dispatch(submitEventSuccess(data));
dispatch(snackbar.success(id ? messages.editSuccess : messages.success, messages.view, `/@${data.account.acct}/events/${data.id}`)); toast.success(
id ? messages.editSuccess : messages.success,
{
actionLabel: messages.view,
actionLink: `/@${data.account.acct}/events/${data.id}`,
},
);
}).catch(function(error) { }).catch(function(error) {
dispatch(submitEventFail(error)); dispatch(submitEventFail(error));
}); });
@ -299,11 +306,13 @@ const joinEvent = (id: string, participationMessage?: string) =>
}).then(({ data }) => { }).then(({ data }) => {
dispatch(importFetchedStatus(data)); dispatch(importFetchedStatus(data));
dispatch(joinEventSuccess(data)); dispatch(joinEventSuccess(data));
dispatch(snackbar.success( toast.success(
data.pleroma.event?.join_state === 'pending' ? messages.joinRequestSuccess : messages.joinSuccess, data.pleroma.event?.join_state === 'pending' ? messages.joinRequestSuccess : messages.joinSuccess,
messages.view, {
`/@${data.account.acct}/events/${data.id}`, actionLabel: messages.view,
)); actionLink: `/@${data.account.acct}/events/${data.id}`,
},
);
}).catch(function(error) { }).catch(function(error) {
dispatch(joinEventFail(error, status, status?.event?.join_state || null)); dispatch(joinEventFail(error, status, status?.event?.join_state || null));
}); });
@ -504,7 +513,7 @@ const authorizeEventParticipationRequest = (id: string, accountId: string) =>
.post(`/api/v1/pleroma/events/${id}/participation_requests/${accountId}/authorize`) .post(`/api/v1/pleroma/events/${id}/participation_requests/${accountId}/authorize`)
.then(() => { .then(() => {
dispatch(authorizeEventParticipationRequestSuccess(id, accountId)); dispatch(authorizeEventParticipationRequestSuccess(id, accountId));
dispatch(snackbar.success(messages.authorized)); toast.success(messages.authorized);
}) })
.catch(error => dispatch(authorizeEventParticipationRequestFail(id, accountId, error))); .catch(error => dispatch(authorizeEventParticipationRequestFail(id, accountId, error)));
}; };
@ -536,7 +545,7 @@ const rejectEventParticipationRequest = (id: string, accountId: string) =>
.post(`/api/v1/pleroma/events/${id}/participation_requests/${accountId}/reject`) .post(`/api/v1/pleroma/events/${id}/participation_requests/${accountId}/reject`)
.then(() => { .then(() => {
dispatch(rejectEventParticipationRequestSuccess(id, accountId)); dispatch(rejectEventParticipationRequestSuccess(id, accountId));
dispatch(snackbar.success(messages.rejected)); toast.success(messages.rejected);
}) })
.catch(error => dispatch(rejectEventParticipationRequestFail(id, accountId, error))); .catch(error => dispatch(rejectEventParticipationRequestFail(id, accountId, error)));
}; };

8
app/soapbox/actions/export-data.ts
View File

@ -1,8 +1,8 @@
import { defineMessages } from 'react-intl'; import { defineMessages } from 'react-intl';
import snackbar from 'soapbox/actions/snackbar';
import api, { getLinks } from 'soapbox/api'; import api, { getLinks } from 'soapbox/api';
import { normalizeAccount } from 'soapbox/normalizers'; import { normalizeAccount } from 'soapbox/normalizers';
import toast from 'soapbox/toast';
import type { SnackbarAction } from './snackbar'; import type { SnackbarAction } from './snackbar';
import type { AxiosResponse } from 'axios'; import type { AxiosResponse } from 'axios';
@ -75,7 +75,7 @@ export const exportFollows = () => (dispatch: React.Dispatch<ExportDataActions>,
followings.unshift('Account address,Show boosts'); followings.unshift('Account address,Show boosts');
fileExport(followings.join('\n'), 'export_followings.csv'); fileExport(followings.join('\n'), 'export_followings.csv');
dispatch(snackbar.success(messages.followersSuccess)); toast.success(messages.followersSuccess);
dispatch({ type: EXPORT_FOLLOWS_SUCCESS }); dispatch({ type: EXPORT_FOLLOWS_SUCCESS });
}).catch(error => { }).catch(error => {
dispatch({ type: EXPORT_FOLLOWS_FAIL, error }); dispatch({ type: EXPORT_FOLLOWS_FAIL, error });
@ -90,7 +90,7 @@ export const exportBlocks = () => (dispatch: React.Dispatch<ExportDataActions>,
.then((blocks) => { .then((blocks) => {
fileExport(blocks.join('\n'), 'export_block.csv'); fileExport(blocks.join('\n'), 'export_block.csv');
dispatch(snackbar.success(messages.blocksSuccess)); toast.success(messages.blocksSuccess);
dispatch({ type: EXPORT_BLOCKS_SUCCESS }); dispatch({ type: EXPORT_BLOCKS_SUCCESS });
}).catch(error => { }).catch(error => {
dispatch({ type: EXPORT_BLOCKS_FAIL, error }); dispatch({ type: EXPORT_BLOCKS_FAIL, error });
@ -105,7 +105,7 @@ export const exportMutes = () => (dispatch: React.Dispatch<ExportDataActions>, g
.then((mutes) => { .then((mutes) => {
fileExport(mutes.join('\n'), 'export_mutes.csv'); fileExport(mutes.join('\n'), 'export_mutes.csv');
dispatch(snackbar.success(messages.mutesSuccess)); toast.success(messages.mutesSuccess);
dispatch({ type: EXPORT_MUTES_SUCCESS }); dispatch({ type: EXPORT_MUTES_SUCCESS });
}).catch(error => { }).catch(error => {
dispatch({ type: EXPORT_MUTES_FAIL, error }); dispatch({ type: EXPORT_MUTES_FAIL, error });

6
app/soapbox/actions/filters.ts
View File

@ -1,6 +1,6 @@
import { defineMessages } from 'react-intl'; import { defineMessages } from 'react-intl';
import snackbar from 'soapbox/actions/snackbar'; import toast from 'soapbox/toast';
import { isLoggedIn } from 'soapbox/utils/auth'; import { isLoggedIn } from 'soapbox/utils/auth';
import { getFeatures } from 'soapbox/utils/features'; import { getFeatures } from 'soapbox/utils/features';
@ -66,7 +66,7 @@ const createFilter = (phrase: string, expires_at: string, context: Array<string>
expires_at, expires_at,
}).then(response => { }).then(response => {
dispatch({ type: FILTERS_CREATE_SUCCESS, filter: response.data }); dispatch({ type: FILTERS_CREATE_SUCCESS, filter: response.data });
dispatch(snackbar.success(messages.added)); toast.success(messages.added);
}).catch(error => { }).catch(error => {
dispatch({ type: FILTERS_CREATE_FAIL, error }); dispatch({ type: FILTERS_CREATE_FAIL, error });
}); });
@ -77,7 +77,7 @@ const deleteFilter = (id: string) =>
dispatch({ type: FILTERS_DELETE_REQUEST }); dispatch({ type: FILTERS_DELETE_REQUEST });
return api(getState).delete(`/api/v1/filters/${id}`).then(response => { return api(getState).delete(`/api/v1/filters/${id}`).then(response => {
dispatch({ type: FILTERS_DELETE_SUCCESS, filter: response.data }); dispatch({ type: FILTERS_DELETE_SUCCESS, filter: response.data });
dispatch(snackbar.success(messages.removed)); toast.success(messages.removed);
}).catch(error => { }).catch(error => {
dispatch({ type: FILTERS_DELETE_FAIL, error }); dispatch({ type: FILTERS_DELETE_FAIL, error });
}); });

8
app/soapbox/actions/import-data.ts
View File

@ -1,6 +1,6 @@
import { defineMessages } from 'react-intl'; import { defineMessages } from 'react-intl';
import snackbar from 'soapbox/actions/snackbar'; import toast from 'soapbox/toast';
import api from '../api'; import api from '../api';
@ -45,7 +45,7 @@ export const importFollows = (params: FormData) =>
return api(getState) return api(getState)
.post('/api/pleroma/follow_import', params) .post('/api/pleroma/follow_import', params)
.then(response => { .then(response => {
dispatch(snackbar.success(messages.followersSuccess)); toast.success(messages.followersSuccess);
dispatch({ type: IMPORT_FOLLOWS_SUCCESS, config: response.data }); dispatch({ type: IMPORT_FOLLOWS_SUCCESS, config: response.data });
}).catch(error => { }).catch(error => {
dispatch({ type: IMPORT_FOLLOWS_FAIL, error }); dispatch({ type: IMPORT_FOLLOWS_FAIL, error });
@ -58,7 +58,7 @@ export const importBlocks = (params: FormData) =>
return api(getState) return api(getState)
.post('/api/pleroma/blocks_import', params) .post('/api/pleroma/blocks_import', params)
.then(response => { .then(response => {
dispatch(snackbar.success(messages.blocksSuccess)); toast.success(messages.blocksSuccess);
dispatch({ type: IMPORT_BLOCKS_SUCCESS, config: response.data }); dispatch({ type: IMPORT_BLOCKS_SUCCESS, config: response.data });
}).catch(error => { }).catch(error => {
dispatch({ type: IMPORT_BLOCKS_FAIL, error }); dispatch({ type: IMPORT_BLOCKS_FAIL, error });
@ -71,7 +71,7 @@ export const importMutes = (params: FormData) =>
return api(getState) return api(getState)
.post('/api/pleroma/mutes_import', params) .post('/api/pleroma/mutes_import', params)
.then(response => { .then(response => {
dispatch(snackbar.success(messages.mutesSuccess)); toast.success(messages.mutesSuccess);
dispatch({ type: IMPORT_MUTES_SUCCESS, config: response.data }); dispatch({ type: IMPORT_MUTES_SUCCESS, config: response.data });
}).catch(error => { }).catch(error => {
dispatch({ type: IMPORT_MUTES_FAIL, error }); dispatch({ type: IMPORT_MUTES_FAIL, error });

9
app/soapbox/actions/interactions.ts
View File

@ -1,6 +1,6 @@
import { defineMessages } from 'react-intl'; import { defineMessages } from 'react-intl';
import snackbar from 'soapbox/actions/snackbar'; import toast from 'soapbox/toast';
import { isLoggedIn } from 'soapbox/utils/auth'; import { isLoggedIn } from 'soapbox/utils/auth';
import api from '../api'; import api from '../api';
@ -222,7 +222,10 @@ const bookmark = (status: StatusEntity) =>
api(getState).post(`/api/v1/statuses/${status.get('id')}/bookmark`).then(function(response) { api(getState).post(`/api/v1/statuses/${status.get('id')}/bookmark`).then(function(response) {
dispatch(importFetchedStatus(response.data)); dispatch(importFetchedStatus(response.data));
dispatch(bookmarkSuccess(status, response.data)); dispatch(bookmarkSuccess(status, response.data));
dispatch(snackbar.success(messages.bookmarkAdded, messages.view, '/bookmarks')); toast.success(messages.bookmarkAdded, {
actionLabel: messages.view,
actionLink: '/bookmarks',
});
}).catch(function(error) { }).catch(function(error) {
dispatch(bookmarkFail(status, error)); dispatch(bookmarkFail(status, error));
}); });
@ -235,7 +238,7 @@ const unbookmark = (status: StatusEntity) =>
api(getState).post(`/api/v1/statuses/${status.get('id')}/unbookmark`).then(response => { api(getState).post(`/api/v1/statuses/${status.get('id')}/unbookmark`).then(response => {
dispatch(importFetchedStatus(response.data)); dispatch(importFetchedStatus(response.data));
dispatch(unbookmarkSuccess(status, response.data)); dispatch(unbookmarkSuccess(status, response.data));
dispatch(snackbar.success(messages.bookmarkRemoved)); toast.success(messages.bookmarkRemoved);
}).catch(error => { }).catch(error => {
dispatch(unbookmarkFail(status, error)); dispatch(unbookmarkFail(status, error));
}); });

10
app/soapbox/actions/moderation.tsx
View File

@ -4,10 +4,10 @@ import { defineMessages, IntlShape } from 'react-intl';
import { fetchAccountByUsername } from 'soapbox/actions/accounts'; import { fetchAccountByUsername } from 'soapbox/actions/accounts';
import { deactivateUsers, deleteUsers, deleteStatus, toggleStatusSensitivity } from 'soapbox/actions/admin'; import { deactivateUsers, deleteUsers, deleteStatus, toggleStatusSensitivity } from 'soapbox/actions/admin';
import { openModal } from 'soapbox/actions/modals'; import { openModal } from 'soapbox/actions/modals';
import snackbar from 'soapbox/actions/snackbar';
import OutlineBox from 'soapbox/components/outline-box'; import OutlineBox from 'soapbox/components/outline-box';
import { Stack, Text } from 'soapbox/components/ui'; import { Stack, Text } from 'soapbox/components/ui';
import AccountContainer from 'soapbox/containers/account-container'; import AccountContainer from 'soapbox/containers/account-container';
import toast from 'soapbox/toast';
import { isLocal } from 'soapbox/utils/accounts'; import { isLocal } from 'soapbox/utils/accounts';
import type { AppDispatch, RootState } from 'soapbox/store'; import type { AppDispatch, RootState } from 'soapbox/store';
@ -65,7 +65,7 @@ const deactivateUserModal = (intl: IntlShape, accountId: string, afterConfirm =
onConfirm: () => { onConfirm: () => {
dispatch(deactivateUsers([accountId])).then(() => { dispatch(deactivateUsers([accountId])).then(() => {
const message = intl.formatMessage(messages.userDeactivated, { acct }); const message = intl.formatMessage(messages.userDeactivated, { acct });
dispatch(snackbar.success(message)); toast.success(message);
afterConfirm(); afterConfirm();
}).catch(() => {}); }).catch(() => {});
}, },
@ -105,7 +105,7 @@ const deleteUserModal = (intl: IntlShape, accountId: string, afterConfirm = () =
dispatch(deleteUsers([accountId])).then(() => { dispatch(deleteUsers([accountId])).then(() => {
const message = intl.formatMessage(messages.userDeleted, { acct }); const message = intl.formatMessage(messages.userDeleted, { acct });
dispatch(fetchAccountByUsername(acct)); dispatch(fetchAccountByUsername(acct));
dispatch(snackbar.success(message)); toast.success(message);
afterConfirm(); afterConfirm();
}).catch(() => {}); }).catch(() => {});
}, },
@ -147,7 +147,7 @@ const toggleStatusSensitivityModal = (intl: IntlShape, statusId: string, sensiti
onConfirm: () => { onConfirm: () => {
dispatch(toggleStatusSensitivity(statusId, sensitive)).then(() => { dispatch(toggleStatusSensitivity(statusId, sensitive)).then(() => {
const message = intl.formatMessage(sensitive === false ? messages.statusMarkedSensitive : messages.statusMarkedNotSensitive, { acct }); const message = intl.formatMessage(sensitive === false ? messages.statusMarkedSensitive : messages.statusMarkedNotSensitive, { acct });
dispatch(snackbar.success(message)); toast.success(message);
}).catch(() => {}); }).catch(() => {});
afterConfirm(); afterConfirm();
}, },
@ -168,7 +168,7 @@ const deleteStatusModal = (intl: IntlShape, statusId: string, afterConfirm = ()
onConfirm: () => { onConfirm: () => {
dispatch(deleteStatus(statusId)).then(() => { dispatch(deleteStatus(statusId)).then(() => {
const message = intl.formatMessage(messages.statusDeleted, { acct }); const message = intl.formatMessage(messages.statusDeleted, { acct });
dispatch(snackbar.success(message)); toast.success(message);
}).catch(() => {}); }).catch(() => {});
afterConfirm(); afterConfirm();
}, },

4
app/soapbox/actions/security.ts
View File

@ -4,7 +4,7 @@
* @see module:soapbox/actions/auth * @see module:soapbox/actions/auth
*/ */
import snackbar from 'soapbox/actions/snackbar'; import toast from 'soapbox/toast';
import { getLoggedInAccount } from 'soapbox/utils/auth'; import { getLoggedInAccount } from 'soapbox/utils/auth';
import { parseVersion, TRUTHSOCIAL } from 'soapbox/utils/features'; import { parseVersion, TRUTHSOCIAL } from 'soapbox/utils/features';
import { normalizeUsername } from 'soapbox/utils/input'; import { normalizeUsername } from 'soapbox/utils/input';
@ -152,7 +152,7 @@ const deleteAccount = (password: string) =>
if (response.data.error) throw response.data.error; // This endpoint returns HTTP 200 even on failure if (response.data.error) throw response.data.error; // This endpoint returns HTTP 200 even on failure
dispatch({ type: DELETE_ACCOUNT_SUCCESS, response }); dispatch({ type: DELETE_ACCOUNT_SUCCESS, response });
dispatch({ type: AUTH_LOGGED_OUT, account }); dispatch({ type: AUTH_LOGGED_OUT, account });
dispatch(snackbar.success(messages.loggedOut)); toast.success(messages.loggedOut);
}).catch(error => { }).catch(error => {
dispatch({ type: DELETE_ACCOUNT_FAIL, error, skipAlert: true }); dispatch({ type: DELETE_ACCOUNT_FAIL, error, skipAlert: true });
throw error; throw error;

4
app/soapbox/actions/settings.ts
View File

@ -4,10 +4,10 @@ import { createSelector } from 'reselect';
import { v4 as uuid } from 'uuid'; import { v4 as uuid } from 'uuid';
import { patchMe } from 'soapbox/actions/me'; import { patchMe } from 'soapbox/actions/me';
import toast from 'soapbox/toast';
import { isLoggedIn } from 'soapbox/utils/auth'; import { isLoggedIn } from 'soapbox/utils/auth';
import { showAlertForError } from './alerts'; import { showAlertForError } from './alerts';
import snackbar from './snackbar';
import type { AppDispatch, RootState } from 'soapbox/store'; import type { AppDispatch, RootState } from 'soapbox/store';
@ -222,7 +222,7 @@ const saveSettingsImmediate = (opts?: SettingOpts) =>
dispatch({ type: SETTING_SAVE }); dispatch({ type: SETTING_SAVE });
if (opts?.showAlert) { if (opts?.showAlert) {
dispatch(snackbar.success(messages.saveSuccess)); toast.success(messages.saveSuccess);
} }
}).catch(error => { }).catch(error => {
dispatch(showAlertForError(error)); dispatch(showAlertForError(error));

3
app/soapbox/containers/soapbox.tsx
View File

@ -3,12 +3,14 @@
import { QueryClientProvider } from '@tanstack/react-query'; import { QueryClientProvider } from '@tanstack/react-query';
import classNames from 'clsx'; import classNames from 'clsx';
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { Toaster } from 'react-hot-toast';
import { IntlProvider } from 'react-intl'; import { IntlProvider } from 'react-intl';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
import { BrowserRouter, Switch, Redirect, Route } from 'react-router-dom'; import { BrowserRouter, Switch, Redirect, Route } from 'react-router-dom';
// @ts-ignore: it doesn't have types // @ts-ignore: it doesn't have types
import { ScrollContext } from 'react-router-scroll-4'; import { ScrollContext } from 'react-router-scroll-4';
import { loadInstance } from 'soapbox/actions/instance'; import { loadInstance } from 'soapbox/actions/instance';
import { fetchMe } from 'soapbox/actions/me'; import { fetchMe } from 'soapbox/actions/me';
import { loadSoapboxConfig, getSoapboxConfig } from 'soapbox/actions/soapbox'; import { loadSoapboxConfig, getSoapboxConfig } from 'soapbox/actions/soapbox';
@ -194,6 +196,7 @@ const SoapboxMount = () => {
</BundleContainer> </BundleContainer>
<GdprBanner /> <GdprBanner />
<Toaster position='top-right' containerClassName='top-10' containerStyle={{ top: 75 }} />
</Route> </Route>
</Switch> </Switch>
</ScrollContext> </ScrollContext>

5
app/soapbox/features/account/components/header.tsx
View File

@ -27,6 +27,7 @@ import { useAppDispatch, useFeatures, useOwnAccount } from 'soapbox/hooks';
import { normalizeAttachment } from 'soapbox/normalizers'; import { normalizeAttachment } from 'soapbox/normalizers';
import { ChatKeys, useChats } from 'soapbox/queries/chats'; import { ChatKeys, useChats } from 'soapbox/queries/chats';
import { queryClient } from 'soapbox/queries/client'; import { queryClient } from 'soapbox/queries/client';
import toast from 'soapbox/toast';
import { Account } from 'soapbox/types/entities'; import { Account } from 'soapbox/types/entities';
import { isDefaultHeader, isRemote } from 'soapbox/utils/accounts'; import { isDefaultHeader, isRemote } from 'soapbox/utils/accounts';
@ -158,11 +159,11 @@ const Header: React.FC<IHeader> = ({ account }) => {
const onEndorseToggle = () => { const onEndorseToggle = () => {
if (account.relationship?.endorsed) { if (account.relationship?.endorsed) {
dispatch(unpinAccount(account.id)) dispatch(unpinAccount(account.id))
.then(() => dispatch(snackbar.success(intl.formatMessage(messages.userUnendorsed, { acct: account.acct })))) .then(() => toast.success(intl.formatMessage(messages.userUnendorsed, { acct: account.acct })))
.catch(() => { }); .catch(() => { });
} else { } else {
dispatch(pinAccount(account.id)) dispatch(pinAccount(account.id))
.then(() => dispatch(snackbar.success(intl.formatMessage(messages.userEndorsed, { acct: account.acct })))) .then(() => toast.success(intl.formatMessage(messages.userEndorsed, { acct: account.acct })))
.catch(() => { }); .catch(() => { });
} }
}; };

4
app/soapbox/features/admin/components/registration-mode-picker.tsx
View File

@ -2,9 +2,9 @@ import React from 'react';
import { useIntl, defineMessages, FormattedMessage } from 'react-intl'; import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
import { updateConfig } from 'soapbox/actions/admin'; import { updateConfig } from 'soapbox/actions/admin';
import snackbar from 'soapbox/actions/snackbar';
import { RadioGroup, RadioItem } from 'soapbox/components/radio'; import { RadioGroup, RadioItem } from 'soapbox/components/radio';
import { useAppDispatch, useInstance } from 'soapbox/hooks'; import { useAppDispatch, useInstance } from 'soapbox/hooks';
import toast from 'soapbox/toast';
import type { Instance } from 'soapbox/types/entities'; import type { Instance } from 'soapbox/types/entities';
@ -44,7 +44,7 @@ const RegistrationModePicker: React.FC = () => {
const onChange: React.ChangeEventHandler<HTMLInputElement> = e => { const onChange: React.ChangeEventHandler<HTMLInputElement> = e => {
const config = generateConfig(e.target.value as RegistrationMode); const config = generateConfig(e.target.value as RegistrationMode);
dispatch(updateConfig(config)).then(() => { dispatch(updateConfig(config)).then(() => {
dispatch(snackbar.success(intl.formatMessage(messages.saved))); toast.success(intl.formatMessage(messages.saved));
}).catch(() => {}); }).catch(() => {});
}; };

4
app/soapbox/features/admin/components/report.tsx
View File

@ -4,13 +4,13 @@ import { Link } from 'react-router-dom';
import { closeReports } from 'soapbox/actions/admin'; import { closeReports } from 'soapbox/actions/admin';
import { deactivateUserModal, deleteUserModal } from 'soapbox/actions/moderation'; import { deactivateUserModal, deleteUserModal } from 'soapbox/actions/moderation';
import snackbar from 'soapbox/actions/snackbar';
import Avatar from 'soapbox/components/avatar'; import Avatar from 'soapbox/components/avatar';
import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper'; import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper';
import { Accordion, Button, Stack, HStack, Text } from 'soapbox/components/ui'; import { Accordion, Button, Stack, HStack, Text } from 'soapbox/components/ui';
import DropdownMenu from 'soapbox/containers/dropdown-menu-container'; import DropdownMenu from 'soapbox/containers/dropdown-menu-container';
import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
import { makeGetReport } from 'soapbox/selectors'; import { makeGetReport } from 'soapbox/selectors';
import toast from 'soapbox/toast';
import ReportStatus from './report-status'; import ReportStatus from './report-status';
@ -58,7 +58,7 @@ const Report: React.FC<IReport> = ({ id }) => {
const handleCloseReport = () => { const handleCloseReport = () => {
dispatch(closeReports([report.id])).then(() => { dispatch(closeReports([report.id])).then(() => {
const message = intl.formatMessage(messages.reportClosed, { name: targetAccount.username as string }); const message = intl.formatMessage(messages.reportClosed, { name: targetAccount.username as string });
dispatch(snackbar.success(message)); toast.success(message);
}).catch(() => {}); }).catch(() => {});
}; };

3
app/soapbox/features/admin/components/unapproved-account.tsx
View File

@ -7,6 +7,7 @@ import snackbar from 'soapbox/actions/snackbar';
import { Stack, HStack, Text, IconButton } from 'soapbox/components/ui'; import { Stack, HStack, Text, IconButton } from 'soapbox/components/ui';
import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks';
import { makeGetAccount } from 'soapbox/selectors'; import { makeGetAccount } from 'soapbox/selectors';
import toast from 'soapbox/toast';
const messages = defineMessages({ const messages = defineMessages({
approved: { id: 'admin.awaiting_approval.approved_message', defaultMessage: '{acct} was approved!' }, approved: { id: 'admin.awaiting_approval.approved_message', defaultMessage: '{acct} was approved!' },
@ -32,7 +33,7 @@ const UnapprovedAccount: React.FC<IUnapprovedAccount> = ({ accountId }) => {
dispatch(approveUsers([account.id])) dispatch(approveUsers([account.id]))
.then(() => { .then(() => {
const message = intl.formatMessage(messages.approved, { acct: `@${account.acct}` }); const message = intl.formatMessage(messages.approved, { acct: `@${account.acct}` });
dispatch(snackbar.success(message)); toast.success(message);
}) })
.catch(() => {}); .catch(() => {});
}; };

3
app/soapbox/features/delete-account/index.tsx
View File

@ -5,6 +5,7 @@ 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, Stack, Text } from 'soapbox/components/ui'; import { Button, Card, CardBody, CardHeader, CardTitle, Form, FormActions, FormGroup, Input, Stack, Text } from 'soapbox/components/ui';
import { useAppDispatch, useFeatures } from 'soapbox/hooks'; import { useAppDispatch, useFeatures } from 'soapbox/hooks';
import toast from 'soapbox/toast';
const messages = defineMessages({ const messages = defineMessages({
passwordFieldLabel: { id: 'security.fields.password.label', defaultMessage: 'Password' }, passwordFieldLabel: { id: 'security.fields.password.label', defaultMessage: 'Password' },
@ -34,7 +35,7 @@ const DeleteAccount = () => {
setLoading(true); setLoading(true);
dispatch(deleteAccount(password)).then(() => { dispatch(deleteAccount(password)).then(() => {
setPassword(''); setPassword('');
dispatch(snackbar.success(intl.formatMessage(messages.deleteAccountSuccess))); toast.success(intl.formatMessage(messages.deleteAccountSuccess));
}).finally(() => { }).finally(() => {
setLoading(false); setLoading(false);
}).catch(() => { }).catch(() => {

3
app/soapbox/features/developers/developers-challenge.tsx
View File

@ -5,6 +5,7 @@ import { useDispatch } from 'react-redux';
import { changeSettingImmediate } from 'soapbox/actions/settings'; import { changeSettingImmediate } from 'soapbox/actions/settings';
import snackbar from 'soapbox/actions/snackbar'; import snackbar from 'soapbox/actions/snackbar';
import { Column, Button, Form, FormActions, FormGroup, Input, Text } from 'soapbox/components/ui'; import { Column, Button, Form, FormActions, FormGroup, Input, Text } from 'soapbox/components/ui';
import toast from 'soapbox/toast';
const messages = defineMessages({ const messages = defineMessages({
heading: { id: 'column.developers', defaultMessage: 'Developers' }, heading: { id: 'column.developers', defaultMessage: 'Developers' },
@ -27,7 +28,7 @@ const DevelopersChallenge = () => {
const handleSubmit = () => { const handleSubmit = () => {
if (answer === 'boxsoap') { if (answer === 'boxsoap') {
dispatch(changeSettingImmediate(['isDeveloper'], true)); dispatch(changeSettingImmediate(['isDeveloper'], true));
dispatch(snackbar.success(intl.formatMessage(messages.success))); toast.success(intl.formatMessage(messages.success));
} else { } else {
dispatch(snackbar.error(intl.formatMessage(messages.fail))); dispatch(snackbar.error(intl.formatMessage(messages.fail)));
} }

21
app/soapbox/features/developers/developers-menu.tsx
View File

@ -4,9 +4,9 @@ import { useDispatch } from 'react-redux';
import { Link, useHistory } from 'react-router-dom'; import { Link, useHistory } from 'react-router-dom';
import { changeSettingImmediate } from 'soapbox/actions/settings'; import { changeSettingImmediate } from 'soapbox/actions/settings';
import snackbar from 'soapbox/actions/snackbar';
import { Column, Text } from 'soapbox/components/ui'; import { Column, Text } from 'soapbox/components/ui';
import SvgIcon from 'soapbox/components/ui/icon/svg-icon'; import SvgIcon from 'soapbox/components/ui/icon/svg-icon';
import toast from 'soapbox/toast';
import sourceCode from 'soapbox/utils/code'; import sourceCode from 'soapbox/utils/code';
const messages = defineMessages({ const messages = defineMessages({
@ -39,10 +39,19 @@ const Developers: React.FC = () => {
e.preventDefault(); e.preventDefault();
dispatch(changeSettingImmediate(['isDeveloper'], false)); dispatch(changeSettingImmediate(['isDeveloper'], false));
dispatch(snackbar.success(intl.formatMessage(messages.leave))); toast.success(intl.formatMessage(messages.leave));
history.push('/'); history.push('/');
}; };
const showSnackbar = (event: React.MouseEvent<HTMLButtonElement>) => {
event.preventDefault();
toast.success('Hello world!', {
action: () => alert('hi'),
actionLabel: 'Click me',
});
};
return ( return (
<> <>
<Column label={intl.formatMessage(messages.heading)}> <Column label={intl.formatMessage(messages.heading)}>
@ -102,6 +111,14 @@ const Developers: React.FC = () => {
<FormattedMessage id='developers.navigation.leave_developers_label' defaultMessage='Leave developers' /> <FormattedMessage id='developers.navigation.leave_developers_label' defaultMessage='Leave developers' />
</Text> </Text>
</DashWidget> </DashWidget>
<DashWidget onClick={showSnackbar}>
<SvgIcon src={require('@tabler/icons/urgent.svg')} className='text-gray-700 dark:text-gray-600' />
<Text>
<FormattedMessage id='developers.navigation.show_snackbar' defaultMessage='Trigger Snackbar' />
</Text>
</DashWidget>
</div> </div>
</Column> </Column>

3
app/soapbox/features/edit-email/index.tsx
View File

@ -5,6 +5,7 @@ import { changeEmail } from 'soapbox/actions/security';
import snackbar from 'soapbox/actions/snackbar'; import snackbar from 'soapbox/actions/snackbar';
import { Button, Card, CardBody, CardHeader, CardTitle, Column, Form, FormActions, FormGroup, Input } from 'soapbox/components/ui'; import { Button, Card, CardBody, CardHeader, CardTitle, Column, Form, FormActions, FormGroup, Input } from 'soapbox/components/ui';
import { useAppDispatch } from 'soapbox/hooks'; import { useAppDispatch } from 'soapbox/hooks';
import toast from 'soapbox/toast';
const messages = defineMessages({ const messages = defineMessages({
header: { id: 'edit_email.header', defaultMessage: 'Change Email' }, header: { id: 'edit_email.header', defaultMessage: 'Change Email' },
@ -38,7 +39,7 @@ const EditEmail = () => {
setLoading(true); setLoading(true);
dispatch(changeEmail(email, password)).then(() => { dispatch(changeEmail(email, password)).then(() => {
setState(initialState); setState(initialState);
dispatch(snackbar.success(intl.formatMessage(messages.updateEmailSuccess))); toast.success(intl.formatMessage(messages.updateEmailSuccess));
}).finally(() => { }).finally(() => {
setLoading(false); setLoading(false);
}).catch(() => { }).catch(() => {

3
app/soapbox/features/edit-password/index.tsx
View File

@ -5,6 +5,7 @@ import { changePassword } from 'soapbox/actions/security';
import snackbar from 'soapbox/actions/snackbar'; import snackbar from 'soapbox/actions/snackbar';
import { Button, Card, CardBody, CardHeader, CardTitle, Column, Form, FormActions, FormGroup, Input } from 'soapbox/components/ui'; import { Button, Card, CardBody, CardHeader, CardTitle, Column, Form, FormActions, FormGroup, Input } from 'soapbox/components/ui';
import { useAppDispatch, useFeatures } from 'soapbox/hooks'; import { useAppDispatch, useFeatures } from 'soapbox/hooks';
import toast from 'soapbox/toast';
import PasswordIndicator from '../verification/components/password-indicator'; import PasswordIndicator from '../verification/components/password-indicator';
@ -44,7 +45,7 @@ const EditPassword = () => {
setLoading(true); setLoading(true);
dispatch(changePassword(currentPassword, newPassword, newPasswordConfirmation)).then(() => { dispatch(changePassword(currentPassword, newPassword, newPasswordConfirmation)).then(() => {
resetState(); resetState();
dispatch(snackbar.success(intl.formatMessage(messages.updatePasswordSuccess))); toast.success(intl.formatMessage(messages.updatePasswordSuccess));
}).finally(() => { }).finally(() => {
setLoading(false); setLoading(false);

3
app/soapbox/features/edit-profile/index.tsx
View File

@ -21,6 +21,7 @@ import {
} from 'soapbox/components/ui'; } from 'soapbox/components/ui';
import { useAppDispatch, useOwnAccount, useFeatures, useInstance } from 'soapbox/hooks'; import { useAppDispatch, useOwnAccount, useFeatures, useInstance } from 'soapbox/hooks';
import { normalizeAccount } from 'soapbox/normalizers'; import { normalizeAccount } from 'soapbox/normalizers';
import toast from 'soapbox/toast';
import resizeImage from 'soapbox/utils/resize-image'; import resizeImage from 'soapbox/utils/resize-image';
import ProfilePreview from './components/profile-preview'; import ProfilePreview from './components/profile-preview';
@ -217,7 +218,7 @@ const EditProfile: React.FC = () => {
Promise.all(promises).then(() => { Promise.all(promises).then(() => {
setLoading(false); setLoading(false);
dispatch(snackbar.success(intl.formatMessage(messages.success))); toast.success(intl.formatMessage(messages.success));
}).catch(() => { }).catch(() => {
setLoading(false); setLoading(false);
dispatch(snackbar.error(intl.formatMessage(messages.error))); dispatch(snackbar.error(intl.formatMessage(messages.error)));

7
app/soapbox/features/email-confirmation/index.tsx
View File

@ -6,6 +6,7 @@ import { confirmChangedEmail } from 'soapbox/actions/security';
import snackbar from 'soapbox/actions/snackbar'; import snackbar from 'soapbox/actions/snackbar';
import { Spinner } from 'soapbox/components/ui'; import { Spinner } from 'soapbox/components/ui';
import { useAppDispatch } from 'soapbox/hooks'; import { useAppDispatch } from 'soapbox/hooks';
import toast from 'soapbox/toast';
import { buildErrorMessage } from 'soapbox/utils/errors'; import { buildErrorMessage } from 'soapbox/utils/errors';
const Statuses = { const Statuses = {
@ -32,11 +33,7 @@ const EmailConfirmation = () => {
.then(() => { .then(() => {
setStatus(Statuses.SUCCESS); setStatus(Statuses.SUCCESS);
dispatch( toast.success(intl.formatMessage(messages.success));
snackbar.success(
intl.formatMessage(messages.success),
),
);
}) })
.catch((error) => { .catch((error) => {
setStatus(Statuses.FAIL); setStatus(Statuses.FAIL);

3
app/soapbox/features/migration/index.tsx
View File

@ -6,6 +6,7 @@ import { moveAccount } from 'soapbox/actions/security';
import snackbar from 'soapbox/actions/snackbar'; import snackbar from 'soapbox/actions/snackbar';
import { Button, Column, Form, FormActions, FormGroup, Input, Text } from 'soapbox/components/ui'; import { Button, Column, Form, FormActions, FormGroup, Input, Text } from 'soapbox/components/ui';
import { useAppDispatch, useInstance } from 'soapbox/hooks'; import { useAppDispatch, useInstance } from 'soapbox/hooks';
import toast from 'soapbox/toast';
const messages = defineMessages({ const messages = defineMessages({
heading: { id: 'column.migration', defaultMessage: 'Account migration' }, heading: { id: 'column.migration', defaultMessage: 'Account migration' },
@ -43,7 +44,7 @@ const Migration = () => {
setIsLoading(true); setIsLoading(true);
return dispatch(moveAccount(targetAccount, password)).then(() => { return dispatch(moveAccount(targetAccount, password)).then(() => {
clearForm(); clearForm();
dispatch(snackbar.success(intl.formatMessage(messages.moveAccountSuccess))); toast.success(intl.formatMessage(messages.moveAccountSuccess));
}).catch(error => { }).catch(error => {
let message = intl.formatMessage(messages.moveAccountFail); let message = intl.formatMessage(messages.moveAccountFail);

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

@ -6,6 +6,7 @@ import { disableMfa } from 'soapbox/actions/mfa';
import snackbar from 'soapbox/actions/snackbar'; import snackbar from 'soapbox/actions/snackbar';
import { Button, Form, FormGroup, Input, FormActions, Stack, Text } from 'soapbox/components/ui'; import { Button, Form, FormGroup, Input, FormActions, Stack, Text } from 'soapbox/components/ui';
import { useAppDispatch } from 'soapbox/hooks'; import { useAppDispatch } from 'soapbox/hooks';
import toast from 'soapbox/toast';
const messages = defineMessages({ const messages = defineMessages({
mfa_setup_disable_button: { id: 'column.mfa_disable_button', defaultMessage: 'Disable' }, mfa_setup_disable_button: { id: 'column.mfa_disable_button', defaultMessage: 'Disable' },
@ -25,7 +26,7 @@ const DisableOtpForm: React.FC = () => {
const handleSubmit = useCallback(() => { const handleSubmit = useCallback(() => {
setIsLoading(true); setIsLoading(true);
dispatch(disableMfa('totp', password)).then(() => { dispatch(disableMfa('totp', password)).then(() => {
dispatch(snackbar.success(intl.formatMessage(messages.mfaDisableSuccess))); toast.success(intl.formatMessage(messages.mfaDisableSuccess));
history.push('../auth/edit'); history.push('../auth/edit');
}).finally(() => { }).finally(() => {
setIsLoading(false); setIsLoading(false);

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

@ -10,6 +10,7 @@ import {
import snackbar from 'soapbox/actions/snackbar'; import snackbar from 'soapbox/actions/snackbar';
import { Button, Form, FormActions, FormGroup, Input, Stack, Text } from 'soapbox/components/ui'; import { Button, Form, FormActions, FormGroup, Input, Stack, Text } from 'soapbox/components/ui';
import { useAppDispatch } from 'soapbox/hooks'; import { useAppDispatch } from 'soapbox/hooks';
import toast from 'soapbox/toast';
const messages = defineMessages({ const messages = defineMessages({
mfaCancelButton: { id: 'column.mfa_cancel', defaultMessage: 'Cancel' }, mfaCancelButton: { id: 'column.mfa_cancel', defaultMessage: 'Cancel' },
@ -52,7 +53,7 @@ const OtpConfirmForm: React.FC = () => {
setState((prevState) => ({ ...prevState, isLoading: true })); setState((prevState) => ({ ...prevState, isLoading: true }));
dispatch(confirmMfa('totp', state.code, state.password) as any).then((r: any) => { dispatch(confirmMfa('totp', state.code, state.password) as any).then((r: any) => {
dispatch(snackbar.success(intl.formatMessage(messages.mfaConfirmSuccess))); toast.success(intl.formatMessage(messages.mfaConfirmSuccess));
history.push('../auth/edit'); history.push('../auth/edit');
}).catch(() => { }).catch(() => {
dispatch(snackbar.error(intl.formatMessage(messages.confirmFail))); dispatch(snackbar.error(intl.formatMessage(messages.confirmFail)));

4
app/soapbox/features/soapbox-config/index.tsx
View File

@ -5,7 +5,6 @@ import { useHistory } from 'react-router-dom';
import { updateSoapboxConfig } from 'soapbox/actions/admin'; import { updateSoapboxConfig } from 'soapbox/actions/admin';
import { uploadMedia } from 'soapbox/actions/media'; import { uploadMedia } from 'soapbox/actions/media';
import snackbar from 'soapbox/actions/snackbar';
import List, { ListItem } from 'soapbox/components/list'; import List, { ListItem } from 'soapbox/components/list';
import { import {
Accordion, Accordion,
@ -25,6 +24,7 @@ import {
import ThemeSelector from 'soapbox/features/ui/components/theme-selector'; import ThemeSelector from 'soapbox/features/ui/components/theme-selector';
import { useAppSelector, useAppDispatch, useFeatures } from 'soapbox/hooks'; import { useAppSelector, useAppDispatch, useFeatures } from 'soapbox/hooks';
import { normalizeSoapboxConfig } from 'soapbox/normalizers'; import { normalizeSoapboxConfig } from 'soapbox/normalizers';
import toast from 'soapbox/toast';
import CryptoAddressInput from './components/crypto-address-input'; import CryptoAddressInput from './components/crypto-address-input';
import FooterLinkInput from './components/footer-link-input'; import FooterLinkInput from './components/footer-link-input';
@ -102,7 +102,7 @@ const SoapboxConfig: React.FC = () => {
const handleSubmit: React.FormEventHandler = (e) => { const handleSubmit: React.FormEventHandler = (e) => {
dispatch(updateSoapboxConfig(data.toJS())).then(() => { dispatch(updateSoapboxConfig(data.toJS())).then(() => {
setLoading(false); setLoading(false);
dispatch(snackbar.success(intl.formatMessage(messages.saved))); toast.success(intl.formatMessage(messages.saved));
}).catch(() => { }).catch(() => {
setLoading(false); setLoading(false);
}); });

8
app/soapbox/features/theme-editor/index.tsx
View File

@ -4,7 +4,6 @@ import { v4 as uuidv4 } from 'uuid';
import { updateSoapboxConfig } from 'soapbox/actions/admin'; import { updateSoapboxConfig } from 'soapbox/actions/admin';
import { getHost } from 'soapbox/actions/instance'; import { getHost } from 'soapbox/actions/instance';
import snackbar from 'soapbox/actions/snackbar';
import { fetchSoapboxConfig } from 'soapbox/actions/soapbox'; import { fetchSoapboxConfig } from 'soapbox/actions/soapbox';
import List, { ListItem } from 'soapbox/components/list'; import List, { ListItem } from 'soapbox/components/list';
import { Button, Column, Form, FormActions } from 'soapbox/components/ui'; import { Button, Column, Form, FormActions } from 'soapbox/components/ui';
@ -12,6 +11,7 @@ import DropdownMenuContainer from 'soapbox/containers/dropdown-menu-container';
import ColorWithPicker from 'soapbox/features/soapbox-config/components/color-with-picker'; import ColorWithPicker from 'soapbox/features/soapbox-config/components/color-with-picker';
import { useAppDispatch, useAppSelector, useSoapboxConfig } from 'soapbox/hooks'; import { useAppDispatch, useAppSelector, useSoapboxConfig } from 'soapbox/hooks';
import { normalizeSoapboxConfig } from 'soapbox/normalizers'; import { normalizeSoapboxConfig } from 'soapbox/normalizers';
import toast from 'soapbox/toast';
import { download } from 'soapbox/utils/download'; import { download } from 'soapbox/utils/download';
import Palette, { ColorGroup } from './components/palette'; import Palette, { ColorGroup } from './components/palette';
@ -103,7 +103,7 @@ const ThemeEditor: React.FC<IThemeEditor> = () => {
const colors = normalizeSoapboxConfig({ colors: json }).colors.toJS(); const colors = normalizeSoapboxConfig({ colors: json }).colors.toJS();
setTheme(colors); setTheme(colors);
dispatch(snackbar.success(intl.formatMessage(messages.importSuccess))); toast.success(intl.formatMessage(messages.importSuccess));
} }
}; };
@ -113,7 +113,7 @@ const ThemeEditor: React.FC<IThemeEditor> = () => {
try { try {
await dispatch(fetchSoapboxConfig(host)); await dispatch(fetchSoapboxConfig(host));
await updateTheme(); await updateTheme();
dispatch(snackbar.success(intl.formatMessage(messages.saved))); toast.success(intl.formatMessage(messages.saved));
setSubmitting(false); setSubmitting(false);
} catch (e) { } catch (e) {
setSubmitting(false); setSubmitting(false);
@ -199,7 +199,7 @@ const ThemeEditor: React.FC<IThemeEditor> = () => {
text: intl.formatMessage(messages.restore), text: intl.formatMessage(messages.restore),
action: restoreDefaultTheme, action: restoreDefaultTheme,
icon: require('@tabler/icons/refresh.svg'), icon: require('@tabler/icons/refresh.svg'),
},{ }, {
text: intl.formatMessage(messages.import), text: intl.formatMessage(messages.import),
action: importTheme, action: importTheme,
icon: require('@tabler/icons/upload.svg'), icon: require('@tabler/icons/upload.svg'),

8
app/soapbox/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx
View File

@ -9,7 +9,6 @@ import {
setBadges as saveBadges, setBadges as saveBadges,
} from 'soapbox/actions/admin'; } from 'soapbox/actions/admin';
import { deactivateUserModal, deleteUserModal } from 'soapbox/actions/moderation'; import { deactivateUserModal, deleteUserModal } from 'soapbox/actions/moderation';
import snackbar from 'soapbox/actions/snackbar';
import Account from 'soapbox/components/account'; import Account from 'soapbox/components/account';
import List, { ListItem } from 'soapbox/components/list'; import List, { ListItem } from 'soapbox/components/list';
import MissingIndicator from 'soapbox/components/missing-indicator'; import MissingIndicator from 'soapbox/components/missing-indicator';
@ -17,6 +16,7 @@ import OutlineBox from 'soapbox/components/outline-box';
import { Button, Text, HStack, Modal, Stack, Toggle } from 'soapbox/components/ui'; import { Button, Text, HStack, Modal, Stack, Toggle } from 'soapbox/components/ui';
import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks'; import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks';
import { makeGetAccount } from 'soapbox/selectors'; import { makeGetAccount } from 'soapbox/selectors';
import toast from 'soapbox/toast';
import { isLocal } from 'soapbox/utils/accounts'; import { isLocal } from 'soapbox/utils/accounts';
import { getBadges } from 'soapbox/utils/badges'; import { getBadges } from 'soapbox/utils/badges';
@ -75,7 +75,7 @@ const AccountModerationModal: React.FC<IAccountModerationModal> = ({ onClose, ac
const action = checked ? verifyUser : unverifyUser; const action = checked ? verifyUser : unverifyUser;
dispatch(action(account.id)) dispatch(action(account.id))
.then(() => dispatch(snackbar.success(intl.formatMessage(message, { acct: account.acct })))) .then(() => toast.success(intl.formatMessage(message, { acct: account.acct })))
.catch(() => {}); .catch(() => {});
}; };
@ -86,7 +86,7 @@ const AccountModerationModal: React.FC<IAccountModerationModal> = ({ onClose, ac
const action = checked ? suggestUsers : unsuggestUsers; const action = checked ? suggestUsers : unsuggestUsers;
dispatch(action([account.id])) dispatch(action([account.id]))
.then(() => dispatch(snackbar.success(intl.formatMessage(message, { acct: account.acct })))) .then(() => toast.success(intl.formatMessage(message, { acct: account.acct })))
.catch(() => {}); .catch(() => {});
}; };
@ -100,7 +100,7 @@ const AccountModerationModal: React.FC<IAccountModerationModal> = ({ onClose, ac
const handleSaveBadges = () => { const handleSaveBadges = () => {
dispatch(saveBadges(account.id, accountBadges, badges)) dispatch(saveBadges(account.id, accountBadges, badges))
.then(() => dispatch(snackbar.success(intl.formatMessage(messages.badgesSaved)))) .then(() => toast.success(intl.formatMessage(messages.badgesSaved)))
.catch(() => {}); .catch(() => {});
}; };

4
app/soapbox/features/ui/components/modals/account-moderation-modal/staff-role-picker.tsx
View File

@ -2,9 +2,9 @@ import React, { useMemo } from 'react';
import { defineMessages, MessageDescriptor, useIntl } from 'react-intl'; import { defineMessages, MessageDescriptor, useIntl } from 'react-intl';
import { setRole } from 'soapbox/actions/admin'; import { setRole } from 'soapbox/actions/admin';
import snackbar from 'soapbox/actions/snackbar';
import { SelectDropdown } from 'soapbox/features/forms'; import { SelectDropdown } from 'soapbox/features/forms';
import { useAppDispatch } from 'soapbox/hooks'; import { useAppDispatch } from 'soapbox/hooks';
import toast from 'soapbox/toast';
import type { Account as AccountEntity } from 'soapbox/types/entities'; import type { Account as AccountEntity } from 'soapbox/types/entities';
@ -66,7 +66,7 @@ const StaffRolePicker: React.FC<IStaffRolePicker> = ({ account }) => {
} }
if (message) { if (message) {
dispatch(snackbar.success(intl.formatMessage(message, { acct: account.acct }))); toast.success(intl.formatMessage(message, { acct: account.acct }));
} }
}) })
.catch(() => {}); .catch(() => {});

4
app/soapbox/features/ui/components/modals/edit-federation-modal.tsx
View File

@ -4,11 +4,11 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
import Toggle from 'react-toggle'; import Toggle from 'react-toggle';
import { updateMrf } from 'soapbox/actions/mrf'; import { updateMrf } from 'soapbox/actions/mrf';
import snackbar from 'soapbox/actions/snackbar';
import List, { ListItem } from 'soapbox/components/list'; import List, { ListItem } from 'soapbox/components/list';
import { Modal } from 'soapbox/components/ui'; import { Modal } from 'soapbox/components/ui';
import { useAppSelector, useAppDispatch } from 'soapbox/hooks'; import { useAppSelector, useAppDispatch } from 'soapbox/hooks';
import { makeGetRemoteInstance } from 'soapbox/selectors'; import { makeGetRemoteInstance } from 'soapbox/selectors';
import toast from 'soapbox/toast';
const messages = defineMessages({ const messages = defineMessages({
mediaRemoval: { id: 'edit_federation.media_removal', defaultMessage: 'Strip media' }, mediaRemoval: { id: 'edit_federation.media_removal', defaultMessage: 'Strip media' },
@ -56,7 +56,7 @@ const EditFederationModal: React.FC<IEditFederationModal> = ({ host, onClose })
const handleSubmit = () => { const handleSubmit = () => {
dispatch(updateMrf(host, data)) dispatch(updateMrf(host, data))
.then(() => dispatch(snackbar.success(intl.formatMessage(messages.success, { host })))) .then(() => toast.success(intl.formatMessage(messages.success, { host })))
.catch(() => {}); .catch(() => {});
onClose(); onClose();

7
app/soapbox/features/ui/components/modals/verify-sms-modal.tsx
View File

@ -8,6 +8,7 @@ import snackbar from 'soapbox/actions/snackbar';
import { reConfirmPhoneVerification, reRequestPhoneVerification } from 'soapbox/actions/verification'; import { reConfirmPhoneVerification, reRequestPhoneVerification } from 'soapbox/actions/verification';
import { FormGroup, PhoneInput, Modal, Stack, Text } from 'soapbox/components/ui'; import { FormGroup, PhoneInput, Modal, Stack, Text } from 'soapbox/components/ui';
import { useAppDispatch, useAppSelector, useInstance } from 'soapbox/hooks'; import { useAppDispatch, useAppSelector, useInstance } from 'soapbox/hooks';
import toast from 'soapbox/toast';
import { getAccessToken } from 'soapbox/utils/auth'; import { getAccessToken } from 'soapbox/utils/auth';
const messages = defineMessages({ const messages = defineMessages({
@ -85,10 +86,8 @@ const VerifySmsModal: React.FC<IVerifySmsModal> = ({ onClose }) => {
} }
dispatch(reRequestPhoneVerification(phone!)).then(() => { dispatch(reRequestPhoneVerification(phone!)).then(() => {
dispatch( toast.success(
snackbar.success( intl.formatMessage(messages.verificationSuccess),
intl.formatMessage(messages.verificationSuccess),
),
); );
}) })
.finally(() => setStatus(Statuses.REQUESTED)) .finally(() => setStatus(Statuses.REQUESTED))

5
app/soapbox/features/ui/components/subscription-button.tsx
View File

@ -9,6 +9,7 @@ import {
import snackbar from 'soapbox/actions/snackbar'; import snackbar from 'soapbox/actions/snackbar';
import { IconButton } from 'soapbox/components/ui'; import { IconButton } from 'soapbox/components/ui';
import { useAppDispatch, useFeatures } from 'soapbox/hooks'; import { useAppDispatch, useFeatures } from 'soapbox/hooks';
import toast from 'soapbox/toast';
import type { Account as AccountEntity } from 'soapbox/types/entities'; import type { Account as AccountEntity } from 'soapbox/types/entities';
@ -40,13 +41,13 @@ const SubscriptionButton = ({ account }: ISubscriptionButton) => {
intl.formatMessage(messages.subscribe, { name: account.get('username') }); intl.formatMessage(messages.subscribe, { name: account.get('username') });
const onSubscribeSuccess = () => const onSubscribeSuccess = () =>
dispatch(snackbar.success(intl.formatMessage(messages.subscribeSuccess))); toast.success(intl.formatMessage(messages.subscribeSuccess));
const onSubscribeFailure = () => const onSubscribeFailure = () =>
dispatch(snackbar.error(intl.formatMessage(messages.subscribeFailure))); dispatch(snackbar.error(intl.formatMessage(messages.subscribeFailure)));
const onUnsubscribeSuccess = () => const onUnsubscribeSuccess = () =>
dispatch(snackbar.success(intl.formatMessage(messages.unsubscribeSuccess))); toast.success(intl.formatMessage(messages.unsubscribeSuccess));
const onUnsubscribeFailure = () => const onUnsubscribeFailure = () =>
dispatch(snackbar.error(intl.formatMessage(messages.unsubscribeFailure))); dispatch(snackbar.error(intl.formatMessage(messages.unsubscribeFailure)));

3
app/soapbox/features/verification/email-passthru.tsx
View File

@ -6,6 +6,7 @@ import snackbar from 'soapbox/actions/snackbar';
import { confirmEmailVerification } from 'soapbox/actions/verification'; import { confirmEmailVerification } from 'soapbox/actions/verification';
import { Icon, Spinner, Stack, Text } from 'soapbox/components/ui'; import { Icon, Spinner, Stack, Text } from 'soapbox/components/ui';
import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
import toast from 'soapbox/toast';
import { ChallengeTypes } from './index'; import { ChallengeTypes } from './index';
@ -121,7 +122,7 @@ const EmailPassThru = () => {
dispatch(confirmEmailVerification(token)) dispatch(confirmEmailVerification(token))
.then(() => { .then(() => {
setStatus(Statuses.SUCCESS); setStatus(Statuses.SUCCESS);
dispatch(snackbar.success(intl.formatMessage(messages.emailConfirmed))); toast.success(intl.formatMessage(messages.emailConfirmed));
}) })
.catch((error: AxiosError<any>) => { .catch((error: AxiosError<any>) => {
const errorKey = error?.response?.data?.error; const errorKey = error?.response?.data?.error;

7
app/soapbox/features/verification/registration.tsx
View File

@ -9,6 +9,7 @@ import snackbar from 'soapbox/actions/snackbar';
import { createAccount, removeStoredVerification } from 'soapbox/actions/verification'; import { createAccount, removeStoredVerification } from 'soapbox/actions/verification';
import { Button, Form, FormGroup, Input, Text } from 'soapbox/components/ui'; import { Button, Form, FormGroup, Input, Text } from 'soapbox/components/ui';
import { useAppDispatch, useAppSelector, useInstance, useSoapboxConfig } from 'soapbox/hooks'; import { useAppDispatch, useAppSelector, useInstance, useSoapboxConfig } from 'soapbox/hooks';
import toast from 'soapbox/toast';
import { getRedirectUrl } from 'soapbox/utils/redirect'; import { getRedirectUrl } from 'soapbox/utils/redirect';
import PasswordIndicator from './components/password-indicator'; import PasswordIndicator from './components/password-indicator';
@ -54,10 +55,8 @@ const Registration = () => {
setShouldRedirect(true); setShouldRedirect(true);
removeStoredVerification(); removeStoredVerification();
dispatch(startOnboarding()); dispatch(startOnboarding());
dispatch( toast.success(
snackbar.success( intl.formatMessage(messages.success, { siteTitle: instance.title }),
intl.formatMessage(messages.success, { siteTitle: instance.title }),
),
); );
}) })
.catch((error: AxiosError) => { .catch((error: AxiosError) => {

10
app/soapbox/features/verification/steps/email-verification.tsx
View File

@ -2,11 +2,11 @@ import { AxiosError } from 'axios';
import React from 'react'; import React from 'react';
import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
import snackbar from 'soapbox/actions/snackbar';
import { checkEmailVerification, postEmailVerification, requestEmailVerification } from 'soapbox/actions/verification'; import { checkEmailVerification, postEmailVerification, requestEmailVerification } from 'soapbox/actions/verification';
import Icon from 'soapbox/components/icon'; import Icon from 'soapbox/components/icon';
import { Button, Form, FormGroup, Input, Text } from 'soapbox/components/ui'; import { Button, Form, FormGroup, Input, Text } from 'soapbox/components/ui';
import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
import toast from 'soapbox/toast';
const messages = defineMessages({ const messages = defineMessages({
verificationSuccess: { id: 'email_verification.success', defaultMessage: 'Verification email sent successfully.' }, verificationSuccess: { id: 'email_verification.success', defaultMessage: 'Verification email sent successfully.' },
@ -83,11 +83,7 @@ const EmailVerification = () => {
.then(() => { .then(() => {
setStatus(Statuses.REQUESTED); setStatus(Statuses.REQUESTED);
dispatch( toast.success(intl.formatMessage(messages.verificationSuccess));
snackbar.success(
intl.formatMessage(messages.verificationSuccess),
),
);
}) })
.catch((error: AxiosError) => { .catch((error: AxiosError) => {
const errorMessage = (error.response?.data as any)?.error; const errorMessage = (error.response?.data as any)?.error;
@ -104,7 +100,7 @@ const EmailVerification = () => {
setErrors([intl.formatMessage(messages.verificationFailTaken)]); setErrors([intl.formatMessage(messages.verificationFailTaken)]);
} }
dispatch(snackbar.error(message)); toast.error(message);
setStatus(Statuses.FAIL); setStatus(Statuses.FAIL);
}); });
}; };

24
app/soapbox/features/verification/steps/sms-verification.tsx
View File

@ -3,10 +3,10 @@ import React from 'react';
import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
import OtpInput from 'react-otp-input'; import OtpInput from 'react-otp-input';
import snackbar from 'soapbox/actions/snackbar';
import { confirmPhoneVerification, requestPhoneVerification } from 'soapbox/actions/verification'; import { confirmPhoneVerification, requestPhoneVerification } from 'soapbox/actions/verification';
import { Button, Form, FormGroup, PhoneInput, Text } from 'soapbox/components/ui'; import { Button, Form, FormGroup, PhoneInput, Text } from 'soapbox/components/ui';
import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
import toast from 'soapbox/toast';
const messages = defineMessages({ const messages = defineMessages({
verificationInvalid: { id: 'sms_verification.invalid', defaultMessage: 'Please enter a valid phone number.' }, verificationInvalid: { id: 'sms_verification.invalid', defaultMessage: 'Please enter a valid phone number.' },
@ -44,25 +44,17 @@ const SmsVerification = () => {
if (!isValid) { if (!isValid) {
setStatus(Statuses.IDLE); setStatus(Statuses.IDLE);
dispatch( toast.error(intl.formatMessage(messages.verificationInvalid));
snackbar.error(
intl.formatMessage(messages.verificationInvalid),
),
);
return; return;
} }
dispatch(requestPhoneVerification(phone!)).then(() => { dispatch(requestPhoneVerification(phone!)).then(() => {
dispatch( toast.success(intl.formatMessage(messages.verificationSuccess));
snackbar.success(
intl.formatMessage(messages.verificationSuccess),
),
);
setStatus(Statuses.REQUESTED); setStatus(Statuses.REQUESTED);
}).catch((error: AxiosError) => { }).catch((error: AxiosError) => {
const message = (error.response?.data as any)?.message || intl.formatMessage(messages.verificationFail); const message = (error.response?.data as any)?.message || intl.formatMessage(messages.verificationFail);
dispatch(snackbar.error(message)); toast.error(message);
setStatus(Statuses.FAIL); setStatus(Statuses.FAIL);
}); });
}, [phone, isValid]); }, [phone, isValid]);
@ -75,11 +67,9 @@ const SmsVerification = () => {
const submitVerification = () => { const submitVerification = () => {
// TODO: handle proper validation from Pepe -- expired vs invalid // TODO: handle proper validation from Pepe -- expired vs invalid
dispatch(confirmPhoneVerification(verificationCode)) dispatch(confirmPhoneVerification(verificationCode))
.catch(() => dispatch( .catch(() => {
snackbar.error( toast.error(intl.formatMessage(messages.verificationExpired));
intl.formatMessage(messages.verificationExpired), });
),
));
}; };
React.useEffect(() => { React.useEffect(() => {

6
app/soapbox/queries/accounts.ts
View File

@ -1,8 +1,8 @@
import { useMutation } from '@tanstack/react-query'; import { useMutation } from '@tanstack/react-query';
import { patchMeSuccess } from 'soapbox/actions/me'; import { patchMeSuccess } from 'soapbox/actions/me';
import snackbar from 'soapbox/actions/snackbar';
import { useApi, useAppDispatch, useOwnAccount } from 'soapbox/hooks'; import { useApi, useAppDispatch, useOwnAccount } from 'soapbox/hooks';
import toast from 'soapbox/toast';
export type IAccount = { export type IAccount = {
acct: string acct: string
@ -48,10 +48,10 @@ const useUpdateCredentials = () => {
}, },
onSuccess(response) { onSuccess(response) {
dispatch(patchMeSuccess(response.data)); dispatch(patchMeSuccess(response.data));
dispatch(snackbar.success('Chat Settings updated successfully')); toast.success('Chat Settings updated successfully');
}, },
onError(_error, _variables, context: any) { onError(_error, _variables, context: any) {
dispatch(snackbar.error('Chat Settings failed to update.')); toast.error('Chat Settings failed to update.');
dispatch(patchMeSuccess(context.cachedAccount)); dispatch(patchMeSuccess(context.cachedAccount));
}, },
}); });

8
app/soapbox/queries/chats.ts
View File

@ -2,12 +2,12 @@ import { InfiniteData, useInfiniteQuery, useMutation, useQuery } from '@tanstack
import sumBy from 'lodash/sumBy'; import sumBy from 'lodash/sumBy';
import { importFetchedAccount, importFetchedAccounts } from 'soapbox/actions/importer'; import { importFetchedAccount, importFetchedAccounts } from 'soapbox/actions/importer';
import snackbar from 'soapbox/actions/snackbar';
import { getNextLink } from 'soapbox/api'; import { getNextLink } from 'soapbox/api';
import { ChatWidgetScreens, useChatContext } from 'soapbox/contexts/chat-context'; import { ChatWidgetScreens, useChatContext } from 'soapbox/contexts/chat-context';
import { useStatContext } from 'soapbox/contexts/stat-context'; import { useStatContext } from 'soapbox/contexts/stat-context';
import { useApi, useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks'; import { useApi, useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks';
import { normalizeChatMessage } from 'soapbox/normalizers'; import { normalizeChatMessage } from 'soapbox/normalizers';
import toast from 'soapbox/toast';
import { reOrderChatListItems } from 'soapbox/utils/chats'; import { reOrderChatListItems } from 'soapbox/utils/chats';
import { flattenPages, PaginatedResult, updatePageItem } from 'soapbox/utils/queries'; import { flattenPages, PaginatedResult, updatePageItem } from 'soapbox/utils/queries';
@ -203,7 +203,7 @@ const useChat = (chatId?: string) => {
const useChatActions = (chatId: string) => { const useChatActions = (chatId: string) => {
const account = useOwnAccount(); const account = useOwnAccount();
const api = useApi(); const api = useApi();
const dispatch = useAppDispatch(); // const dispatch = useAppDispatch();
const { setUnreadChatsCount } = useStatContext(); const { setUnreadChatsCount } = useStatContext();
@ -307,12 +307,12 @@ const useChatActions = (chatId: string) => {
onError: (_error: any, _newData: any, context: any) => { onError: (_error: any, _newData: any, context: any) => {
changeScreen(ChatWidgetScreens.CHAT, context.prevChat.id); changeScreen(ChatWidgetScreens.CHAT, context.prevChat.id);
queryClient.setQueryData(ChatKeys.chat(chatId), context.prevChat); queryClient.setQueryData(ChatKeys.chat(chatId), context.prevChat);
dispatch(snackbar.error('Chat Settings failed to update.')); toast.error('Chat Settings failed to update.');
}, },
onSuccess() { onSuccess() {
queryClient.invalidateQueries(ChatKeys.chat(chatId)); queryClient.invalidateQueries(ChatKeys.chat(chatId));
queryClient.invalidateQueries(ChatKeys.chatSearch()); queryClient.invalidateQueries(ChatKeys.chatSearch());
dispatch(snackbar.success('Chat Settings updated successfully')); toast.success('Chat Settings updated successfully');
}, },
}); });