diff --git a/net/web/src/session/channels/Channels.jsx b/net/web/src/session/channels/Channels.jsx
index cb629ef5..17bb29cc 100644
--- a/net/web/src/session/channels/Channels.jsx
+++ b/net/web/src/session/channels/Channels.jsx
@@ -5,7 +5,7 @@ import { useChannels } from './useChannels.hook';
import { ChannelItem } from './channelItem/ChannelItem';
import { AddChannel } from './addChannel/AddChannel';
-export function Channels({ open }) {
+export function Channels({ open, active }) {
const { state, actions } = useChannels();
@@ -49,7 +49,7 @@ export function Channels({ open }) {
(
-
+
)}
/>
diff --git a/net/web/src/session/channels/channelItem/ChannelItem.jsx b/net/web/src/session/channels/channelItem/ChannelItem.jsx
index e4445505..8fadbcc8 100644
--- a/net/web/src/session/channels/channelItem/ChannelItem.jsx
+++ b/net/web/src/session/channels/channelItem/ChannelItem.jsx
@@ -3,51 +3,60 @@ import { ChannelItemWrapper, Markup } from './ChannelItem.styled';
import { Logo } from 'logo/Logo';
import { AppstoreFilled, SolutionOutlined } from '@ant-design/icons';
-export function ChannelItem({ item, openChannel }) {
+export function ChannelItem({ item, openChannel, active }) {
+
+ const itemClass = () => {
+ if (active.set && active.channel === item.id && active.card === item.cardId) {
+ return "active"
+ }
+ return "idle"
+ };
return (
openChannel(item.id, item.cardId)}>
- { item.contacts.length === 0 && (
-
-
-
+
+ { item.contacts.length === 0 && (
+
+
+
+
+
+
{ item.subject }
+
{ item.message }
+
-
-
{ item.subject }
-
{ item.message }
-
-
- )}
- { item.contacts.length === 1 && (
-
-
-
-
-
-
{ item.subject }
-
{ item.message }
-
- { item.updated && (
-
- )}
-
- )}
- { item.contacts.length > 1 && (
-
-
-
-
{ item.subject }
-
{ item.message }
-
- { item.updated && (
-
+ )}
+ { item.contacts.length === 1 && (
+
+
+
+
+
+
{ item.subject }
+
{ item.message }
+
+ { item.updated && (
-
- )}
-
- )}
+ )}
+
+ )}
+ { item.contacts.length > 1 && (
+
+
+
+
{ item.subject }
+
{ item.message }
+
+ { item.updated && (
+
+
+
+ )}
+
+ )}
+
)
}
diff --git a/net/web/src/session/channels/channelItem/ChannelItem.styled.js b/net/web/src/session/channels/channelItem/ChannelItem.styled.js
index 6fa7a487..46aafa06 100644
--- a/net/web/src/session/channels/channelItem/ChannelItem.styled.js
+++ b/net/web/src/session/channels/channelItem/ChannelItem.styled.js
@@ -7,13 +7,19 @@ export const ChannelItemWrapper = styled.div`
display: flex;
align-items: center;
border-bottom: 1px solid ${Colors.itemDivider};
- padding-left: 16px;
- padding-right: 16px;
line-height: 16px;
+ cursor: pointer;
&:hover {
background-color: ${Colors.formHover};
- cursor: pointer;
+ }
+
+ .active {
+ background-color: ${Colors.profileForm};
+ width: 100%;
+ height: 100%;
+ display: flex;
+ align-item: center;
}
.item {
@@ -21,6 +27,8 @@ export const ChannelItemWrapper = styled.div`
flex-direction: row;
align-items: center;
min-width: 0;
+ padding-left: 16px;
+ padding-right: 16px;
.avatar{
display: flex;