diff --git a/src/components/friends/FriendsView.scss b/src/components/friends/FriendsView.scss
index 2396400..724d728 100644
--- a/src/components/friends/FriendsView.scss
+++ b/src/components/friends/FriendsView.scss
@@ -128,20 +128,39 @@
&.friend-bar-item-active {
margin-bottom:21px;
}
+
+ &.friend-bar-search-item-active {
+ margin-bottom:10.5em;
+ background-color: #b69b83;
+ border: 2px solid #e2c1a3;
+ }
.friend-bar-item-head {
&.avatar {
- top: -30px;
- left: -30px;
+ top: -31px;
+ left: -25px;
}
&.group {
- top: -5px;
- left: -5px;
+ top: -31px;
+ left: -25px;
}
pointer-events: none;
}
+ .friend-bar-text {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ // white-space: nowrap;
+ font-size: 13px;
+ line-height: 1;
+ color: #fff;
+ }
+
+ .font-size-friend {
+ font-size: 12px;
+ }
+
.avatar-image {
max-height: 80px;
}
diff --git a/src/components/friends/views/friends-bar/FriendBarItemView.tsx b/src/components/friends/views/friends-bar/FriendBarItemView.tsx
index fe8624f..de4baa8 100644
--- a/src/components/friends/views/friends-bar/FriendBarItemView.tsx
+++ b/src/components/friends/views/friends-bar/FriendBarItemView.tsx
@@ -1,7 +1,7 @@
-import { MouseEventType } from '@nitrots/nitro-renderer';
+import { FindNewFriendsMessageComposer, MouseEventType } from '@nitrots/nitro-renderer';
import { FC, useEffect, useRef, useState } from 'react';
-import { GetUserProfile, LocalizeText, MessengerFriend, OpenMessengerChat } from '../../../../api';
-import { Base, LayoutAvatarImageView, LayoutBadgeImageView } from '../../../../common';
+import { GetUserProfile, LocalizeText, MessengerFriend, OpenMessengerChat, SendMessageComposer } from '../../../../api';
+import { Base, Button, LayoutAvatarImageView, LayoutBadgeImageView } from '../../../../common';
import { useFriends } from '../../../../hooks';
export const FriendBarItemView: FC<{ friend: MessengerFriend }> = props =>
@@ -32,10 +32,16 @@ export const FriendBarItemView: FC<{ friend: MessengerFriend }> = props =>
if(!friend)
{
- return (
-
+ return (
+
setVisible(prevValue => !prevValue) }>
-
{ LocalizeText('friend.bar.find.title') }
+
{ LocalizeText('friend.bar.find.title') }
+ { isVisible &&
+
+
{ LocalizeText('friend.bar.find.text') }
+
+
+ }
);
}
@@ -44,8 +50,11 @@ export const FriendBarItemView: FC<{ friend: MessengerFriend }> = props =>
setVisible(prevValue => !prevValue) }>
0 ? 'avatar': 'group' }` }>
{ (friend.id > 0) && }
- { (friend.id <= 0) && }
+ 0 ? friend.figure : (friend.id <= 0 && friend.figure === 'ADM') ? 'ha-3409-1413-70.lg-285-89.ch-3032-1334-109.sh-3016-110.hd-185-1359.ca-3225-110-62.wa-3264-62-62.fa-1206-90.hr-3322-1403' : friend.figure
+ } isgroup={friend.id <= 0 ? 1 : 0} direction={friend.id > 0 ? 2 : 3} />
+
{ friend.name }
{ isVisible &&
diff --git a/src/components/friends/views/friends-list/FriendsListView.tsx b/src/components/friends/views/friends-list/FriendsListView.tsx
index 9561d0f..ee05b77 100644
--- a/src/components/friends/views/friends-list/FriendsListView.tsx
+++ b/src/components/friends/views/friends-list/FriendsListView.tsx
@@ -3,11 +3,11 @@ import { FC, useCallback, useEffect, useMemo, useState } from 'react';
import { LocalizeText, MessengerFriend, SendMessageComposer } from '../../../../api';
import { Button, Flex, NitroCardAccordionSetView, NitroCardAccordionView, NitroCardContentView, NitroCardHeaderView, NitroCardView } from '../../../../common';
import { useFriends } from '../../../../hooks';
+import { FriendsListGroupView } from './friends-list-group/FriendsListGroupView';
+import { FriendsListRequestView } from './friends-list-request/FriendsListRequestView';
import { FriendsRemoveConfirmationView } from './FriendsListRemoveConfirmationView';
import { FriendsRoomInviteView } from './FriendsListRoomInviteView';
import { FriendsSearchView } from './FriendsListSearchView';
-import { FriendsListGroupView } from './friends-list-group/FriendsListGroupView';
-import { FriendsListRequestView } from './friends-list-request/FriendsListRequestView';
export const FriendsListView: FC<{}> = props =>
{
diff --git a/src/components/friends/views/messenger/FriendsMessengerView.tsx b/src/components/friends/views/messenger/FriendsMessengerView.tsx
index 932e71d..db8b0dd 100644
--- a/src/components/friends/views/messenger/FriendsMessengerView.tsx
+++ b/src/components/friends/views/messenger/FriendsMessengerView.tsx
@@ -114,18 +114,16 @@ export const FriendsMessengerView: FC<{}> = props =>
{ LocalizeText('toolbar.icon.label.messenger') }
- { visibleThreads && (visibleThreads.length > 0) && visibleThreads.map(thread =>
- {
+ { visibleThreads && (visibleThreads.length > 0) && visibleThreads.map(thread => {
return (
setActiveThreadId(thread.threadId) }>
{ thread.unread &&
}
-
- { (thread.participant.id > 0) &&
- }
- { (thread.participant.id <= 0) &&
- }
+
+ 0 ? thread.participant.figure : thread.participant.id <= 0 && thread.participant.figure === 'ADM' ? 'ha-3409-1413-70.lg-285-89.ch-3032-1334-109.sh-3016-110.hd-185-1359.ca-3225-110-62.wa-3264-62-62.fa-1206-90.hr-3322-1403' : thread.participant.figure
+ } headOnly={true} direction={thread.participant.id > 0 ? 2 : 3} scale={0.9} />
{ thread.participant.name }