Merge branch 'master' into chore/component-migration

external/lang

@@ -1 +1 @@
-Subproject commit e010e46ee9f226373a253c351b50ccdeea1c8b50
+Subproject commit 1394a127994951e19603be77ce2233c8133e3a81

src/context/revoltjs/RevoltClient.tsx

@@ -9,6 +9,7 @@ import { Preloader } from "@revoltchat/ui";
 
 import { useApplicationState } from "../../mobx/State";
 
+import Preloader from "../../components/ui/Preloader";
 import { Children } from "../../types/Preact";
 import { useIntermediate } from "../intermediate/Intermediate";
 import { registerEvents } from "./events";
@@ -80,6 +81,7 @@ export default observer(({ children }: Props) => {
     }, [state.auth.getSession()]);
 
     useEffect(() => registerEvents(state, setStatus, client), [client]);
+    useEffect(() => state.registerListeners(client), [client]);
 
     if (!loaded || status === ClientStatus.LOADING) {
         return <Preloader type="spinner" />;

src/context/revoltjs/SyncManager.tsx

@@ -22,9 +22,6 @@ export default function SyncManager() {
         }
     }, [client]);
 
-    // Keep data synced.
-    useEffect(() => state.registerListeners(client), [client]);
-
     // Take data updates from Revolt.
     useEffect(() => {
         if (!client) return;

src/context/revoltjs/util.tsx

@@ -7,12 +7,12 @@ import { Children } from "../../types/Preact";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function takeError(error: any): string {
     if (error.response) {
-        const status = error.response.status;
+        const type = error.response.data?.type;
-        if (error.response.type) {
+        if (type) {
-            return error.response.type;
+            return type;
         }
 
-        switch (status) {
+        switch (error.response.status) {
             case 429:
                 return "TooManyRequests";
             case 401:

src/pages/settings/panes/Account.tsx

@@ -174,13 +174,9 @@ export const Account = observer(() => {
             </h3>
             <h5>
                 {/*<Text id="app.settings.pages.account.2fa.description" />*/}
-                Two-factor authentication is currently work-in-progress, see{" "}
+                Two-factor authentication is currently in-development, see{" "}
-                {` `}
+                <a href="https://github.com/revoltchat/revite/issues/675">
-                <a
+                    tracking issue here
-                    href="https://github.com/insertish/rauth/milestone/1"
-                    target="_blank"
-                    rel="noreferrer">
-                    v1 milestone here
                 </a>
                 .
             </h5>
@@ -208,23 +204,26 @@ export const Account = observer(() => {
             <CategoryButton
                 icon={<Block size={24} color="var(--error)" />}
                 description={
-                    "Disable your account. You won't be able to access it unless you log back in."
+                    "Disable your account. You won't be able to access it unless you contact support."
                 }
-                disabled
+                action="chevron"
-                action={<Text id="general.unavailable" />}>
+                onClick={() => {
+                    //
+                }}>
                 <Text id="app.settings.pages.account.manage.disable" />
             </CategoryButton>
-            <a href="mailto:contact@revolt.chat?subject=Delete%20my%20account">
+            <CategoryButton
-                <CategoryButton
+                icon={<Trash size={24} color="var(--error)" />}
-                    icon={<Trash size={24} color="var(--error)" />}
+                description={
-                    description={
+                    "Your account will be queued for deletion, a confirmation email will be sent."
-                        "Delete your account, including all of your data. (sends an email to contact@revolt.chat)"
+                }
-                    }
+                hover
-                    action="external">
+                action="chevron"
-                    <Text id="app.settings.pages.account.manage.delete" />
+                onClick={() => {
-                </CategoryButton>
+                    //
-            </a>
+                }}>
-            <LineDivider />
+                <Text id="app.settings.pages.account.manage.delete" />
+            </CategoryButton>
             <Tip>
                 <span>
                     <Text id="app.settings.tips.account.a" />