From e2367d4372de7ce7b37ea7cab5457a375db7aa91 Mon Sep 17 00:00:00 2001 From: MartinBraquet Date: Sun, 31 May 2026 12:06:40 +0200 Subject: [PATCH] Improve ban message --- android/app/build.gradle | 2 +- common/messages/fr.json | 2 +- web/pages/messages/[channelId].tsx | 26 +++++++++++++------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index df87884a..6b63858f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -11,7 +11,7 @@ android { applicationId "com.compassconnections.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 116 + versionCode 117 versionName "1.28.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { diff --git a/common/messages/fr.json b/common/messages/fr.json index 3cfa81c1..7692b4cd 100644 --- a/common/messages/fr.json +++ b/common/messages/fr.json @@ -500,7 +500,7 @@ "messages.action.delete": "Supprimer", "messages.action.edit": "Modifier", "messages.cannot_message_deleted": "Vous ne pouvez pas leur envoyer de message car ils ont supprimé leur compte.", - "messages.cannot_message_banned": "Vous ne pouvez pas leur envoyer de message car ils ont été bannis.", + "messages.cannot_message_banned": "Ce profil a été supprimé en raison d'une activité suspecte; n'envoyez jamais d'argent à une personne que vous n'avez jamais rencontrée.", "messages.cannot_message_you_banned": "Vous ne pouvez pas leur envoyer de message car vous avez été banni.", "messages.create": "Créer", "messages.delete_confirm": "Êtes-vous sûr de vouloir supprimer ce message ?", diff --git a/web/pages/messages/[channelId].tsx b/web/pages/messages/[channelId].tsx index a93e7566..0a74f684 100644 --- a/web/pages/messages/[channelId].tsx +++ b/web/pages/messages/[channelId].tsx @@ -27,10 +27,7 @@ import {useTextEditor} from 'web/components/widgets/editor' import {CompassLoadingIndicator} from 'web/components/widgets/loading-indicator' import {BannedBadge, UserAvatarAndBadge} from 'web/components/widgets/user-link' import {useIsMobile} from 'web/hooks/use-is-mobile' -import { - usePrivateMessages, - useSortedPrivateMessageMemberships, -} from 'web/hooks/use-private-messages' +import {usePrivateMessages, useSortedPrivateMessageMemberships,} from 'web/hooks/use-private-messages' import {useRedirectIfSignedOut} from 'web/hooks/use-redirect-if-signed-out' import {useUser} from 'web/hooks/use-user' import {useUsersInStore} from 'web/hooks/use-user-supabase' @@ -454,27 +451,30 @@ export const PrivateChat = (props: { - {noOtherUser ? ( + {allUsersBanned ? (
{t( - 'messages.cannot_message_deleted', - "You can't text them as they deleted their account.", + 'messages.cannot_message_banned', + "The profile was removed for suspicious activity; never send money to someone you haven't met.", )}
- ) : allUsersBanned ? ( -
- - {t('messages.cannot_message_banned', "You can't text them as they got banned.")} - -
) : user.isBannedFromPosting ? (
{t('messages.cannot_message_you_banned', "You can't text them as you got banned.")}
+ ) : noOtherUser ? ( +
+ + {t( + 'messages.cannot_message_deleted', + "You can't text them as they deleted their account.", + )} + +
) : (