aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/ui')
-rw-r--r--src/components/ui/StatusBarTargetUrl.js40
-rw-r--r--src/components/ui/Subscription.js8
-rw-r--r--src/components/ui/SubscriptionPopup.js2
3 files changed, 45 insertions, 5 deletions
diff --git a/src/components/ui/StatusBarTargetUrl.js b/src/components/ui/StatusBarTargetUrl.js
new file mode 100644
index 000000000..b7b198f42
--- /dev/null
+++ b/src/components/ui/StatusBarTargetUrl.js
@@ -0,0 +1,40 @@
1import React, { Component } from 'react';
2import PropTypes from 'prop-types';
3import { observer } from 'mobx-react';
4import classnames from 'classnames';
5
6import Appear from '../ui/effects/Appear';
7
8@observer
9export default class StatusBarTargetUrl extends Component {
10 static propTypes = {
11 className: PropTypes.string,
12 text: PropTypes.string,
13 };
14
15 static defaultProps = {
16 className: '',
17 position: 'bottom',
18 text: '',
19 };
20
21 render() {
22 const {
23 className,
24 text,
25 } = this.props;
26
27 return (
28 <Appear
29 className={classnames({
30 'status-bar-target-url': true,
31 [`${className}`]: true,
32 })}
33 >
34 <div className="status-bar-target-url__content">
35 {text}
36 </div>
37 </Appear>
38 );
39 }
40}
diff --git a/src/components/ui/Subscription.js b/src/components/ui/Subscription.js
index ada5cc3e0..fe0925a26 100644
--- a/src/components/ui/Subscription.js
+++ b/src/components/ui/Subscription.js
@@ -79,7 +79,7 @@ const messages = defineMessages({
79 }, 79 },
80 miningDetail1: { 80 miningDetail1: {
81 id: 'subscription.mining.line1', 81 id: 'subscription.mining.line1',
82 defaultMessage: '!!!By enabling "Support with processing power", Franz will use about 20-50% of your CPU to mine cryptocurrency Monero which equals approximately $ 5/year.', 82 defaultMessage: '!!!By enabling "Support with processing power", Franz will use about 20-50% of your CPU to mine cryptocurrency Monero which equals approximately € 5/year.',
83 }, 83 },
84 miningDetail2: { 84 miningDetail2: {
85 id: 'subscription.mining.line2', 85 id: 'subscription.mining.line2',
@@ -136,12 +136,12 @@ export default class SubscriptionForm extends Component {
136 validate: [required], 136 validate: [required],
137 options: [{ 137 options: [{
138 value: 'month', 138 value: 'month',
139 label: `$ ${Object.hasOwnProperty.call(this.props.plan, 'month') 139 label: ` ${Object.hasOwnProperty.call(this.props.plan, 'month')
140 ? `${this.props.plan.month.price} / ${intl.formatMessage(messages.typeMonthly)}` 140 ? `${this.props.plan.month.price} / ${intl.formatMessage(messages.typeMonthly)}`
141 : 'monthly'}`, 141 : 'monthly'}`,
142 }, { 142 }, {
143 value: 'year', 143 value: 'year',
144 label: `$ ${Object.hasOwnProperty.call(this.props.plan, 'year') 144 label: ` ${Object.hasOwnProperty.call(this.props.plan, 'year')
145 ? `${this.props.plan.year.price} / ${intl.formatMessage(messages.typeYearly)}` 145 ? `${this.props.plan.year.price} / ${intl.formatMessage(messages.typeYearly)}`
146 : 'yearly'}`, 146 : 'yearly'}`,
147 }, { 147 }, {
@@ -155,7 +155,7 @@ export default class SubscriptionForm extends Component {
155 if (this.props.showSkipOption) { 155 if (this.props.showSkipOption) {
156 form.fields.paymentTier.options.unshift({ 156 form.fields.paymentTier.options.unshift({
157 value: 'skip', 157 value: 'skip',
158 label: `$ 0 / ${intl.formatMessage(messages.typeFree)}`, 158 label: ` 0 / ${intl.formatMessage(messages.typeFree)}`,
159 }); 159 });
160 } 160 }
161 161
diff --git a/src/components/ui/SubscriptionPopup.js b/src/components/ui/SubscriptionPopup.js
index 72b6ccd98..5aae2c47a 100644
--- a/src/components/ui/SubscriptionPopup.js
+++ b/src/components/ui/SubscriptionPopup.js
@@ -57,7 +57,7 @@ export default class SubscriptionPopup extends Component {
57 className="subscription-popup__webview" 57 className="subscription-popup__webview"
58 58
59 autosize 59 autosize
60 src={url} 60 src={encodeURI(url)}
61 disablewebsecurity 61 disablewebsecurity
62 onDidNavigate={completeCheck} 62 onDidNavigate={completeCheck}
63 // onNewWindow={(event, url, frameName, options) => 63 // onNewWindow={(event, url, frameName, options) =>