feat(suite): rework bridge outdated modal; now it prompts user to uni…

…nstall standalone bridge instead
trezor · Feb 28, 2025 · 7a78937 · 7a78937
1 parent 8aa8f38
commit 7a78937
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 6 deletions.
diff --git a/packages/suite/src/components/suite/banners/SuiteBanners/SuiteBanners.tsx b/packages/suite/src/components/suite/banners/SuiteBanners/SuiteBanners.tsx
@@ -16,14 +16,14 @@ import {
 import { isTranslationMode } from 'src/utils/suite/l10n';
 
 import { MessageSystemBanner } from '../MessageSystemBanner';
+import { BridgeDeprecated } from './BridgeDeprecatedBanner';
 import { FailedBackup } from './FailedBackupBanner';
 import { FirmwareAuthenticityCheckBanner } from './FirmwareAuthenticityCheckBanner';
 import { FirmwareHashMismatchOnLastUpdateBanner } from './FirmwareHashMismatchOnLastUpdateBanner';
 import { NoBackup } from './NoBackupBanner';
 import { NoConnectionBanner } from './NoConnectionBanner';
 import { SafetyChecksBanner } from './SafetyChecksBanner';
 import { TranslationMode } from './TranslationModeBanner';
-import { BridgeDeprecated } from './BridgeDeprecatedBanner';
 
 const Container = styled.div<{ $isVisible?: boolean }>`
     width: 100%;
@@ -80,7 +80,7 @@ export const SuiteBanners = () => {
         // Let the user dismiss the warning.
         banner = <SafetyChecksBanner onDismiss={() => setSafetyChecksDismissed(true)} />;
         priority = 50;
-    } else if (bridge?.outdated || true) {
+    } else if (bridge?.outdated) {
         banner = <BridgeDeprecated />;
         priority = 30;
     }

diff --git a/packages/suite/src/components/suite/modals/ModalSwitcher/ForegroundAppModal.tsx b/packages/suite/src/components/suite/modals/ModalSwitcher/ForegroundAppModal.tsx
@@ -9,8 +9,8 @@ import { FirmwareUpdate } from 'src/views/firmware/FirmwareUpdate';
 import { Recovery } from 'src/views/recovery';
 import { SwitchDevice } from 'src/views/suite/SwitchDevice/SwitchDevice';
 import { BridgeUnavailable } from 'src/views/suite/bridge';
-import { BridgeRequested } from 'src/views/suite/bridge-requested';
 import { BridgeDeprecated } from 'src/views/suite/bridge-deprecated';
+import { BridgeRequested } from 'src/views/suite/bridge-requested';
 import { UdevRules } from 'src/views/suite/udev';
 import { Version } from 'src/views/suite/version';
 

diff --git a/packages/suite/src/support/messages.ts b/packages/suite/src/support/messages.ts
@@ -9543,13 +9543,14 @@ export default defineMessages({
         id: 'TR_CONNECT_BLUETOOTH_BUTTON',
         defaultMessage: 'Connect Trezor Safe 7 via Bluetooth',
     },
+
     TR_YOUR_BRIDGE_VERSION_WILL_SOON_BE_DEPRECATED: {
         id: 'TR_YOUR_BRIDGE_VERSION_WILL_SOON_BE_DEPRECATED',
         defaultMessage: 'Your Trezor Bridge version will soon be deprecated.',
     },
     TR_BRIDGE_UNINSTALL_INSTRUCTIONS: {
         id: 'TR_BRIDGE_UNINSTALL_INSTRUCTIONS',
         defaultMessage:
-            'You are running a very old and soon to be deprecated Trezor Bridge version. Please uninstall it from your system. {link}',
+            'You are running a very old and soon to be deprecated Trezor Bridge version. Please uninstall it from your system. <a>Learn more</a>',
     },
 });
diff --git a/packages/suite/src/views/suite/bridge-deprecated/index.tsx b/packages/suite/src/views/suite/bridge-deprecated/index.tsx
@@ -1,9 +1,13 @@
 import { Button, Link } from '@trezor/components';
 import { UNINSTALL_BRIDGE_URL } from '@trezor/urls';
+
 import { goto } from 'src/actions/suite/routerActions';
 import { Metadata, Modal, Translation } from 'src/components/suite';
 import { useDispatch, useLayout } from 'src/hooks/suite';
 
+/**
+ * modal that should show users basic information how to uninstall old standalone bridge
+ */
 export const BridgeDeprecated = () => {
     const dispatch = useDispatch();
 
@@ -13,12 +17,16 @@ export const BridgeDeprecated = () => {
 
     return (
         <Modal
-            heading={'Unsupported Trezor Bridge version detected'}
+            heading={<Translation id="TR_YOUR_BRIDGE_VERSION_WILL_SOON_BE_DEPRECATED" />}
             description={
                 <Translation
                     id="TR_BRIDGE_UNINSTALL_INSTRUCTIONS"
                     values={{
-                        link: <Link href={UNINSTALL_BRIDGE_URL} variant="underline" />,
+                        a: chunks => (
+                            <Link href={UNINSTALL_BRIDGE_URL} typographyStyle="hint">
+                                {chunks}
+                            </Link>
+                        ),
                     }}
                 />
             }

diff --git a/packages/urls/src/urls.ts b/packages/urls/src/urls.ts
@@ -164,3 +164,5 @@ export const ESHOP_KEEP_METAL_SINGLE_SHARE_URL: Url =
     'https://trezor.io/trezor-keep-metal-single-share';
 
 export const TRADING_DOWNLOAD_INVITY_APP_URL: Url = 'https://get.invity.io';
+
+export const UNINSTALL_BRIDGE_URL: Url = 'https://trezor.io/learn/a/what-is-trezor-bridge';
diff --git a/suite-common/suite-config/src/routes.ts b/suite-common/suite-config/src/routes.ts
@@ -42,6 +42,13 @@ export const routes = [
         isForegroundApp: true,
         params: modalAppParams,
     },
+    {
+        name: 'suite-bridge-deprecated',
+        pattern: '/bridge-bridge',
+        app: 'bridge-deprecated',
+        isForegroundApp: true,
+        params: modalAppParams,
+    },
     {
         name: 'suite-udev',
         pattern: '/udev',
Original file line number	Diff line number	Diff line change
Expand Up		@@ -164,3 +164,5 @@ export const ESHOP_KEEP_METAL_SINGLE_SHARE_URL: Url =
		'https://trezor.io/trezor-keep-metal-single-share';

		export const TRADING_DOWNLOAD_INVITY_APP_URL: Url = 'https://get.invity.io';

		export const UNINSTALL_BRIDGE_URL: Url = 'https://trezor.io/learn/a/what-is-trezor-bridge';