diff options
-rw-r--r-- | src/components/ui/Subscription.js | 11 | ||||
-rw-r--r-- | src/stores/UserStore.js | 2 | ||||
-rw-r--r-- | src/styles/settings.scss | 6 | ||||
-rw-r--r-- | src/styles/subscription.scss | 5 |
4 files changed, 18 insertions, 6 deletions
diff --git a/src/components/ui/Subscription.js b/src/components/ui/Subscription.js index 35a1105d2..80ee2d9d2 100644 --- a/src/components/ui/Subscription.js +++ b/src/components/ui/Subscription.js | |||
@@ -7,6 +7,7 @@ import Form from '../../lib/Form'; | |||
7 | import Radio from '../ui/Radio'; | 7 | import Radio from '../ui/Radio'; |
8 | import Button from '../ui/Button'; | 8 | import Button from '../ui/Button'; |
9 | import Loader from '../ui/Loader'; | 9 | import Loader from '../ui/Loader'; |
10 | import { isWindows } from '../../environment'; | ||
10 | 11 | ||
11 | import { required } from '../../helpers/validation-helpers'; | 12 | import { required } from '../../helpers/validation-helpers'; |
12 | 13 | ||
@@ -148,14 +149,18 @@ export default class SubscriptionForm extends Component { | |||
148 | label: `€ ${Object.hasOwnProperty.call(this.props.plan, 'year') | 149 | label: `€ ${Object.hasOwnProperty.call(this.props.plan, 'year') |
149 | ? `${this.props.plan.year.price} / ${intl.formatMessage(messages.typeYearly)}` | 150 | ? `${this.props.plan.year.price} / ${intl.formatMessage(messages.typeYearly)}` |
150 | : 'yearly'}`, | 151 | : 'yearly'}`, |
151 | }, { | ||
152 | value: 'mining', | ||
153 | label: intl.formatMessage(messages.typeMining), | ||
154 | }], | 152 | }], |
155 | }, | 153 | }, |
156 | }, | 154 | }, |
157 | }; | 155 | }; |
158 | 156 | ||
157 | if (!isWindows) { | ||
158 | form.fields.paymentTier.options.push({ | ||
159 | value: 'mining', | ||
160 | label: intl.formatMessage(messages.typeMining), | ||
161 | }); | ||
162 | } | ||
163 | |||
159 | if (this.props.showSkipOption) { | 164 | if (this.props.showSkipOption) { |
160 | form.fields.paymentTier.options.unshift({ | 165 | form.fields.paymentTier.options.unshift({ |
161 | value: 'skip', | 166 | value: 'skip', |
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js index 1cb2ecac3..63311065a 100644 --- a/src/stores/UserStore.js +++ b/src/stores/UserStore.js | |||
@@ -231,7 +231,7 @@ export default class UserStore extends Store { | |||
231 | && currentRoute.includes(this.BASE_ROUTE) | 231 | && currentRoute.includes(this.BASE_ROUTE) |
232 | && (this.hasCompletedSignup | 232 | && (this.hasCompletedSignup |
233 | || this.hasCompletedSignup === null)) { | 233 | || this.hasCompletedSignup === null)) { |
234 | this.stores.router.push('/'); | 234 | // this.stores.router.push('/'); |
235 | } | 235 | } |
236 | }; | 236 | }; |
237 | 237 | ||
diff --git a/src/styles/settings.scss b/src/styles/settings.scss index 48d12a807..90f119c99 100644 --- a/src/styles/settings.scss +++ b/src/styles/settings.scss | |||
@@ -334,6 +334,12 @@ | |||
334 | background: none; | 334 | background: none; |
335 | padding: 0; | 335 | padding: 0; |
336 | } | 336 | } |
337 | |||
338 | .legal { | ||
339 | text-align: center; | ||
340 | margin-top: 20px; | ||
341 | color: $theme-gray-light; | ||
342 | } | ||
337 | } | 343 | } |
338 | 344 | ||
339 | .settings-navigation { | 345 | .settings-navigation { |
diff --git a/src/styles/subscription.scss b/src/styles/subscription.scss index 63183f085..01d8f4ecb 100644 --- a/src/styles/subscription.scss +++ b/src/styles/subscription.scss | |||
@@ -36,7 +36,7 @@ | |||
36 | margin-right: 0; | 36 | margin-right: 0; |
37 | } | 37 | } |
38 | 38 | ||
39 | &:last-of-type { | 39 | &:nth-child(4) { |
40 | margin-right: 0; | 40 | margin-right: 0; |
41 | margin-top: 2%; | 41 | margin-top: 2%; |
42 | width: 100%; | 42 | width: 100%; |
@@ -55,7 +55,8 @@ | |||
55 | margin-right: 0; | 55 | margin-right: 0; |
56 | } | 56 | } |
57 | 57 | ||
58 | &:last-of-type { | 58 | &:nth-child(3) { |
59 | margin-top: 2%; | ||
59 | width: 100%; | 60 | width: 100%; |
60 | } | 61 | } |
61 | } | 62 | } |