From eb1d3c81f1a3c4ec33b5b630cf1e168ab946dc75 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sun, 24 Dec 2017 22:09:14 +0100 Subject: Completely remove miner --- src/i18n/locales/en-US.json | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/i18n') diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 567537d75..c2c90425f 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -83,10 +83,6 @@ "settings.account.headlinePassword": "Change password", "settings.account.successInfo": "Your changes have been saved", "settings.account.buttonSave": "Update profile", - "settings.account.mining.thankyou": "Thank you for supporting Franz with your processing power.", - "settings.account.mining.active": "You are right now performing {hashes} calculations per second.", - "settings.account.mining.moreInformation": "Get more information", - "settings.account.mining.cancel": "Cancel mining", "settings.account.deleteAccount": "Delete account", "settings.account.deleteInfo": "If you don't need your Franz account any longer, you can delete your account and all related data here.", "settings.account.deleteEmailSent": "You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!", @@ -174,13 +170,6 @@ "subscription.type.free": "free", "subscription.type.month": "month", "subscription.type.year": "year", - "subscription.type.mining": "Support Franz with processing power", - "subscription.mining.headline": "How does this work?", - "subscription.mining.experimental": "experimental", - "subscription.mining.line1": "By enabling \"Support with processing power\", Franz will use about 20-50% of your CPU to mine the cryptocurrency Monero which equals approximately $ 5/year.", - "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", -- cgit v1.2.3-70-g09d2 From 56520969f508c1db257d7573962ad6b762205e56 Mon Sep 17 00:00:00 2001 From: haraldox Date: Fri, 19 Jan 2018 17:26:17 +0100 Subject: alternative UX implementation of check for email address count > 0 comment out line 122 to test --- src/components/auth/Invite.js | 19 +++++++++++++++++++ src/i18n/locales/en-US.json | 1 + src/styles/invite.scss | 4 ++++ src/styles/main.scss | 1 + 4 files changed, 25 insertions(+) create mode 100644 src/styles/invite.scss (limited to 'src/i18n') diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index 3eb1f2765..c4c35d538 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js @@ -30,6 +30,10 @@ const messages = defineMessages({ id: 'invite.skip.label', defaultMessage: '!!!I want to do this later', }, + noEmailAddresses: { + id: 'invite.error.noEmails', + defaultMessage: '!!!At least one email address is required', + } }); @observer @@ -64,6 +68,16 @@ export default class Invite extends Component { e.preventDefault(); this.form.submit({ onSuccess: (form) => { + + const atLeastOneEmailAddress = form.$('invite') + .map(invite => {return invite.$('email').value}) + .some(email => email.trim() !== '') + + if (!atLeastOneEmailAddress) { + form.invalidate('no-email-addresses') + return + } + this.props.onSubmit({ invites: form.values().invite }); }, onError: () => {}, @@ -97,6 +111,11 @@ export default class Invite extends Component { ))} + {form.error === 'no-email-addresses' && ( +

+ {intl.formatMessage(messages.noEmailAddresses)} +

+ )}