diff options
Diffstat (limited to 'src/containers/settings/EditUserScreen.js')
-rw-r--r-- | src/containers/settings/EditUserScreen.js | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js index 3d35effc5..81f689400 100644 --- a/src/containers/settings/EditUserScreen.js +++ b/src/containers/settings/EditUserScreen.js | |||
@@ -9,7 +9,6 @@ import EditUserForm from '../../components/settings/user/EditUserForm'; | |||
9 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 9 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
10 | 10 | ||
11 | import { required, email, minLength } from '../../helpers/validation-helpers'; | 11 | import { required, email, minLength } from '../../helpers/validation-helpers'; |
12 | import { gaPage } from '../../lib/analytics'; | ||
13 | 12 | ||
14 | const messages = defineMessages({ | 13 | const messages = defineMessages({ |
15 | firstname: { | 14 | firstname: { |
@@ -24,23 +23,21 @@ const messages = defineMessages({ | |||
24 | id: 'settings.user.form.email', | 23 | id: 'settings.user.form.email', |
25 | defaultMessage: '!!!Email', | 24 | defaultMessage: '!!!Email', |
26 | }, | 25 | }, |
27 | accountType: { | 26 | accountTypeLabel: { |
28 | label: { | 27 | id: 'settings.user.form.accountType.label', |
29 | id: 'settings.user.form.accountType.label', | 28 | defaultMessage: '!!!Account type', |
30 | defaultMessage: '!!!Account type', | 29 | }, |
31 | }, | 30 | accountTypeIndividual: { |
32 | individual: { | 31 | id: 'settings.user.form.accountType.individual', |
33 | id: 'settings.user.form.accountType.individual', | 32 | defaultMessage: '!!!Individual', |
34 | defaultMessage: '!!!Individual', | 33 | }, |
35 | }, | 34 | accountTypeNonProfit: { |
36 | nonProfit: { | 35 | id: 'settings.user.form.accountType.non-profit', |
37 | id: 'settings.user.form.accountType.non-profit', | 36 | defaultMessage: '!!!Non-Profit', |
38 | defaultMessage: '!!!Non-Profit', | 37 | }, |
39 | }, | 38 | accountTypeCompany: { |
40 | company: { | 39 | id: 'settings.user.form.accountType.company', |
41 | id: 'settings.user.form.accountType.company', | 40 | defaultMessage: '!!!Company', |
42 | defaultMessage: '!!!Company', | ||
43 | }, | ||
44 | }, | 41 | }, |
45 | currentPassword: { | 42 | currentPassword: { |
46 | id: 'settings.user.form.currentPassword', | 43 | id: 'settings.user.form.currentPassword', |
@@ -57,10 +54,6 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten | |||
57 | intl: intlShape, | 54 | intl: intlShape, |
58 | }; | 55 | }; |
59 | 56 | ||
60 | componentDidMount() { | ||
61 | gaPage('Settings/Account/Edit'); | ||
62 | } | ||
63 | |||
64 | componentWillUnmount() { | 57 | componentWillUnmount() { |
65 | this.props.actions.user.resetStatus(); | 58 | this.props.actions.user.resetStatus(); |
66 | } | 59 | } |
@@ -99,21 +92,21 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten | |||
99 | accountType: { | 92 | accountType: { |
100 | value: user.accountType, | 93 | value: user.accountType, |
101 | validators: [required], | 94 | validators: [required], |
102 | label: intl.formatMessage(messages.accountType.label), | 95 | label: intl.formatMessage(messages.accountTypeLabel), |
103 | options: [{ | 96 | options: [{ |
104 | value: 'individual', | 97 | value: 'individual', |
105 | label: intl.formatMessage(messages.accountType.individual), | 98 | label: intl.formatMessage(messages.accountTypeIndividual), |
106 | }, { | 99 | }, { |
107 | value: 'non-profit', | 100 | value: 'non-profit', |
108 | label: intl.formatMessage(messages.accountType.nonProfit), | 101 | label: intl.formatMessage(messages.accountTypeNonProfit), |
109 | }, { | 102 | }, { |
110 | value: 'company', | 103 | value: 'company', |
111 | label: intl.formatMessage(messages.accountType.company), | 104 | label: intl.formatMessage(messages.accountTypeCompany), |
112 | }], | 105 | }], |
113 | }, | 106 | }, |
114 | organization: { | 107 | organization: { |
115 | label: intl.formatMessage(messages.accountType.company), | 108 | label: intl.formatMessage(messages.accountTypeCompany), |
116 | placeholder: intl.formatMessage(messages.accountType.company), | 109 | placeholder: intl.formatMessage(messages.accountTypeCompany), |
117 | value: user.organization, | 110 | value: user.organization, |
118 | }, | 111 | }, |
119 | oldPassword: { | 112 | oldPassword: { |