Display custom bridge correctly in ConnectionPanel

2 files changed, 11 insertions, 15 deletions

diff --git a/gui/src/renderer/components/ConnectionPanel.tsx b/gui/src/renderer/components/ConnectionPanel.tsx
index 07547363a0..a99140bb43 100644
--- a/gui/src/renderer/components/ConnectionPanel.tsx
+++ b/gui/src/renderer/components/ConnectionPanel.tsx
@@ -6,7 +6,6 @@ import { colors } from '../../config.json';
 import {
   EndpointObfuscationType,
   ProxyType,
-  proxyTypeToString,
   RelayProtocol,
   TunnelType,
   tunnelTypeToString,
@@ -164,10 +163,9 @@ export default class ConnectionPanel extends React.Component<IProps> {
           entry: this.props.entryHostname,
         },
       );
-    } else if (this.props.bridgeInfo?.ip) {
-      return sprintf(messages.pgettext('connection-info', '%(relay)s via %(entry)s'), {
+    } else if (this.props.bridgeInfo !== undefined) {
+      return sprintf(messages.pgettext('connection-info', '%(relay)s via Custom bridge'), {
         relay: this.props.hostname,
-        entry: this.props.bridgeInfo.ip,
       });
     } else {
       return this.props.hostname || '';
@@ -181,7 +179,7 @@ export default class ConnectionPanel extends React.Component<IProps> {
       const tunnelType = tunnelTypeToString(inAddress.tunnelType);
 
       if (bridgeInfo) {
-        const bridgeType = proxyTypeToString(bridgeInfo.bridgeType);
+        const bridgeType = this.bridgeType();
 
         return sprintf(
           // TRANSLATORS: The tunnel type line displayed below the hostname line on the main screen
@@ -201,4 +199,12 @@ export default class ConnectionPanel extends React.Component<IProps> {
       return '';
     }
   }
+
+  private bridgeType() {
+    if (this.props.bridgeHostname && this.props.bridgeInfo?.bridgeType === 'shadowsocks') {
+      return 'Shadowsocks bridge';
+    } else {
+      return 'Custom bridge';
+    }
+  }
 }
diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index fb1a88cff6..738eef5e95 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -128,16 +128,6 @@ export function wrapConstraint<T>(
 }
 
 export type ProxyType = 'shadowsocks' | 'custom';
-export function proxyTypeToString(proxy: ProxyType): string {
-  switch (proxy) {
-    case 'shadowsocks':
-      return 'Shadowsocks bridge';
-    case 'custom':
-      return 'custom bridge';
-    default:
-      return '';
-  }
-}
 
 export enum Ownership {
   any,