Merge pull request #47 from feliciagan/edit_profile

Debug edit profile

Author: ruiqi7

frontend/src/components/ChangePasswordModal/index.tsx

@@ -63,7 +63,11 @@ const ChangePasswordModal: React.FC<ChangePasswordModalProps> = (props) => {
               required
               fullWidth
               margin="normal"
-              {...register("oldPassword")}
+              {...register("oldPassword", {
+                required: "Required field",
+              })}
+              error={!!errors.oldPassword}
+              helperText={errors.oldPassword?.message}
             />
             <PasswordTextField
               displayTooltip

frontend/src/pages/Profile/index.tsx

@@ -101,17 +101,19 @@ const ProfilePage: React.FC = () => {
         <Box sx={(theme) => ({ flex: 3, paddingLeft: theme.spacing(4) })}>
           <Typography variant="h4">Questions attempted</Typography>
         </Box>
-        <EditProfileModal
-          open={editProfileOpen}
-          onClose={() => setEditProfileModalOpen(false)}
-          currFirstName={user.firstName}
-          currLastName={user.lastName}
-          currBiography={user.biography}
-        />
-        <ChangePasswordModal
-          open={passwordModalOpen}
-          onClose={() => setPasswordModalOpen(false)}
-        />
+        {editProfileOpen &&
+          <EditProfileModal
+            open={editProfileOpen}
+            onClose={() => setEditProfileModalOpen(false)}
+            currFirstName={user.firstName}
+            currLastName={user.lastName}
+            currBiography={user.biography}
+          />}
+        {passwordModalOpen && 
+          <ChangePasswordModal
+            open={passwordModalOpen}
+            onClose={() => setPasswordModalOpen(false)}
+          />}
       </Box>
     </AppMargin>
   );