Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import ChannelListModal from "./components/ui/ChannelListModal";
import { EditServerModal } from "./components/ui/EditServerModal";
import LinkSecurityWarningModal from "./components/ui/LinkSecurityWarningModal";
import LoadingOverlay from "./components/ui/LoadingOverlay";
import ProfileModalRouter from "./components/ui/ProfileModalRouter";
import QuickActions from "./components/ui/QuickActions";
import { TicTacToeModal } from "./components/ui/TicTacToeModal";
import { TotpStepUpModal } from "./components/ui/TotpStepUpModal";
import { TwoFactorSettingsModal } from "./components/ui/TwoFactorSettingsModal";
import UserProfileModal from "./components/ui/UserProfileModal";
import UserSettings from "./components/ui/UserSettings";
import { useChannelTabSwitching } from "./hooks/useChannelTabSwitching";
import { useConnectionResilience } from "./hooks/useConnectionResilience";
Expand Down Expand Up @@ -325,7 +325,7 @@ const App: React.FC = () => {
{isChannelListModalOpen && <ChannelListModal />}
<LinkSecurityWarningModal />
{userProfileModalState?.isOpen && (
<UserProfileModal
<ProfileModalRouter
isOpen={userProfileModalState.isOpen}
onClose={() => setUserProfileModalState(null)}
serverId={userProfileModalState.serverId}
Expand Down
4 changes: 2 additions & 2 deletions src/components/layout/ChatArea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import { InputToolbar } from "../ui/InputToolbar";
import InviteUserModal from "../ui/InviteUserModal";
import { MiniMediaPlayer } from "../ui/MiniMediaPlayer";
import ModerationModal, { type ModerationAction } from "../ui/ModerationModal";
import ProfileModalRouter from "../ui/ProfileModalRouter";
import ReactionModal from "../ui/ReactionModal";
import { ReactionPopover } from "../ui/ReactionPopover";
import {
Expand All @@ -66,7 +67,6 @@ import {
UploadProgressOverlay,
} from "../ui/UploadProgressOverlay";
import UserContextMenu from "../ui/UserContextMenu";
import UserProfileModal from "../ui/UserProfileModal";
import {
MemoChannelMessageList as ChannelMessageList,
type ChannelMessageListHandle,
Expand Down Expand Up @@ -2487,7 +2487,7 @@ export const ChatArea: React.FC<{
/>
)}
{selectedServerId && (
<UserProfileModal
<ProfileModalRouter
isOpen={userProfileModalOpen}
onClose={() => setUserProfileModalOpen(false)}
serverId={selectedServerId}
Expand Down
4 changes: 2 additions & 2 deletions src/components/layout/MemberList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import { mediaLevelToSettings } from "../../lib/mediaUtils";
import useStore from "../../store";
import type { User } from "../../types";
import ModerationModal, { type ModerationAction } from "../ui/ModerationModal";
import ProfileModalRouter from "../ui/ProfileModalRouter";
import UserContextMenu from "../ui/UserContextMenu";
import UserProfileModal from "../ui/UserProfileModal";

const StatusIndicator: React.FC<{ status?: string }> = ({ status }) => {
let bgColor = "bg-discord-dark-500"; // Default/offline
Expand Down Expand Up @@ -635,7 +635,7 @@ export const MemberList: React.FC = () => {
/>

{selectedServerId && (
<UserProfileModal
<ProfileModalRouter
isOpen={userProfileModalOpen}
onClose={() => setUserProfileModalOpen(false)}
serverId={selectedServerId}
Expand Down
Loading
Loading