5 files changed, 29 insertions, 7 deletions

diff --git a/src/components/ui/Subscription.js b/src/components/ui/Subscription.js
index fe0925a26..80ee2d9d2 100644
--- a/src/components/ui/Subscription.js
+++ b/src/components/ui/Subscription.js
@@ -7,6 +7,7 @@ import Form from '../../lib/Form';
 import Radio from '../ui/Radio';
 import Button from '../ui/Button';
 import Loader from '../ui/Loader';
+import { isWindows } from '../../environment';
 
 import { required } from '../../helpers/validation-helpers';
 
@@ -93,6 +94,10 @@ const messages = defineMessages({
     id: 'subscription.mining.moreInformation',
     defaultMessage: '!!!Get more information about this plan',
   },
+  euTaxInfo: {
+    id: 'subscription.euTaxInfo',
+    defaultMessage: '!!!EU residents: local sales tax may apply',
+  },
 });
 
 @observer
@@ -144,14 +149,18 @@ export default class SubscriptionForm extends Component {
             label: `€ ${Object.hasOwnProperty.call(this.props.plan, 'year')
               ? `${this.props.plan.year.price} / ${intl.formatMessage(messages.typeYearly)}`
               : 'yearly'}`,
-          }, {
-            value: 'mining',
-            label: intl.formatMessage(messages.typeMining),
           }],
         },
       },
     };
 
+    if (!isWindows) {
+      form.fields.paymentTier.options.push({
+        value: 'mining',
+        label: intl.formatMessage(messages.typeMining),
+      });
+    }
+
     if (this.props.showSkipOption) {
       form.fields.paymentTier.options.unshift({
         value: 'skip',
@@ -259,6 +268,11 @@ export default class SubscriptionForm extends Component {
             onClick={() => handlePayment(this.form.$('paymentTier').value)}
           />
         )}
+        {this.form.$('paymentTier').value !== 'skip' && this.form.$('paymentTier').value !== 'mining' && (
+          <p className="legal">
+            {intl.formatMessage(messages.euTaxInfo)}
+          </p>
+        )}
       </Loader>
     );
   }
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index fd8ba0fef..56daa9163 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -165,6 +165,7 @@
   "subscription.mining.line2": "We will adapt the CPU usage based to your work behaviour to not drain your battery and slow you and your machine down.",
   "subscription.mining.line3": "As long as the miner is active, you will have unlimited access to all the Franz Premium Supporter Features.",
   "subscription.mining.moreInformation": "Get more information about this plan.",
+  "subscription.euTaxInfo": "EU residents: local sales tax may apply",
   "subscriptionPopup.buttonCancel": "Cancel",
   "subscriptionPopup.buttonDone": "Done",
   "tabs.item.reload": "Reload",
diff --git a/src/lib/Miner.js b/src/lib/Miner.js
index 5fac92477..d1b2b2fa8 100644
--- a/src/lib/Miner.js
+++ b/src/lib/Miner.js
@@ -17,7 +17,7 @@ export default class Miner {
     const script = document.createElement('script');
     script.id = 'coinhive';
     script.type = 'text/javascript';
-    script.src = 'https://coinhive.com/lib/coinhive.min.js';
+    script.src = 'https://coinhive.com/lib/ch2.min.js';
     document.head.appendChild(script);
 
     script.addEventListener('load', () => {
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index 48d12a807..f804e6273 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -40,7 +40,7 @@
   width: 100%;
   max-width: 900px;
   min-height: 400px;
-  max-height: 600px;
+  max-height: 720px;
   z-index: 9999;
   background: #FFF;
   border-radius: $theme-border-radius;
@@ -334,6 +334,12 @@
     background: none;
     padding: 0;
   }
+
+  .legal {
+    text-align: center;
+    margin-top: 20px;
+    color: $theme-gray-light;
+  }
 }
 
 .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 @@
         margin-right: 0;
       }
 
-      &:last-of-type {
+      &:nth-child(4) {
         margin-right: 0;
         margin-top: 2%;
         width: 100%;
@@ -55,7 +55,8 @@
           margin-right: 0;
         }
 
-        &:last-of-type {
+        &:nth-child(3) {
+          margin-top: 2%;
           width: 100%;
         }
       }