@@ -117,13 +117,81 @@ export const PersonalDetails: React.FC = () => {
117117 </ Row >
118118 </ Box >
119119
120- < Box marginBottom = "xs" style = { { display : 'flex' , justifyContent : 'end' } } >
121- < PrimaryButton onClick = { forgotPassword } style = { { width : '198px' } } loading = { submitting } disabled = { newPassword . trim ( ) === '' || confirmPassword . trim ( ) === '' } >
122- { translate ( 'passwordReset.button' ) }
123- </ PrimaryButton >
120+ < Box marginBottom = "lg" marginTop = "xl" >
121+ < Row >
122+ < Col lg = { 5 } >
123+ < Box marginBottom = "lg" >
124+ < FormPasswordField
125+ label = { translate ( 'form.passwordChange.currentPassword.label' ) }
126+ labelColor = "#000"
127+ placeholder = { translate (
128+ 'form.passwordChange.currentPassword.placeholder' ,
129+ ) }
130+ value = { currentPassword }
131+ onChange = { ( val : string ) => setCurrentPassword ( val ) }
132+ error = { {
133+ hasError : currentPassword . trim ( ) === undefined ,
134+ text : translate (
135+ 'form.passwordChange.currentPassword.required' ,
136+ ) ,
137+ } }
138+ showPasswordOption
139+ />
140+ </ Box >
141+ < Box marginBottom = "lg" >
142+ < FormPasswordField
143+ label = { translate ( 'form.passwordChange.newPassword.label' ) }
144+ labelColor = "#000"
145+ placeholder = { translate (
146+ 'form.passwordChange.newPassword.placeholder' ,
147+ ) }
148+ value = { newPassword }
149+ onChange = { ( val : string ) => setNewPassword ( val ) }
150+ error = { {
151+ hasError : newPassword . trim ( ) === undefined ,
152+ text : translate ( 'form.passwordChange.newPassword.required' ) ,
153+ } }
154+ showPasswordOption
155+ />
156+ </ Box >
157+ < Box marginBottom = "lg" >
158+ < FormPasswordField
159+ label = { translate ( 'form.passwordChange.confirmPassword.label' ) }
160+ labelColor = "#000"
161+ placeholder = { translate (
162+ 'form.passwordChange.confirmPassword.placeholder' ,
163+ ) }
164+ value = { confirmPassword }
165+ onChange = { ( val : string ) => setConfirmPassword ( val ) }
166+ error = { {
167+ hasError : confirmPassword . trim ( ) === undefined ,
168+ text : translate (
169+ 'form.passwordChange.confirmPassword.required' ,
170+ ) ,
171+ } }
172+ showPasswordOption
173+ />
174+ </ Box >
175+
176+ < Box
177+ marginBottom = "xs"
178+ style = { { display : 'flex' , justifyContent : 'end' } }
179+ >
180+ < PrimaryButton
181+ onClick = { forgotPassword }
182+ style = { { width : '198px' } }
183+ loading = { submitting }
184+ disabled = {
185+ newPassword . trim ( ) === '' || confirmPassword . trim ( ) === ''
186+ }
187+ >
188+ { translate ( 'passwordReset.button' ) }
189+ </ PrimaryButton >
190+ </ Box >
191+ </ Col >
192+ </ Row >
124193 </ Box >
125-
126- </ FlexBox . Column >
127- </ >
194+ </ FlexBox . Column >
195+ </ >
128196 ) ;
129197} ;
0 commit comments