|
@@ -97,7 +97,7 @@ const ChatBar = ({chatDivRef,selectedArr,setSelectedArr,isSomeSelected,setIsSome
|
|
|
const dispatch = useDispatch()
|
|
const dispatch = useDispatch()
|
|
|
const messagesMemo = useSelector(getMessagesMemo)
|
|
const messagesMemo = useSelector(getMessagesMemo)
|
|
|
const { number:userNumber,nightMode,silentMode} = useSelector(getAuthorizationState)
|
|
const { number:userNumber,nightMode,silentMode} = useSelector(getAuthorizationState)
|
|
|
- const { companionId,total,seen,mute,seenCompanion } = useSelector(getChat)
|
|
|
|
|
|
|
+ const { companionId,total,seen,mute,seenCompanion,number:chatNumber } = useSelector(getChat)
|
|
|
const scrollChat = useSelector(getScrollChat)
|
|
const scrollChat = useSelector(getScrollChat)
|
|
|
const [isArrow, setIsArrow] = useState<boolean>(false)
|
|
const [isArrow, setIsArrow] = useState<boolean>(false)
|
|
|
const [isNew, setIsNew] = useState<{ new: number, mute: boolean }>({ new: 0, mute: false })
|
|
const [isNew, setIsNew] = useState<{ new: number, mute: boolean }>({ new: 0, mute: false })
|
|
@@ -224,7 +224,7 @@ const ChatBar = ({chatDivRef,selectedArr,setSelectedArr,isSomeSelected,setIsSome
|
|
|
let isTime
|
|
let isTime
|
|
|
let isTongue = false
|
|
let isTongue = false
|
|
|
const nextTongue = renderArr[i + 1]
|
|
const nextTongue = renderArr[i + 1]
|
|
|
- if (!unread && seen - (i + 1) < 0) {
|
|
|
|
|
|
|
+ if (!unread && chatNumber === number&& seen - (i + 1) < 0) {
|
|
|
isUnread = true
|
|
isUnread = true
|
|
|
unread = true
|
|
unread = true
|
|
|
}
|
|
}
|
