diff --git a/src/views/Auth/Bio/FirstBio/FirstBio.js b/src/views/Auth/Bio/FirstBio/FirstBio.js
index d9e8a1e..e7fba54 100644
--- a/src/views/Auth/Bio/FirstBio/FirstBio.js
+++ b/src/views/Auth/Bio/FirstBio/FirstBio.js
@@ -8,7 +8,7 @@ export default class FirstBio extends Component {
     return(
       <>
         <img src={bioFirst} 
-          style={{left : '-5%'}} />
+          style={{left : '-5%'}} alt="" />
         <p>
         لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ و با استفاده از طراحان گرافیک است. چاپگرها و متون بلکه روزنامه و مجله در ستون و سطرآنچنان که لازم است و برای شرایط فعلی تکنولوژی مورد نیاز و کاربردهای متنوع با هدف بهبود ابزارهای کاربردی میباشد. 
         </p>
diff --git a/src/views/Auth/Bio/SecondBio/SecondBio.js b/src/views/Auth/Bio/SecondBio/SecondBio.js
index 855cd46..870fccc 100644
--- a/src/views/Auth/Bio/SecondBio/SecondBio.js
+++ b/src/views/Auth/Bio/SecondBio/SecondBio.js
@@ -7,7 +7,7 @@ export default class SecondBio extends Component {
   render() {
     return(
       <>
-        <img src={bioSecond} style={{left : '-3%'}} />
+        <img src={bioSecond} style={{left : '-3%'}} alt="" />
         <p>
         لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ و با استفاده از طراحان گرافیک است. چاپگرها و متون بلکه روزنامه و مجله در ستون و سطرآنچنان که لازم است و برای شرایط فعلی تکنولوژی مورد نیاز و کاربردهای متنوع با هدف بهبود ابزارهای کاربردی میباشد. 
         </p>
diff --git a/src/views/Auth/Bio/ThirdBio/ThirdBio.js b/src/views/Auth/Bio/ThirdBio/ThirdBio.js
index bb9cfbd..0fe6b0b 100644
--- a/src/views/Auth/Bio/ThirdBio/ThirdBio.js
+++ b/src/views/Auth/Bio/ThirdBio/ThirdBio.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import NavigateNextIcon from '@material-ui/icons/NavigateNext';
+// import NavigateNextIcon from '@material-ui/icons/NavigateNext';
 import NavigateBeforeIcon from '@material-ui/icons/NavigateBefore';
 import bioThird from '../../../../assets/icons/bioThird.png';
 
@@ -7,7 +7,7 @@ export default class SecondBio extends Component {
   render() {
     return(
       <>
-        <img src={bioThird} style={{left : '-2%',top : 10}} />
+        <img src={bioThird} style={{left : '-2%',top : 10}} alt="" />
         <p>
         لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ و با استفاده از طراحان گرافیک است. چاپگرها و متون بلکه روزنامه و مجله در ستون و سطرآنچنان که لازم است و برای شرایط فعلی تکنولوژی مورد نیاز و کاربردهای متنوع با هدف بهبود ابزارهای کاربردی میباشد. 
         </p>
diff --git a/src/views/Auth/Login/Mobile/Mobile.js b/src/views/Auth/Login/Mobile/Mobile.js
index d4d3e38..7639e85 100644
--- a/src/views/Auth/Login/Mobile/Mobile.js
+++ b/src/views/Auth/Login/Mobile/Mobile.js
@@ -8,7 +8,7 @@ export default class Mobile extends Component {
         <div className="login-mobile__top d-flex">
           <div>منتظرت بودیم</div>
           <p>شماره‌تو بده تا کد تأیید رو برات بفرستم. دست دست نکن</p>
-          <img src={phonenumber} />
+          <img src={phonenumber}  alt=""/>
         </div>
         <div className="login-mobile__input d-flex">
           <input type="text" maxLength={9} />
diff --git a/src/views/Auth/Logo/Logo.js b/src/views/Auth/Logo/Logo.js
index bc5b1ba..ad95b11 100644
--- a/src/views/Auth/Logo/Logo.js
+++ b/src/views/Auth/Logo/Logo.js
@@ -14,7 +14,7 @@ export default class Logo extends Component {
   render() {
     return(
       <div className="logo d-flex flex-column">
-        <img src={logo} style={{width : 150, height :150}}/>
+        <img src={logo} style={{width : 150, height :150}} alt=""/>
         <div className="logo__title d-flex">
           <h1 style={{fontFamily : 'IRANSansNumeralBold'}}>ایما</h1>
           <span></span>
diff --git a/src/views/ChatRoom/Body/Body.js b/src/views/ChatRoom/Body/Body.js
index 313e233..9f16058 100644
--- a/src/views/ChatRoom/Body/Body.js
+++ b/src/views/ChatRoom/Body/Body.js
@@ -451,7 +451,7 @@ export default class Body extends Component {
             text: prevState.message,
             type : 'normal',
             voice : null,
-            type : 'normal',
+            
             createdAt:  now.toString(),
             image : null,
             video : null,
@@ -511,14 +511,14 @@ export default class Body extends Component {
           }}
         >
           {
-            this.state.data.messages.map(item => this.state.image === null && this.state.music === null && this.state.video === null ? (
-              <Message key={item.id} file={this.state.image} document={this.state.document} message={item} user1={this.state.data.users[0]} user2={this.state.data.users[1]} />
+            this.state.data.messages.map((item,i) => this.state.image === null && this.state.music === null && this.state.video === null ? (
+              <Message key={i} file={this.state.image} document={this.state.document} message={item} user1={this.state.data.users[0]} user2={this.state.data.users[1]} />
             ) : null)
           }
           {
             this.state.image !== null ?
             <div className="chat-body__content--preview d-flex">
-              <img src={this.state.image} />
+              <img src={this.state.image}  alt=""/>
             </div> : null
           }
           {
diff --git a/src/views/ChatRoom/Body/ChatSuggest/ChatSuggest.js b/src/views/ChatRoom/Body/ChatSuggest/ChatSuggest.js
index 2589b84..271ca99 100644
--- a/src/views/ChatRoom/Body/ChatSuggest/ChatSuggest.js
+++ b/src/views/ChatRoom/Body/ChatSuggest/ChatSuggest.js
@@ -10,8 +10,8 @@ export default class ChatSuggest extends Component {
       <div className="chat-suggest portrait-slider d-flex flex-column">
         <Carousel itemsToShow={1} isRTL={true} enableTilt={true}  showArrows={false}>
           {
-            suggest.map(item => (
-              <Suggest item={item} key={item.id} />
+            suggest.map((item,i) => (
+              <Suggest item={item} key={i} />
             ))
           }
         </Carousel>
diff --git a/src/views/ChatRoom/Body/Message/Message2D/Message2D.js b/src/views/ChatRoom/Body/Message/Message2D/Message2D.js
index 4074b6f..3cecec7 100644
--- a/src/views/ChatRoom/Body/Message/Message2D/Message2D.js
+++ b/src/views/ChatRoom/Body/Message/Message2D/Message2D.js
@@ -34,8 +34,8 @@ export default class Message2D extends Component {
               <div className="message-2d__options--row d-flex">
                 {
                   option.map(
-                    item => (
-                      <div className="d-flex" style={{ width : `calc(100% / ${option.length} )`}} draggable={true}>
+                    (item,i) => (
+                      <div key ={i} className="d-flex" style={{ width : `calc(100% / ${option.length} )`}} draggable={true}>
                         <span>{item.name}</span>
                       </div>
                     )
diff --git a/src/views/ChatRoom/Body/Message/NormalMessage/NormalMessage.js b/src/views/ChatRoom/Body/Message/NormalMessage/NormalMessage.js
index 6c9d18f..eabcc5d 100644
--- a/src/views/ChatRoom/Body/Message/NormalMessage/NormalMessage.js
+++ b/src/views/ChatRoom/Body/Message/NormalMessage/NormalMessage.js
@@ -8,7 +8,7 @@ import './NormalMessage.scss';
 export default class NormalMessage extends Component {
   
   render(){
-    const {message, user1, user2,file,document} = this.props;
+    const {message, user1, user2,document} = this.props;
     return (
       <div 
         className="normal-message d-flex flex-column d-flex"
@@ -67,7 +67,7 @@ export default class NormalMessage extends Component {
           {
             message.image !== null ? 
             <div className="normal-message__box--caption">
-              <a href={message.image} download><img src={message.image} download/></a>
+              <a href={message.image} download><img src={message.image} download alt=""/></a>
               <p id="2" style={{color: message.user.id === user1.id ? "white" : "black" }}>{message.text}</p>
             </div>
              : null
diff --git a/src/views/ChatRoom/Body/Message/RadioMessage/RadioMessage.js b/src/views/ChatRoom/Body/Message/RadioMessage/RadioMessage.js
index d7c1f01..8bf214a 100644
--- a/src/views/ChatRoom/Body/Message/RadioMessage/RadioMessage.js
+++ b/src/views/ChatRoom/Body/Message/RadioMessage/RadioMessage.js
@@ -42,8 +42,8 @@ export default class RadioMessage extends Component {
         </div>
         <div className="message-2d__options d-flex flex-wrap justify-content-center">
           {
-            message.options.map(item => (
-              <div key={item.id} onClick={() => this.handleRadioChange(item.name)} className="message-2d__options--radio" style={{backgroundColor : item.name === this.state.value ? '#0000cc' : 'rgba(153, 153, 153, 0.87)',color : item.name === this.state.value ? 'white' : 'black'}}>
+            message.options.map((item,i) => (
+              <div key={i} onClick={() => this.handleRadioChange(item.name)} className="message-2d__options--radio" style={{backgroundColor : item.name === this.state.value ? '#0000cc' : 'rgba(153, 153, 153, 0.87)',color : item.name === this.state.value ? 'white' : 'black'}}>
                 {item.name}
               </div>
             ))
diff --git a/src/views/ChatRoom/ChatInfo/ChatInfo.js b/src/views/ChatRoom/ChatInfo/ChatInfo.js
index 840c99a..b30d3e2 100644
--- a/src/views/ChatRoom/ChatInfo/ChatInfo.js
+++ b/src/views/ChatRoom/ChatInfo/ChatInfo.js
@@ -37,7 +37,7 @@ export default class ChatInfo extends Component {
     return (
       <div className="chat-info d-flex flex-column">
         <div className="chat-info__image d-flex">
-          <img src={user.profileImages[0].src} onClick={() => this.setGallery('profile')} />
+          <img src={user.profileImages[0].src} onClick={() => this.setGallery('profile')} alt="" />
           <div className="chat-info__image--float d-flex">
             <ChatIcon style={{color : "white", width : 46, height : 46}} />
           </div>
diff --git a/src/views/ChatRoom/ChatInfo/Gallery/Gallery.js b/src/views/ChatRoom/ChatInfo/Gallery/Gallery.js
index d97e1cc..f699f39 100644
--- a/src/views/ChatRoom/ChatInfo/Gallery/Gallery.js
+++ b/src/views/ChatRoom/ChatInfo/Gallery/Gallery.js
@@ -1,13 +1,13 @@
-import React, { Component, useState } from 'react';
+import React from 'react';
 import Carousel from 'react-elastic-carousel';
 import CloseIcon from '@material-ui/icons/Close';
 
 import './Gallery.scss';
 
 export default function Gallery(props) {
-  const [state,setState] = useState({
+  // const [state,setState] = useState({
 
-  });
+  // });
   return (
     <div className="gallery-modal d-flex justify-content align-items-center">
       <div onClick={() => props.onClick(null)}>
@@ -16,8 +16,8 @@ export default function Gallery(props) {
       </div>
       <Carousel itemsToShow={1} isRTL={true} enableTilt={false} showArrows={true}>
           {
-            props.data.map(item => (
-              <Image item={item} key={item.id} />
+            props.data.map((item,i) => (
+              <Image item={item} key={i} />
             ))
           }
         </Carousel>
@@ -27,6 +27,6 @@ export default function Gallery(props) {
 
 const Image = (props) => {
   return (
-    <img style={{maxHeight : '50%', maxWidth : '100vw'}} src={props.item.src} />
+    <img style={{maxHeight : '50%', maxWidth : '100vw'}} src={props.item.src} alt=""/>
   );
 }
\ No newline at end of file
diff --git a/src/views/Home/Body/ChatList/ChatList.js b/src/views/Home/Body/ChatList/ChatList.js
index 3d026c4..9f2fcee 100644
--- a/src/views/Home/Body/ChatList/ChatList.js
+++ b/src/views/Home/Body/ChatList/ChatList.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import Chat from './Chat/Chat';
 
-import photo from '../../../../assets/images/reza.png';
+
 import pencil from '../../../../assets/icons/pencil.svg';
 import logo from '../../../../assets/icons/logo.svg';
 import './ChatList.scss';
@@ -31,8 +31,8 @@ export default class ChatList extends Component {
     return (
       <div className="chat-list d-flex flex-column">
         {
-          this.state.chats.map(item => (
-            <Chat key={item.id} data={item}  />
+          this.state.chats.map((item,i) => (
+            <Chat key={i} data={item}  />
           ))
         }
         <div className="chat-list__float d-flex" style={{filter:"grayscale(2)"}}>
diff --git a/src/views/Home/Body/Location/Location.js b/src/views/Home/Body/Location/Location.js
index c8cea29..487b14b 100644
--- a/src/views/Home/Body/Location/Location.js
+++ b/src/views/Home/Body/Location/Location.js
@@ -1,22 +1,22 @@
 import React, { Component } from 'react';
-import { MapContainer, TileLayer, Marker, Popup, Tooltip,Circle } from "react-leaflet";
+import { MapContainer, TileLayer, Marker, Tooltip,Circle } from "react-leaflet";
 import L from 'leaflet';
 import NavigationIcon from '@material-ui/icons/Navigation';
 import DirectionsWalkIcon from '@material-ui/icons/DirectionsWalk';
 import MyLocationIcon from '@material-ui/icons/MyLocation';
 
 import blueM from '../../../../assets/icons/marker-blue.png';
-import greenM from '../../../../assets/icons/marker-green.png';
+// import greenM from '../../../../assets/icons/marker-green.png';
 
 import './Location.scss';
-const items = [{lat :35.73366050852552, lng : 51.414611756817976}];
-const selected = {};
-const green = new L.Icon({
-  iconUrl: greenM,
-  iconRetinaUrl: greenM,
-  popupAnchor:  [-0, -0],
-  iconSize: [25,38],     
-});
+// const items = [{lat :35.73366050852552, lng : 51.414611756817976}];
+// const selected = {};
+// const green = new L.Icon({
+//   iconUrl: greenM,
+//   iconRetinaUrl: greenM,
+//   popupAnchor:  [-0, -0],
+//   iconSize: [25,38],     
+// });
 const blue = new L.Icon({
   iconUrl: blueM,
   iconRetinaUrl: blueM,
diff --git a/src/views/Home/Header/Header.js b/src/views/Home/Header/Header.js
index 81d4388..58b774c 100644
--- a/src/views/Home/Header/Header.js
+++ b/src/views/Home/Header/Header.js
@@ -1,4 +1,4 @@
-import React, { Component,useEffect,useState,useRef } from 'react';
+import React, { useEffect,useState,useRef } from 'react';
 import MenuIcon from '@material-ui/icons/Menu';
 import SearchIcon from '@material-ui/icons/Search';
 import ArrowRightAltIcon from '@material-ui/icons/ArrowRightAlt';
@@ -66,7 +66,7 @@ export default function Header(props) {
       {
         state['searchFlag'] === true ? 
         <div className="header__search d-flex">
-          <div onClick={() => setState({ ...state, ['searchFlag']: !state['searchFlag']})}>
+          <div onClick={() => setState({ ...state, searchFlag: !state.searchFlag})}>
             <ArrowRightAltIcon style={{color : "rgb(111,108,255)" , width : 38, height : 38}} />
           </div>
           <input 
@@ -79,7 +79,7 @@ export default function Header(props) {
           </div>
         </div> : 
         <>
-          <div onClick={() => setState({ ...state, ['searchFlag']: !state['searchFlag']})}>
+          <div onClick={() => setState({ ...state, searchFlag: !state.searchFlag})}>
             <SearchIcon style={{color : "white" , width : 38, height : 38}} />
           </div>
           <div className="chat-header__title d-flex">
diff --git a/src/views/Home/Header/NavbarDrawer/NavbarDrawer.js b/src/views/Home/Header/NavbarDrawer/NavbarDrawer.js
index 8e15f36..ac91828 100644
--- a/src/views/Home/Header/NavbarDrawer/NavbarDrawer.js
+++ b/src/views/Home/Header/NavbarDrawer/NavbarDrawer.js
@@ -73,8 +73,8 @@ class NavbarDrawer extends Component {
         </div>
         <div className="navbar-drawer__bottom mt-1">
           {
-            this.state.links.map(item => (
-              <Link to={item.link} key={item.name} onClick={item.onClick || (() => item.link === "" ? toast.error(item.toast) : null)}>
+            this.state.links.map((item,key) => (
+              <Link to={item.link} key={key} onClick={item.onClick || (() => item.link === "" ? toast.error(item.toast) : null)}>
                 <div className="navbar-drawer__bottom--link d-flex">
                   {item.icon}
                   <div>{item.name}</div>