From 8a16724892f422faa90b894f5ffddd6a7b2ae690 Mon Sep 17 00:00:00 2001
From: Paul <paulmakles@gmail.com>
Date: Sat, 26 Jun 2021 10:34:48 +0100
Subject: [PATCH] Fix: "Modify Account" did not have access to client

---
 external/lang                                                  | 2 +-
 src/context/intermediate/Intermediate.tsx                      | 2 +-
 src/context/intermediate/Modals.tsx                            | 3 ---
 src/context/intermediate/Popovers.tsx                          | 3 +++
 .../intermediate/{modals => popovers}/ModifyAccount.tsx        | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename src/context/intermediate/{modals => popovers}/ModifyAccount.tsx (100%)

diff --git a/external/lang b/external/lang
index 9cc46c3a..47182fb7 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 e96a72a3..ff723c0b 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 b6035595..e825bcbc 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 f91b02dc..73d2337e 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