summaryrefslogtreecommitdiffhomepage
path: root/gui/src/renderer/components
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2022-02-11 11:01:14 +0100
committerOskar Nyberg <oskar@mullvad.net>2022-02-11 11:01:14 +0100
commit45370ec945679e7d4023c1844b59adb2aa5a6f30 (patch)
treeb57563fe6948022782c275470479823f73cbc0e3 /gui/src/renderer/components
parentd9a79bedb5d5f0c19e7c68b8880b17553ddafab0 (diff)
parent98381e50fdb40656ece69749fd7608d684c50ef8 (diff)
downloadmullvadvpn-45370ec945679e7d4023c1844b59adb2aa5a6f30.tar.xz
mullvadvpn-45370ec945679e7d4023c1844b59adb2aa5a6f30.zip
Merge branch 'improve-connection-panel-bridgeinfo'
Diffstat (limited to 'gui/src/renderer/components')
-rw-r--r--gui/src/renderer/components/ConnectionPanel.tsx5
1 files changed, 5 insertions, 0 deletions
diff --git a/gui/src/renderer/components/ConnectionPanel.tsx b/gui/src/renderer/components/ConnectionPanel.tsx
index 65a47ea1b3..77aa9633e1 100644
--- a/gui/src/renderer/components/ConnectionPanel.tsx
+++ b/gui/src/renderer/components/ConnectionPanel.tsx
@@ -150,6 +150,11 @@ 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'), {
+ relay: this.props.hostname,
+ entry: this.props.bridgeInfo.ip,
+ });
} else {
return this.props.hostname || '';
}