Merge branch 'master' into save-icon

This commit is contained in:
Kim Gardner authored and GitHub committed 2018-05-07 15:23:11 -04:00
commit f2ea3bdd42
2 files changed
+9 -5

No files matched your search

@@ -14,7 +14,11 @@ const initialState = {
editing: false,
showErrors: true,
errors: {},
formData: {},
formData: {
oldPassword: '',
newPassword: '',
confirmNewPassword: '',
},
};
class ChangePassword extends React.Component {
@@ -19,13 +19,13 @@ const InputField = ({
showSuccess = false,
validationType = '',
icon = '',
value = '',
defaultValue = '',
value,
defaultValue,
disabled = false,
}) => {
const inputValue = {
...(value ? { value } : {}),
...(defaultValue ? { defaultValue } : {}),
...(value !== undefined ? { value } : {}),
...(defaultValue !== undefined ? { defaultValue } : {}),
};
return (