From 5e2e3214c9e997896860f952aec774aecbbf49a4 Mon Sep 17 00:00:00 2001
From: kewldan <40865857+kewldan@users.noreply.github.com>
Date: Thu, 23 Jul 2026 03:36:17 +0300
Subject: [PATCH] =?UTF-8?q?fix(blocking):=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B4=D0=B5=D1=84?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=82=D0=BD=D0=BE=D0=B5=20=D1=81=D0=BE=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=20=D1=8D=D0=BA?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BF=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=BD=D0=B0=20=D0=BA=D0=B0=D0=BD=D0=B0=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../blocking/ChannelSubscriptionScreen.tsx    |  5 ++-
 src/utils/channelBlockingMessage.test.ts      | 33 +++++++++++++++++++
 src/utils/channelBlockingMessage.ts           | 18 ++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 src/utils/channelBlockingMessage.test.ts
 create mode 100644 src/utils/channelBlockingMessage.ts

diff --git a/src/components/blocking/ChannelSubscriptionScreen.tsx b/src/components/blocking/ChannelSubscriptionScreen.tsx
index b49e13b..cc76ed5 100644
--- a/src/components/blocking/ChannelSubscriptionScreen.tsx
+++ b/src/components/blocking/ChannelSubscriptionScreen.tsx
@@ -4,6 +4,7 @@ import { useBlockingStore } from '../../store/blocking';
 import { apiClient, isChannelSubscriptionError } from '../../api/client';
 import { usePlatform } from '../../platform';
 import { useFocusTrap } from '../../hooks/useFocusTrap';
+import { customChannelMessage } from '../../utils/channelBlockingMessage';
 import { TelegramIcon, ClockIcon, CheckIcon, RestartIcon } from '@/components/icons';
 import { Button } from '@/components/primitives';
 import BlockingShell from './BlockingShell';
@@ -108,7 +109,9 @@ export default function ChannelSubscriptionScreen() {
       ariaLive="polite"
       icon={<TelegramIcon className="h-9 w-9" />}
       title={t('blocking.channel.title')}
-      description={channelInfo?.message || t('blocking.channel.defaultMessage')}
+      description={
+        customChannelMessage(channelInfo?.message) ?? t('blocking.channel.defaultMessage')
+      }
       footer={t('blocking.channel.hint')}
       actions={
         <Button
diff --git a/src/utils/channelBlockingMessage.test.ts b/src/utils/channelBlockingMessage.test.ts
new file mode 100644
index 0000000..6b2e118
--- /dev/null
+++ b/src/utils/channelBlockingMessage.test.ts
@@ -0,0 +1,33 @@
+import { describe, expect, it } from 'vitest';
+import { customChannelMessage } from './channelBlockingMessage';
+
+describe('customChannelMessage', () => {
+  it('returns null for empty values', () => {
+    expect(customChannelMessage(undefined)).toBeNull();
+    expect(customChannelMessage(null)).toBeNull();
+    expect(customChannelMessage('')).toBeNull();
+    expect(customChannelMessage('   ')).toBeNull();
+  });
+
+  it('returns null for the hardcoded backend default message', () => {
+    expect(
+      customChannelMessage('Please subscribe to the required channels to continue'),
+    ).toBeNull();
+  });
+
+  it('ignores surrounding whitespace when matching the backend default', () => {
+    expect(
+      customChannelMessage('  Please subscribe to the required channels to continue  '),
+    ).toBeNull();
+  });
+
+  it('passes through a custom message', () => {
+    expect(customChannelMessage('Подпишитесь на наш канал @example')).toBe(
+      'Подпишитесь на наш канал @example',
+    );
+  });
+
+  it('trims a custom message', () => {
+    expect(customChannelMessage('  custom  ')).toBe('custom');
+  });
+});
diff --git a/src/utils/channelBlockingMessage.ts b/src/utils/channelBlockingMessage.ts
new file mode 100644
index 0000000..8e61289
--- /dev/null
+++ b/src/utils/channelBlockingMessage.ts
@@ -0,0 +1,18 @@
+/**
+ * The backend hardcodes this English message in the 403
+ * `channel_subscription_required` payload (app/cabinet/dependencies.py). It is
+ * not admin-configurable and not localized, so showing it verbatim leaks
+ * English into every locale. Treat it as "no custom message" and let the UI
+ * fall back to its own i18n string.
+ */
+const BACKEND_DEFAULT_MESSAGES = new Set(['Please subscribe to the required channels to continue']);
+
+/**
+ * Returns the backend-provided channel-subscription message only when it is a
+ * real custom message; `null` for empty values and known backend defaults.
+ */
+export function customChannelMessage(message: string | null | undefined): string | null {
+  const trimmed = message?.trim();
+  if (!trimmed || BACKEND_DEFAULT_MESSAGES.has(trimmed)) return null;
+  return trimmed;
+}