[MINOR] house cleaning

11 files changed, 6 insertions, 31 deletions

diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index e079fd2f4..5724181f5 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -48,10 +48,6 @@ const messages = defineMessages({
     id: 'settings.account.account.editButton',
     defaultMessage: '!!!Edit Account',
   },
-  accountInviteButton: {
-    id: 'settings.account.account.inviteButton',
-    defaultMessage: '!!!Invite Friends',
-  },
   invoiceDownload: {
     id: 'settings.account.invoiceDownload',
     defaultMessage: '!!!Download',
@@ -178,7 +174,7 @@ export default class AccountDashboard extends Component {
                         <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span>
                       )}
                     </div>
-                    <Link to="/settings/user/edit" className="button account__edit-button">
+                    <Link to="/settings/user/edit" className="button">
                       {intl.formatMessage(messages.accountEditButton)}
                     </Link>
                     {user.emailValidated}
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index 0a7b7c396..f36887fc2 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -135,7 +135,7 @@ export default class EditServiceForm extends Component {
             <Button
               type="submit"
               label={intl.formatMessage(messages.buttonSave)}
-              htmlForm="form" // why is form attribute escaped in JSX?? couldn't find any info on that, did you mean "htmlFor"?
+              htmlForm="form"
             />
           )}
         </div>
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index 693be84ea..f5da921fa 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -62,10 +62,7 @@ Link.wrappedComponent.propTypes = {
     oneOrManyChildElements,
     PropTypes.string,
   ]).isRequired,
-  to: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.object,
-  ]).isRequired,
+  to: PropTypes.string.isRequired,
   className: PropTypes.string,
   activeClassName: PropTypes.string,
   strictFilter: PropTypes.bool,
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js
index 7102df0b9..e54d8d225 100644
--- a/src/containers/auth/InviteScreen.js
+++ b/src/containers/auth/InviteScreen.js
@@ -11,16 +11,12 @@ export default class InviteScreen extends Component {
   }
 
   render() {
-    const {
-      actions,
-      location,
-    } = this.props;
+    const { actions } = this.props;
 
     return (
       <div className="auth__container auth__container--signup">
         <Invite
           onSubmit={actions.user.invite}
-          from={location.query.from}
           embed={false}
         />
       </div>
@@ -34,9 +30,4 @@ 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 9ee93a9e9..c5c2982b0 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -61,7 +61,7 @@ export default class AccountScreen extends Component {
   render() {
     const { user, payment } = this.props.stores;
     const { openExternalUrl } = this.props.actions.app;
-    const { user: userActions } = this.props.actions; // @adlk: :+1 what's the opposite of git blame?
+    const { user: userActions } = this.props.actions;
 
     const isLoadingUserInfo = user.getUserInfoRequest.isExecuting;
     const isLoadingOrdersInfo = payment.ordersDataRequest.isExecuting;
@@ -83,7 +83,6 @@ export default class AccountScreen extends Component {
         deleteAccount={userActions.delete}
         isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting}
         isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError}
-        pathname={this.props.location.pathname}
       />
     );
   }
@@ -107,7 +106,4 @@ AccountScreen.wrappedComponent.propTypes = {
       delete: PropTypes.func.isRequired,
     }).isRequired,
   }).isRequired,
-  location: PropTypes.shape({
-    pathname: PropTypes.string,
-  }).isRequired,
 };
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 180db3018..1ea0554ba 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -45,7 +45,6 @@
    "services.getStarted" : "Loslegen",
    "services.welcome" : "Willkommen bei Franz.",
    "settings.account.account.editButton" : "Konto bearbeiten",
-   "settings.account.account.inviteButton" : "Freunde einladen",
    "settings.account.accountType.basic" : "Basis Konto",
    "settings.account.accountType.premium" : "Premium-Supporter Konto",
    "settings.account.buttonSave" : "Profil aktualisieren",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 29b979838..3c09fca3b 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -77,7 +77,6 @@
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
   "settings.account.account.editButton": "Edit account",
-  "settings.account.account.inviteButton" : "Invite friends",
   "settings.account.invoiceDownload": "Download",
   "settings.account.userInfoRequestFailed": "Could not load user information",
   "settings.account.tryReloadUserInfoRequest": "Try again",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index dddd1bf1f..c4f598bd1 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -45,7 +45,6 @@
    "services.getStarted" : "Primeros pasos",
    "services.welcome" : "Bienvenido a Franz",
    "settings.account.account.editButton" : "Editar cuenta",
-   "settings.account.account.inviteButton" : "Invitar amigos",
    "settings.account.accountType.basic" : "Cuenta Básica",
    "settings.account.accountType.premium" : "Cuenta Colaborador Premium",
    "settings.account.buttonSave" : "Actualizar perfil",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index a717577be..4a06975bb 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -45,7 +45,6 @@
    "services.getStarted" : "Commencer",
    "services.welcome" : "Bienvenue dans Franz",
    "settings.account.account.editButton" : "Modifier le compte",
-   "settings.account.account.inviteButton" : "Inviter des amis",   
    "settings.account.accountType.basic" : "Compte de base",
    "settings.account.accountType.premium" : "Compte supporteur premium",
    "settings.account.buttonSave" : "Mettre à jour le profil",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 5b89b3a12..1d2485b19 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -45,7 +45,6 @@
    "services.getStarted" : "Iniziamo",
    "services.welcome" : "Benvenuto in Franz",
    "settings.account.account.editButton" : "Modifica account",
-   "settings.account.account.inviteButton" : "Invitare amicos",
    "settings.account.accountType.basic" : "Account Basic",
    "settings.account.accountType.premium" : "Premium Supporter Account",
    "settings.account.buttonSave" : "Aggiorna profilo",
diff --git a/src/models/User.js b/src/models/User.js
index d2a455e20..2e5df4795 100644
--- a/src/models/User.js
+++ b/src/models/User.js
@@ -10,7 +10,7 @@ export default class User {
   @observable emailIsConfirmed = true; // better assume it's confirmed to avoid noise
   @observable subscription = {};
   @observable isSubscriptionOwner = false;
-  @observable isPremium = true;
+  @observable isPremium = false;
   @observable beta = false;
   @observable donor = {};
   @observable isDonor = false;