diff options
author | 2018-02-06 09:10:31 +0100 | |
---|---|---|
committer | 2018-02-06 09:10:31 +0100 | |
commit | 48059682d04c5911add9f962a85ef6d514355ee5 (patch) | |
tree | 9f22d69b0720a3162a9492037feaa2369c829656 /src/components | |
parent | Merge branch 'develop' into feature/invite-button (diff) | |
download | ferdium-app-48059682d04c5911add9f962a85ef6d514355ee5.tar.gz ferdium-app-48059682d04c5911add9f962a85ef6d514355ee5.tar.zst ferdium-app-48059682d04c5911add9f962a85ef6d514355ee5.zip |
[MINOR] house cleaning
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/settings/account/AccountDashboard.js | 6 | ||||
-rw-r--r-- | src/components/settings/user/EditUserForm.js | 2 | ||||
-rw-r--r-- | src/components/ui/Link.js | 5 |
3 files changed, 3 insertions, 10 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({ | |||
48 | id: 'settings.account.account.editButton', | 48 | id: 'settings.account.account.editButton', |
49 | defaultMessage: '!!!Edit Account', | 49 | defaultMessage: '!!!Edit Account', |
50 | }, | 50 | }, |
51 | accountInviteButton: { | ||
52 | id: 'settings.account.account.inviteButton', | ||
53 | defaultMessage: '!!!Invite Friends', | ||
54 | }, | ||
55 | invoiceDownload: { | 51 | invoiceDownload: { |
56 | id: 'settings.account.invoiceDownload', | 52 | id: 'settings.account.invoiceDownload', |
57 | defaultMessage: '!!!Download', | 53 | defaultMessage: '!!!Download', |
@@ -178,7 +174,7 @@ export default class AccountDashboard extends Component { | |||
178 | <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span> | 174 | <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span> |
179 | )} | 175 | )} |
180 | </div> | 176 | </div> |
181 | <Link to="/settings/user/edit" className="button account__edit-button"> | 177 | <Link to="/settings/user/edit" className="button"> |
182 | {intl.formatMessage(messages.accountEditButton)} | 178 | {intl.formatMessage(messages.accountEditButton)} |
183 | </Link> | 179 | </Link> |
184 | {user.emailValidated} | 180 | {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 { | |||
135 | <Button | 135 | <Button |
136 | type="submit" | 136 | type="submit" |
137 | label={intl.formatMessage(messages.buttonSave)} | 137 | label={intl.formatMessage(messages.buttonSave)} |
138 | htmlForm="form" // why is form attribute escaped in JSX?? couldn't find any info on that, did you mean "htmlFor"? | 138 | htmlForm="form" |
139 | /> | 139 | /> |
140 | )} | 140 | )} |
141 | </div> | 141 | </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 = { | |||
62 | oneOrManyChildElements, | 62 | oneOrManyChildElements, |
63 | PropTypes.string, | 63 | PropTypes.string, |
64 | ]).isRequired, | 64 | ]).isRequired, |
65 | to: PropTypes.oneOfType([ | 65 | to: PropTypes.string.isRequired, |
66 | PropTypes.string, | ||
67 | PropTypes.object, | ||
68 | ]).isRequired, | ||
69 | className: PropTypes.string, | 66 | className: PropTypes.string, |
70 | activeClassName: PropTypes.string, | 67 | activeClassName: PropTypes.string, |
71 | strictFilter: PropTypes.bool, | 68 | strictFilter: PropTypes.bool, |