diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-10-03 11:31:46 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-10-08 13:00:17 +0200 |
| commit | 8532ed4dcc501192009e36269931dbf217ffeeeb (patch) | |
| tree | 3a03570c724ddce78792a52908a554d9b9ec8283 /gui | |
| parent | 75a846f23747a9288858404b74f087053a3ca3a7 (diff) | |
| download | mullvadvpn-8532ed4dcc501192009e36269931dbf217ffeeeb.tar.xz mullvadvpn-8532ed4dcc501192009e36269931dbf217ffeeeb.zip | |
Merge FAQ and Guides together
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/packages/desktop/src/config.json | 1 | ||||
| -rw-r--r-- | gui/packages/desktop/src/renderer/components/Settings.js | 17 | ||||
| -rw-r--r-- | gui/packages/desktop/test/components/Settings.spec.js | 2 |
3 files changed, 6 insertions, 14 deletions
diff --git a/gui/packages/desktop/src/config.json b/gui/packages/desktop/src/config.json index f28b2ca3b0..e3f340ec96 100644 --- a/gui/packages/desktop/src/config.json +++ b/gui/packages/desktop/src/config.json @@ -3,7 +3,6 @@ "createAccount": "https://mullvad.net/account/create/", "purchase": "https://mullvad.net/account/login/", "faq": "https://mullvad.net/faq/", - "guides": "https://mullvad.net/guides/", "download": "https://mullvad.net/download/", "supportEmail": "mailto:support@mullvad.net" }, diff --git a/gui/packages/desktop/src/renderer/components/Settings.js b/gui/packages/desktop/src/renderer/components/Settings.js index 5db20f2d13..82f5dacd6d 100644 --- a/gui/packages/desktop/src/renderer/components/Settings.js +++ b/gui/packages/desktop/src/renderer/components/Settings.js @@ -165,24 +165,17 @@ export default class Settings extends Component<Props> { _renderBottomButtons() { return ( <View> - <Cell.CellButton - onPress={this.props.onExternalLink.bind(this, 'faq')} - testName="settings__external_link"> - <Cell.Label>FAQs</Cell.Label> - <Cell.Icon height={16} width={16} source="icon-extLink" /> + <Cell.CellButton onPress={this.props.onViewSupport} testName="settings__view_support"> + <Cell.Label>Report a problem</Cell.Label> + <Cell.Icon height={12} width={7} source="icon-chevron" /> </Cell.CellButton> <Cell.CellButton - onPress={this.props.onExternalLink.bind(this, 'guides')} + onPress={this.props.onExternalLink.bind(this, 'faq')} testName="settings__external_link"> - <Cell.Label>Guides</Cell.Label> + <Cell.Label>{'FAQs & Guides'}</Cell.Label> <Cell.Icon height={16} width={16} source="icon-extLink" /> </Cell.CellButton> - - <Cell.CellButton onPress={this.props.onViewSupport} testName="settings__view_support"> - <Cell.Label>Report a problem</Cell.Label> - <Cell.Icon height={12} width={7} source="icon-chevron" /> - </Cell.CellButton> </View> ); } diff --git a/gui/packages/desktop/test/components/Settings.spec.js b/gui/packages/desktop/test/components/Settings.spec.js index 251bd15855..aa9709e2de 100644 --- a/gui/packages/desktop/test/components/Settings.spec.js +++ b/gui/packages/desktop/test/components/Settings.spec.js @@ -204,7 +204,7 @@ describe('components/Settings', () => { .find({ testName: 'settings__external_link' }) .forEach((element) => element.simulate('press')); - expect(collectedExternalLinkTypes).to.include.ordered.members(['faq', 'guides']); + expect(collectedExternalLinkTypes).to.include.ordered.members(['faq']); }); }); |