summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2018-10-01 12:46:46 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2018-10-01 16:39:02 -0300
commit0141cf5b784869d9b1370ea919d47a2fc59b9ada (patch)
tree161d8ed6af1a49d73c18994d5f161b0cab227f0b
parent85f45e0e578654a5ff620acac971dd39b3c4d598 (diff)
downloadmullvadvpn-0141cf5b784869d9b1370ea919d47a2fc59b9ada.tar.xz
mullvadvpn-0141cf5b784869d9b1370ea919d47a2fc59b9ada.zip
Replace usage of `Cell.Img` with `Cell.Icon`
-rw-r--r--gui/packages/desktop/src/renderer/components/Cell.js2
-rw-r--r--gui/packages/desktop/src/renderer/components/SelectLocation.js6
-rw-r--r--gui/packages/desktop/src/renderer/components/Settings.js16
3 files changed, 11 insertions, 13 deletions
diff --git a/gui/packages/desktop/src/renderer/components/Cell.js b/gui/packages/desktop/src/renderer/components/Cell.js
index 81999d3a5f..6dbfc9f905 100644
--- a/gui/packages/desktop/src/renderer/components/Cell.js
+++ b/gui/packages/desktop/src/renderer/components/Cell.js
@@ -86,8 +86,6 @@ const styles = {
}),
};
-export class Img extends PlainImg {}
-
type CellButtonProps = {
children?: React.Node,
disabled?: boolean,
diff --git a/gui/packages/desktop/src/renderer/components/SelectLocation.js b/gui/packages/desktop/src/renderer/components/SelectLocation.js
index f84cadd6f3..754b104037 100644
--- a/gui/packages/desktop/src/renderer/components/SelectLocation.js
+++ b/gui/packages/desktop/src/renderer/components/SelectLocation.js
@@ -165,7 +165,7 @@ export default class SelectLocation extends Component<Props, State> {
const statusClass = active ? styles.relay_status__active : styles.relay_status__inactive;
return isSelected ? (
- <Cell.Img style={styles.tick_icon} source="icon-tick" height={24} width={24} />
+ <Cell.Icon style={styles.tick_icon} source="icon-tick" height={24} width={24} />
) : (
<View style={[styles.relay_status, statusClass]} />
);
@@ -209,7 +209,7 @@ export default class SelectLocation extends Component<Props, State> {
<Cell.Label>{relayCountry.name}</Cell.Label>
{hasChildren ? (
- <Cell.Img
+ <Cell.Icon
style={styles.collapse_button}
hoverStyle={styles.expand_chevron_hover}
onPress={handleCollapse}
@@ -266,7 +266,7 @@ export default class SelectLocation extends Component<Props, State> {
<Cell.Label>{relayCity.name}</Cell.Label>
{relayCity.relays.length > 1 ? (
- <Cell.Img
+ <Cell.Icon
style={styles.collapse_button}
hoverStyle={styles.expand_chevron_hover}
onPress={handleCollapse}
diff --git a/gui/packages/desktop/src/renderer/components/Settings.js b/gui/packages/desktop/src/renderer/components/Settings.js
index 8a7df34f43..f1cb4d8fdc 100644
--- a/gui/packages/desktop/src/renderer/components/Settings.js
+++ b/gui/packages/desktop/src/renderer/components/Settings.js
@@ -91,7 +91,7 @@ export default class Settings extends Component<Props> {
style={styles.settings__account_paid_until_label__error}>
{'OUT OF TIME'}
</Cell.SubText>
- <Cell.Img height={12} width={7} source="icon-chevron" />
+ <Cell.Icon height={12} width={7} source="icon-chevron" />
</Cell.CellButton>
) : (
<Cell.CellButton
@@ -101,19 +101,19 @@ export default class Settings extends Component<Props> {
<Cell.SubText testName="settings__account_paid_until_subtext">
{formattedExpiry}
</Cell.SubText>
- <Cell.Img height={12} width={7} source="icon-chevron" />
+ <Cell.Icon height={12} width={7} source="icon-chevron" />
</Cell.CellButton>
)}
</View>
<Cell.CellButton onPress={this.props.onViewPreferences} testName="settings__preferences">
<Cell.Label>Preferences</Cell.Label>
- <Cell.Img height={12} width={7} source="icon-chevron" />
+ <Cell.Icon height={12} width={7} source="icon-chevron" />
</Cell.CellButton>
<Cell.CellButton onPress={this.props.onViewAdvancedSettings} testName="settings__advanced">
<Cell.Label>Advanced</Cell.Label>
- <Cell.Img height={12} width={7} source="icon-chevron" />
+ <Cell.Icon height={12} width={7} source="icon-chevron" />
</Cell.CellButton>
<View style={styles.settings__cell_spacer} />
</View>
@@ -148,7 +148,7 @@ export default class Settings extends Component<Props> {
{icon}
<Cell.Label>App version</Cell.Label>
<Cell.SubText>{this.props.appVersion}</Cell.SubText>
- <Cell.Img height={16} width={16} source="icon-extLink" />
+ <Cell.Icon height={16} width={16} source="icon-extLink" />
</Cell.CellButton>
{footer}
</View>
@@ -162,19 +162,19 @@ export default class Settings extends Component<Props> {
onPress={this.props.onExternalLink.bind(this, 'faq')}
testName="settings__external_link">
<Cell.Label>FAQs</Cell.Label>
- <Cell.Img height={16} width={16} source="icon-extLink" />
+ <Cell.Icon height={16} width={16} source="icon-extLink" />
</Cell.CellButton>
<Cell.CellButton
onPress={this.props.onExternalLink.bind(this, 'guides')}
testName="settings__external_link">
<Cell.Label>Guides</Cell.Label>
- <Cell.Img height={16} width={16} source="icon-extLink" />
+ <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.Img height={12} width={7} source="icon-chevron" />
+ <Cell.Icon height={12} width={7} source="icon-chevron" />
</Cell.CellButton>
</View>
);