diff --git a/web/chat/chat-thread-list-see-more-sidebars.react.js b/web/chat/chat-thread-list-see-more-sidebars.react.js --- a/web/chat/chat-thread-list-see-more-sidebars.react.js +++ b/web/chat/chat-thread-list-see-more-sidebars.react.js @@ -5,8 +5,8 @@ import type { ThreadInfo } from 'lib/types/thread-types'; -import SidebarListModal from '../modals/chat/sidebar-list-modal.react'; import { useModalContext } from '../modals/modal-provider.react'; +import SidebarsModal from '../modals/threads/sidebars/sidebars-modal.react'; import css from './chat-thread-list.css'; type Props = { @@ -15,11 +15,18 @@ }; function ChatThreadListSeeMoreSidebars(props: Props): React.Node { const { unread, threadInfo } = props; - const { pushModal } = useModalContext(); + const { pushModal, popModal } = useModalContext(); const onClick = React.useCallback( - () => pushModal(), - [pushModal, threadInfo], + () => + pushModal( + , + ), + [popModal, pushModal, threadInfo.id], ); return (
diff --git a/web/chat/thread-menu.react.js b/web/chat/thread-menu.react.js --- a/web/chat/thread-menu.react.js +++ b/web/chat/thread-menu.react.js @@ -25,13 +25,13 @@ import MenuItem from '../components/menu-item.react'; import Menu from '../components/menu.react'; -import SidebarListModal from '../modals/chat/sidebar-list-modal.react'; import SidebarPromoteModal from '../modals/chat/sidebar-promote-modal.react'; import { useModalContext } from '../modals/modal-provider.react'; import ConfirmLeaveThreadModal from '../modals/threads/confirm-leave-thread-modal.react'; import ThreadMembersModal from '../modals/threads/members/members-modal.react'; import ThreadNotificationsModal from '../modals/threads/notifications/notifications-modal.react'; import ThreadSettingsModal from '../modals/threads/settings/thread-settings-modal.react'; +import SidebarsModal from '../modals/threads/sidebars/sidebars-modal.react'; import SubchannelsModal from '../modals/threads/subchannels/subchannels-modal.react'; import { useSelector } from '../redux/redux-utils'; import SWMansionIcon from '../SWMansionIcon.react'; @@ -94,8 +94,9 @@ }, [childThreads]); const onClickSidebars = React.useCallback( - () => pushModal(), - [pushModal, threadInfo], + () => + pushModal(), + [popModal, pushModal, threadInfo.id], ); const sidebarItem = React.useMemo(() => {