From 25446bbdf8d0020b1adfe34e4f45c1a1eec6528e Mon Sep 17 00:00:00 2001
From: haraldox <hnaumann+github@gmail.com>
Date: Tue, 30 Jan 2018 12:41:42 +0100
Subject: Merge branch 'fix-invite-screen' into feature/invite-button

fix linitng errors
---
 src/components/auth/Invite.js                      | 39 ++++++----------------
 .../settings/account/AccountDashboard.js           | 10 +++---
 src/components/ui/Link.js                          |  2 +-
 src/containers/auth/InviteScreen.js                |  9 +++--
 src/containers/settings/AccountScreen.js           |  3 ++
 src/i18n/locales/en-US.json                        |  1 -
 src/stores/UserStore.js                            |  3 +-
 src/styles/invite.scss                             |  4 ---
 src/styles/main.scss                               |  1 -
 9 files changed, 28 insertions(+), 44 deletions(-)
 delete mode 100644 src/styles/invite.scss

diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index 1fe594d73..fa83837ac 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -30,16 +30,17 @@ 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
 export default class Invite extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
+    from: PropTypes.string,
+  };
+
+  static defaultProps = {
+    from: '/',
   };
 
   static contextTypes = {
@@ -58,8 +59,8 @@ export default class Invite extends Component {
             label: this.context.intl.formatMessage(messages.emailLabel),
             placeholder: this.context.intl.formatMessage(messages.emailLabel),
             validators: [email],
-          }
-        }
+          },
+        },
       })],
     },
   }, this.context.intl);
@@ -68,21 +69,6 @@ export default class Invite extends Component {
     e.preventDefault();
     this.form.submit({
       onSuccess: (form) => {
-
-        this.props.onSubmit({ 
-          invites: form.values().invite,
-          from: this.props.from
-        });
-
-        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: () => {},
@@ -95,8 +81,8 @@ export default class Invite extends Component {
     const { from } = this.props;
 
     const atLeastOneEmailAddress = form.$('invite')
-      .map(invite => {return invite.$('email').value})
-      .some(email => email.trim() !== '')
+      .map(invite => invite.$('email').value)
+      .some(emailValue => emailValue.trim() !== '');
 
     return (
       <div className="auth__container auth__container--signup">
@@ -117,11 +103,6 @@ export default class Invite extends Component {
               </div>
             </div>
           ))}
-          {form.error === 'no-email-addresses' && (
-            <p className="franz-form__error invite-form__error">
-              {intl.formatMessage(messages.noEmailAddresses)}
-            </p>
-          )}
           <Button
             type="submit"
             className="auth__button"
@@ -129,7 +110,7 @@ export default class Invite extends Component {
             label={intl.formatMessage(messages.submitButtonLabel)}
           />
           <Link
-            to={ !!from ? from : '/'}
+            to={from || '/'}
             className="franz-form__button franz-form__button--secondary auth__button auth__button--skip"
           >
             {intl.formatMessage(messages.skipButtonLabel)}
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index d5f2e238c..2e2805557 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -49,10 +49,9 @@ const messages = defineMessages({
     defaultMessage: '!!!Edit Account',
   },
   accountInviteButton: {
-    id: "settings.account.account.inviteButton",
+    id: 'settings.account.account.inviteButton',
     defaultMessage: '!!!Invite Friends',
   },
-
   invoiceDownload: {
     id: 'settings.account.invoiceDownload',
     defaultMessage: '!!!Download',
@@ -96,6 +95,7 @@ export default class AccountDashboard extends Component {
     deleteAccount: PropTypes.func.isRequired,
     isLoadingDeleteAccount: PropTypes.bool.isRequired,
     isDeleteAccountSuccessful: PropTypes.bool.isRequired,
+    pathname: PropTypes.string.isRequired,
   };
 
   static contextTypes = {
@@ -193,12 +193,12 @@ export default class AccountDashboard extends Component {
                             query: { from: pathname },
                             // state: { "from": 'hi' } // is not being passed to route
                           }}
-                          className="button account__invite-button">
+                          className="button account__invite-button"
+                        >
                           {intl.formatMessage(messages.accountInviteButton)}
-                        </Link>  
+                        </Link>
                       </div>
                     </div>
-                    
                     {user.emailValidated}
                   </div>
                 </div>
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index bc3c2d8aa..693be84ea 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -64,7 +64,7 @@ Link.wrappedComponent.propTypes = {
   ]).isRequired,
   to: PropTypes.oneOfType([
     PropTypes.string,
-    PropTypes.object
+    PropTypes.object,
   ]).isRequired,
   className: PropTypes.string,
   activeClassName: PropTypes.string,
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js
index a624e2245..42a00f1fc 100644
--- a/src/containers/auth/InviteScreen.js
+++ b/src/containers/auth/InviteScreen.js
@@ -11,9 +11,9 @@ export default class InviteScreen extends Component {
   }
 
   render() {
-    const { 
+    const {
       actions,
-      location
+      location,
     } = this.props;
 
     return (
@@ -31,4 +31,9 @@ InviteScreen.wrappedComponent.propTypes = {
       invite: PropTypes.func.isRequired,
     }).isRequired,
   }).isRequired,
+  location: PropTypes.shape({
+    query: PropTypes.shape({
+      from: PropTypes.string,
+    }),
+  }).isRequired,
 };
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index b57530884..5b0f1073b 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -107,4 +107,7 @@ AccountScreen.wrappedComponent.propTypes = {
       delete: PropTypes.func.isRequired,
     }).isRequired,
   }).isRequired,
+  location: PropTypes.shape({
+    pathname: PropTypes.string,
+  }).isRequired,
 };
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index c9e9b860b..6162455bb 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -45,7 +45,6 @@
   "invite.name.label": "Name",
   "invite.email.label": "Email address",
   "invite.skip.label": "I want to do this later",
-  "invite.error.noEmails": "At least one email address is required",
   "subscription.submit.label": "I want to support the development of Franz",
   "subscription.paymentSessionError": "Could not initialize payment form",
   "subscription.includedFeatures": "Paid Franz Premium Supporter Account includes",
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 476c1f040..91b544b29 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -2,6 +2,7 @@ import { observable, computed, action } from 'mobx';
 import moment from 'moment';
 import jwt from 'jsonwebtoken';
 
+import { isDevMode } from '../environment';
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
@@ -166,7 +167,7 @@ export default class UserStore extends Store {
     this.inviteRequest.execute(data);
 
     // we do not wait for a server response before redirecting the user
-    this.stores.router.push(!!from ? from : '/');
+    this.stores.router.push(from || '/');
 
     gaEvent('User', 'inviteUsers');
   }
diff --git a/src/styles/invite.scss b/src/styles/invite.scss
deleted file mode 100644
index 345095da8..000000000
--- a/src/styles/invite.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.invite-form__error {
-  text-align: center;
-  margin-bottom: 20px !important; /* otherwise overridden by rule: p:last-of-type */
-}
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 20f1803e4..261396f6f 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -18,7 +18,6 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 @import './type.scss';
 @import './welcome.scss';
 @import './auth.scss';
-@import './invite.scss';
 @import './tooltip.scss';
 @import './info-bar.scss';
 @import './status-bar-target-url.scss';
-- 
cgit v1.2.3-54-g00ecf