Merge branch 'feature/profile' of github.com:FileFighter/WebApp into feature/profile

Author: Gimleux

src/assets/images/icons/material.io/edit_white_24dp.svg

@@ -21,4 +21,4 @@ export const constants = process.env.NODE_ENV === "development" ? dev : prod;
 
 export const MIN_PASSWORD_LENGTH = 8;
 export const MAX_PASSWORD_LENGTH = 20;
-export const DEFAULT_ALERT_DURATION = 3500;
+export const DEFAULT_ALERT_DURATION = 3500;

src/background/constants.ts

@@ -6,6 +6,7 @@ import {RootState} from "../../../background/redux/store";
 import {DEFAULT_ALERT_DURATION, MIN_PASSWORD_LENGTH} from "../../../background/constants";
 import {changeUserInformation, UserInformation} from "../../../background/api/userInformation";
 import {notMinStrLength} from "../../../background/methods/checkInput";
+import edit_svg from "../../../assets/images/icons/material.io/edit_white_24dp.svg";
 
 
 export default function Profile(): ReactElement {
@@ -136,6 +137,7 @@ export default function Profile(): ReactElement {
                     <Button
                         onClick={changeEditMode}
                     >
+                        {!isEditing &&  <img src={edit_svg} alt={"edit icon"} className="pr-2" />}
                         {isEditing ? "Cancel" : "Edit"}
                     </Button>
                 </Row>