diff --git a/net/web/src/admin/dashboard/accountItem/AccountItem.styled.js b/net/web/src/admin/dashboard/accountItem/AccountItem.styled.js index d7d21ec8..e5545720 100644 --- a/net/web/src/admin/dashboard/accountItem/AccountItem.styled.js +++ b/net/web/src/admin/dashboard/accountItem/AccountItem.styled.js @@ -31,6 +31,7 @@ export const AccountItemWrapper = styled.div` flex-direction: column; flex-grow: 1; color: #cccccc; + min-width: 0; } .active { diff --git a/net/web/src/session/channels/useChannels.hook.js b/net/web/src/session/channels/useChannels.hook.js index ad6157e9..d7e74d05 100644 --- a/net/web/src/session/channels/useChannels.hook.js +++ b/net/web/src/session/channels/useChannels.hook.js @@ -125,7 +125,7 @@ export function useChannels() { subject = names.join(", "); } if (!subject && !chan.contacts?.length) { - subject = "notes"; + subject = "Notes"; } chan.subject = subject; diff --git a/net/web/src/session/conversation/useConversation.hook.js b/net/web/src/session/conversation/useConversation.hook.js index 9e299050..e0671acd 100644 --- a/net/web/src/session/conversation/useConversation.hook.js +++ b/net/web/src/session/conversation/useConversation.hook.js @@ -85,7 +85,7 @@ export function useConversation(cardId, channelId) { if (chan) { if (!chan.contacts?.length) { image = 'solution'; - subject = 'Private'; + subject = 'Notes'; } else if (chan.contacts.length > 1) { image = 'appstore' diff --git a/net/web/src/session/conversation/virtualList/VirtualList.jsx b/net/web/src/session/conversation/virtualList/VirtualList.jsx index 813d696b..46936546 100644 --- a/net/web/src/session/conversation/virtualList/VirtualList.jsx +++ b/net/web/src/session/conversation/virtualList/VirtualList.jsx @@ -90,7 +90,7 @@ export function VirtualList({ id, items, itemRenderer, loadMore }) { }; const latchSlots = () => { - if (containers.current.length > 0 && latched.current) { + if (containers.current.length > 0 && latched.current && state.listHeight > 0) { if (!nolatch.current) { const last = containers.current[containers.current.length - 1]; const bottom = last.top + last.height; @@ -172,6 +172,10 @@ export function VirtualList({ id, items, itemRenderer, loadMore }) { const loadSlots = () => { + if (state.listHeight == 0) { + return; + } + if (containers.current.length === 0) { // add the first slot if (itemView.current.length > 0) { diff --git a/net/web/src/session/conversation/virtualList/useVirtualList.hook.js b/net/web/src/session/conversation/virtualList/useVirtualList.hook.js index 2f11d0b8..33f33884 100644 --- a/net/web/src/session/conversation/virtualList/useVirtualList.hook.js +++ b/net/web/src/session/conversation/virtualList/useVirtualList.hook.js @@ -4,7 +4,7 @@ export function useVirtualList(id) { const [state, setState] = useState({ view: null, - listHeight: 128, + listHeight: 0, slots: [], }); diff --git a/net/web/src/session/details/useDetails.hook.js b/net/web/src/session/details/useDetails.hook.js index dea9fefa..a0222bfe 100644 --- a/net/web/src/session/details/useDetails.hook.js +++ b/net/web/src/session/details/useDetails.hook.js @@ -50,7 +50,7 @@ export function useDetails(cardId, channelId) { if (chan) { if (chan.contacts?.length === 0) { img = 'solution'; - subject = 'Private'; + subject = 'Notes'; } else if (chan.contacts?.length > 1) { img = 'appstore' @@ -58,7 +58,7 @@ export function useDetails(cardId, channelId) { } else { img = 'team'; - subject = 'Direct' + subject = 'Conversation' } const parsed = JSON.parse(chan.data.channelDetail.data); if (parsed.subject) {