acetheking987/bsky-social-app
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge #7903 (#7917)

Browse Source 
* 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 <mozzius@protonmail.com>
Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com>

* Format

---------

Co-authored-by: Stanislas Signoud <signez@stanisoft.net>
Co-authored-by: Samuel Newman <mozzius@protonmail.com>
Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com>
This commit is contained in:
Eric Bailey
2025-03-06 12:14:58 -06:00
committed by GitHub
parent da2b6f4797
commit 8eb1f8f1fc
8 changed files with 94 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/screens/Messages/components/RequestButtons.tsx
+54 -6
View File
@@ -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, _])