diff --git a/external/lang b/external/lang index 9cc46c3a4abab74e17e56597db10e2c16ac0f9b5..47182fb7112f82efa61ffe2856f25ca19c78b8c5 160000 --- a/external/lang +++ b/external/lang @@ -1 +1 @@ -Subproject commit 9cc46c3a4abab74e17e56597db10e2c16ac0f9b5 +Subproject commit 47182fb7112f82efa61ffe2856f25ca19c78b8c5 diff --git a/src/context/intermediate/Intermediate.tsx b/src/context/intermediate/Intermediate.tsx index e96a72a3b8671c35e41d459b0418592fdd747aac..ff723c0b9fc1f2f94f6ea3d3106fc1e2f92a732e 100644 --- a/src/context/intermediate/Intermediate.tsx +++ b/src/context/intermediate/Intermediate.tsx @@ -15,7 +15,6 @@ export type Screen = | { id: "signed_out" } | { id: "error"; error: string } | { id: "clipboard"; text: string } -| { id: "modify_account"; field: "username" | "email" | "password" } | { id: "_prompt"; question: Children; content?: Children; actions: Action[] } | ({ id: "special_prompt" } & ( { type: "leave_group", target: Channels.GroupChannel } | @@ -49,6 +48,7 @@ export type Screen = // Pop-overs | { id: "image_viewer"; attachment?: Attachment; embed?: EmbedImage; } +| { id: "modify_account"; field: "username" | "email" | "password" } | { id: "profile"; user_id: string } | { id: "channel_info"; channel_id: string } | { diff --git a/src/context/intermediate/Modals.tsx b/src/context/intermediate/Modals.tsx index b6035595c6a8380217e7d773a03bf52884e7a0f9..e825bcbc998cfbf4770450546efe02f2f38fd14d 100644 --- a/src/context/intermediate/Modals.tsx +++ b/src/context/intermediate/Modals.tsx @@ -6,7 +6,6 @@ import { PromptModal } from "./modals/Prompt"; import { SignedOutModal } from "./modals/SignedOut"; import { ClipboardModal } from "./modals/Clipboard"; import { OnboardingModal } from "./modals/Onboarding"; -import { ModifyAccountModal } from "./modals/ModifyAccount"; export interface Props { screen: Screen; @@ -27,8 +26,6 @@ export default function Modals({ screen, openScreen }: Props) { return <SignedOutModal onClose={onClose} {...screen} />; case "clipboard": return <ClipboardModal onClose={onClose} {...screen} />; - case "modify_account": - return <ModifyAccountModal onClose={onClose} {...screen} />; case "onboarding": return <OnboardingModal onClose={onClose} {...screen} />; } diff --git a/src/context/intermediate/Popovers.tsx b/src/context/intermediate/Popovers.tsx index f91b02dcee6a073c1bc58cf9c66983a050b11735..73d2337ebcff0948a47c642c721374060d958074 100644 --- a/src/context/intermediate/Popovers.tsx +++ b/src/context/intermediate/Popovers.tsx @@ -7,6 +7,7 @@ import { SpecialPromptModal } from "./modals/Prompt"; import { UserProfile } from "./popovers/UserProfile"; import { ImageViewer } from "./popovers/ImageViewer"; import { ChannelInfo } from "./popovers/ChannelInfo"; +import { ModifyAccountModal } from "./popovers/ModifyAccount"; export default function Popovers() { const { screen } = useContext(IntermediateContext); @@ -23,6 +24,8 @@ export default function Popovers() { return <ImageViewer {...screen} onClose={onClose} />; case "channel_info": return <ChannelInfo {...screen} onClose={onClose} />; + case "modify_account": + return <ModifyAccountModal onClose={onClose} {...screen} />; case "special_prompt": return <SpecialPromptModal onClose={onClose} {...screen} />; case "special_input": diff --git a/src/context/intermediate/modals/ModifyAccount.tsx b/src/context/intermediate/popovers/ModifyAccount.tsx similarity index 100% rename from src/context/intermediate/modals/ModifyAccount.tsx rename to src/context/intermediate/popovers/ModifyAccount.tsx