octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Use flash message instead of toast

Browse Source
This commit is contained in:
Zhiyuan Zheng
2021-02-28 22:49:55 +01:00
parent 78898059cb
commit b20b75f22e
13 changed files with 154 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/Timeline/Shared/Actions.tsx
View File

@ -1,7 +1,6 @@
import analytics from '@components/analytics'
import haptics from '@components/haptics'
import Icon from '@components/Icon'
import { toast } from '@components/toast'
import { displayMessage } from '@components/Message'
import { useNavigation } from '@react-navigation/native'
import {
MutationVarsTimelineUpdateStatusProperty,
@ -32,7 +31,7 @@ const TimelineActions: React.FC<Props> = ({
}) => {
const navigation = useNavigation()
const { t } = useTranslation('componentTimeline')
const { theme } = useTheme()
const { mode, theme } = useTheme()
const iconColor = theme.secondary
const iconColorAction = (state: boolean) =>
state ? theme.primary : theme.secondary
@ -84,8 +83,8 @@ const TimelineActions: React.FC<Props> = ({
},
onError: (err: any, params, oldData) => {
const correctParam = params as MutationVarsTimelineUpdateStatusProperty
haptics('Error')
toast({
displayMessage({
mode,
type: 'error',
message: t('common:toastMessage.error.message', {
function: t(

11
src/components/Timeline/Shared/HeaderConversation.tsx
View File

@ -1,8 +1,7 @@
import analytics from '@components/analytics'
import haptics from '@components/haptics'
import Icon from '@components/Icon'
import { displayMessage } from '@components/Message'
import { ParseEmojis } from '@components/Parse'
import { toast } from '@components/toast'
import {
QueryKeyTimeline,
useTimelineMutation
@ -46,6 +45,7 @@ export interface Props {
const HeaderConversation = React.memo(
({ queryKey, conversation }: Props) => {
const { mode } = useTheme()
const { t } = useTranslation('componentTimeline')
const queryClient = useQueryClient()
@ -53,8 +53,8 @@ const HeaderConversation = React.memo(
queryClient,
onMutate: true,
onError: (err: any, _, oldData) => {
haptics('Error')
toast({
displayMessage({
mode,
type: 'error',
message: t('common:toastMessage.error.message', {
function: t(`shared.header.conversation.delete.function`)
@ -65,8 +65,7 @@ const HeaderConversation = React.memo(
err.data.error &&
typeof err.data.error === 'string' && {
description: err.data.error
}),
autoHide: false
})
})
queryClient.setQueryData(queryKey, oldData)
}

6
src/components/Timeline/Shared/Poll.tsx
View File

@ -2,9 +2,9 @@ import analytics from '@components/analytics'
import Button from '@components/Button'
import haptics from '@components/haptics'
import Icon from '@components/Icon'
import { displayMessage } from '@components/Message'
import { ParseEmojis } from '@components/Parse'
import RelativeTime from '@components/RelativeTime'
import { toast } from '@components/toast'
import {
MutationVarsTimelineUpdateStatusProperty,
QueryKeyTimeline,
@ -61,8 +61,8 @@ const TimelinePoll: React.FC<Props> = ({
},
onError: (err: any, params) => {
const theParams = params as MutationVarsTimelineUpdateStatusProperty
haptics('Error')
toast({
displayMessage({
mode,
type: 'error',
message: t('common:toastMessage.error.message', {
// @ts-ignore