From 8eb1f8f1fc0d80635ac2f78d87adc73a3862ca3f Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Thu, 6 Mar 2025 12:14:58 -0600 Subject: Merge #7903 (#7917) * Add missing msg macro calls for i18n (#7903) * Add missing msg macro calls for i18n * Update src/screens/Settings/AppIconSettings/useAppIconSets.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Apply surfdude29's suggestions from code review Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> --------- Co-authored-by: Samuel Newman Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Format --------- Co-authored-by: Stanislas Signoud Co-authored-by: Samuel Newman Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> --- src/screens/Messages/components/RequestButtons.tsx | 60 +++++++++++++++++++--- 1 file changed, 54 insertions(+), 6 deletions(-) (limited to 'src/screens/Messages/components/RequestButtons.tsx') diff --git a/src/screens/Messages/components/RequestButtons.tsx b/src/screens/Messages/components/RequestButtons.tsx index 023cbff2d..62db09600 100644 --- a/src/screens/Messages/components/RequestButtons.tsx +++ b/src/screens/Messages/components/RequestButtons.tsx @@ -49,18 +49,42 @@ export function RejectMenu({ } }, onError: () => { - Toast.show(_('Failed to delete chat'), 'xmark') + Toast.show( + _( + msg({ + context: 'toast', + message: 'Failed to delete chat', + }), + ), + 'xmark', + ) }, }) const [queueBlock] = useProfileBlockMutationQueue(shadowedProfile) const onPressDelete = useCallback(() => { - Toast.show(_('Chat deleted'), 'check') + Toast.show( + _( + msg({ + context: 'toast', + message: 'Chat deleted', + }), + ), + 'check', + ) leaveConvo() }, [leaveConvo, _]) const onPressBlock = useCallback(() => { - Toast.show(_('Account blocked'), 'check') + Toast.show( + _( + msg({ + context: 'toast', + message: 'Account blocked', + }), + ), + 'check', + ) // block and also delete convo queueBlock() leaveConvo() @@ -179,7 +203,15 @@ export function AcceptChatButton({ // no difference if the request failed - when they send a message, the convo will be accepted // automatically. The only difference is that when they back out of the convo (without sending a message), the conversation will be rejected. // the list will still have this chat in it -sfn - Toast.show(_('Failed to accept chat'), 'xmark') + Toast.show( + _( + msg({ + context: 'toast', + message: 'Failed to accept chat', + }), + ), + 'xmark', + ) }, }) @@ -230,12 +262,28 @@ export function DeleteChatButton({ } }, onError: () => { - Toast.show(_('Failed to delete chat'), 'xmark') + Toast.show( + _( + msg({ + context: 'toast', + message: 'Failed to delete chat', + }), + ), + 'xmark', + ) }, }) const onPressDelete = useCallback(() => { - Toast.show(_('Chat deleted'), 'check') + Toast.show( + _( + msg({ + context: 'toast', + message: 'Chat deleted', + }), + ), + 'check', + ) leaveConvo() }, [leaveConvo, _]) -- cgit 1.4.1