Skip to content

remove unneded functions and add generic type #1460

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

Merged
merged 2 commits into from
Aug 27, 2025
Merged

remove unneded functions and add generic type #1460

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b57ec21
remove unneded functions and add generic type
danielhep Aug 26, 2025
aba0ab9
Merge branch 'changes-to-toast-promise' into danielhep/changes-to-toa…
amy-corson-ibigroup Aug 27, 2025
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
37 changes: 12 additions & 25 deletions lib/components/util/toasts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ export const formattedToastSuccessMessage = (
)
}

export const toastStatusMessages = (
export const toastPromise = async <T extends unknown>(
promise: Promise<T>,
successMessage: JSX.Element | string,
intl: IntlShape
): any => {
return {
intl: IntlShape,
id?: string,
silentOnSuccess = false
): Promise<T> => {
const toastStatusMessages = {
error: intl.formatMessage({
id: 'components.UserAccountScreen.errorUpdatingProfile'
}),
Expand All @@ -34,38 +37,22 @@ export const toastStatusMessages = (
}),
success: successMessage
}
}

export const toastSettings = (
id?: string | undefined,
silentOnSuccess?: boolean
): DefaultToastOptions => {
const settings: DefaultToastOptions = {
const toastSettings: DefaultToastOptions = {
ariaProps: {
'aria-live': 'assertive',
role: 'alert'
}
}
if (silentOnSuccess) {
settings.className = 'toast-hidden'
toastSettings.className = 'toast-hidden'
}
if (id) {
settings.id = id
toastSettings.id = id
}
return settings
}

export const toastPromise = async <T,>(
promise: Promise<T>,
successMessage: JSX.Element | string,
intl: IntlShape,
id?: string,
silentOnSuccess = false
): Promise<T> => {
const result = await toast.promise(
promise,
toastStatusMessages(successMessage, intl),
toastSettings(id, silentOnSuccess)
toastStatusMessages,
toastSettings
)
return result
}
Expand Down
Loading