summaryrefslogtreecommitdiffhomepage
path: root/gui/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-07-05 10:16:35 +0200
committerLinus Färnstrand <linus@mullvad.net>2019-07-05 10:16:35 +0200
commit014a4c6a8267f74640eaa6c956b2dd5cb11b57d0 (patch)
tree138fccf603f315ecb366f68cac978a9c40b9adac /gui/src
parentf4b834b66438db8fa40bbce29a40fa3178c12da1 (diff)
parent8392f4ee4d3ffea7e460dc313715aef373ec731e (diff)
downloadmullvadvpn-014a4c6a8267f74640eaa6c956b2dd5cb11b57d0.tar.xz
mullvadvpn-014a4c6a8267f74640eaa6c956b2dd5cb11b57d0.zip
Merge branch 'improve-block-when-disconnected-help-text'
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/renderer/components/AdvancedSettings.tsx12
1 files changed, 11 insertions, 1 deletions
diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx
index e6c750175c..246ac658bd 100644
--- a/gui/src/renderer/components/AdvancedSettings.tsx
+++ b/gui/src/renderer/components/AdvancedSettings.tsx
@@ -170,9 +170,19 @@ export default class AdvancedSettings extends Component<IProps, IState> {
<Cell.Footer>
{messages.pgettext(
'advanced-settings-view',
- "Unless connected, always block all network traffic, even when you've disconnected or quit the app.",
+ "Unless connected to Mullvad, this setting will completely block your internet, even when you've disconnected or quit the app.",
)}
</Cell.Footer>
+ {this.props.blockWhenDisconnected ? (
+ <Cell.Footer>
+ {messages.pgettext(
+ 'advanced-settings-view',
+ "Warning: Your internet won't work without a VPN connection, even when you've quit the app. Unless connected to Mullvad, this setting will completely block your internet, even when you have quit the app.",
+ )}
+ </Cell.Footer>
+ ) : (
+ undefined
+ )}
<View style={styles.advanced_settings__content}>
<Selector