From 8ac7403522ca588520f8a06fb5f291a7e2ac05fd Mon Sep 17 00:00:00 2001
From: RigidStudios <neim448@gmail.com>
Date: Thu, 23 Sep 2021 23:08:28 +0400
Subject: [PATCH 1/3] Prettier, Fix no role refresh

---
 src/pages/settings/server/Roles.tsx | 44 +++++++++++++++++------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/pages/settings/server/Roles.tsx b/src/pages/settings/server/Roles.tsx
index a66c4041..4a8523d9 100644
--- a/src/pages/settings/server/Roles.tsx
+++ b/src/pages/settings/server/Roles.tsx
@@ -6,9 +6,16 @@ import { Server } from "revolt.js/dist/maps/Servers";
 
 import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";
-import {useCallback, useContext, useEffect, useMemo, useState} from "preact/hooks";
+import {
+    useCallback,
+    useContext,
+    useEffect,
+    useMemo,
+    useState,
+} from "preact/hooks";
 
 import { useIntermediate } from "../../../context/intermediate/Intermediate";
+import { AppContext } from "../../../context/revoltjs/RevoltClient";
 
 import Button from "../../../components/ui/Button";
 import Checkbox from "../../../components/ui/Checkbox";
@@ -17,7 +24,6 @@ import InputBox from "../../../components/ui/InputBox";
 import Overline from "../../../components/ui/Overline";
 
 import ButtonItem from "../../../components/navigation/items/ButtonItem";
-import {AppContext} from "../../../context/revoltjs/RevoltClient";
 
 interface Props {
     server: Server;
@@ -30,7 +36,7 @@ export const Roles = observer(({ server }: Props) => {
     const client = useContext(AppContext);
     const [role, setRole] = useState("default");
     const { openScreen } = useIntermediate();
-    const roles = useMemo(() => server.roles ?? {}, [server]);
+    const roles = server.roles || {};
 
     if (role !== "default" && typeof roles[role] === "undefined") {
         useEffect(() => setRole("default"), [role]);
@@ -123,26 +129,25 @@ export const Roles = observer(({ server }: Props) => {
                         }
                     />
                 </div>
-                {["default", ...Object.keys(roles)].map((id) => {
-                    if (id === "default") {
-                        return (
-                            <ButtonItem
-                                active={role === "default"}
-                                onClick={() => setRole("default")}>
-                                <Text id="app.settings.permissions.default_role" />
-                            </ButtonItem>
-                        );
-                    }
-                    return (
+                {["default", ...Object.keys(roles)].map((id) =>
+                    id === "default" ? (
+                        <ButtonItem
+                            active={role === "default"}
+                            onClick={() => setRole("default")}>
+                            <Text id="app.settings.permissions.default_role" />
+                        </ButtonItem>
+                    ) : (
                         <ButtonItem
                             key={id}
                             active={role === id}
                             onClick={() => setRole(id)}
-                            style={{ color: roles[id].colour }}>
+                            style={{
+                                color: roles[id].colour,
+                            }}>
                             {roles[id].name}
                         </ButtonItem>
-                    );
-                })}
+                    ),
+                )}
             </div>
             <div className={styles.permissions}>
                 <div className={styles.title}>
@@ -238,7 +243,10 @@ export const Roles = observer(({ server }: Props) => {
                                 onChange={() =>
                                     setPerm([perm[0], perm[1] ^ value])
                                 }
-                                disabled={key === "View" || (!(clientPermissions & value))}
+                                disabled={
+                                    key === "View" ||
+                                    !(clientPermissions & value)
+                                }
                                 description={
                                     <Text id={`permissions.channel.${key}.d`} />
                                 }>

From 7af2bce00e1ae02315068b44354c5f163df1d636 Mon Sep 17 00:00:00 2001
From: RigidStudios <neim448@gmail.com>
Date: Thu, 23 Sep 2021 23:11:33 +0400
Subject: [PATCH 2/3] Revert "don't change onboarding on this pr"

This reverts commit 416cc0a991b68d19449f31b0ea8ecd39ac110e13.
---
 src/context/intermediate/modals/Onboarding.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/context/intermediate/modals/Onboarding.tsx b/src/context/intermediate/modals/Onboarding.tsx
index 0f6fd490..bc53b746 100644
--- a/src/context/intermediate/modals/Onboarding.tsx
+++ b/src/context/intermediate/modals/Onboarding.tsx
@@ -40,6 +40,7 @@ export function OnboardingModal({ onClose, callback }: Props) {
             <div className={styles.header}>
                 <h1>
                     <Text id="app.special.modals.onboarding.welcome" />
+                    <br />
                     <img src={wideSVG} loading="eager" />
                 </h1>
             </div>

From d1b686945ab7a7968cec74a01ca099edad0a0b61 Mon Sep 17 00:00:00 2001
From: RigidStudios <neim448@gmail.com>
Date: Thu, 23 Sep 2021 23:11:38 +0400
Subject: [PATCH 3/3] Revert "ConversationStart changed for notes/normal
 channel"

This reverts commit 74297085d74c4b91ca001c6bc7a4af78182b8ea7.
---
 src/pages/channels/messaging/ConversationStart.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/pages/channels/messaging/ConversationStart.tsx b/src/pages/channels/messaging/ConversationStart.tsx
index 6b889fdb..1c829dd9 100644
--- a/src/pages/channels/messaging/ConversationStart.tsx
+++ b/src/pages/channels/messaging/ConversationStart.tsx
@@ -30,13 +30,7 @@ export default observer(({ channel }: Props) => {
         <StartBase>
             <h1>{getChannelName(channel, true)}</h1>
             <h4>
-                <Text
-                    id={
-                        channel.channel_type === "SavedMessages"
-                            ? "app.main.channel.start.saved"
-                            : "app.main.channel.start.group"
-                    }
-                />
+                <Text id="app.main.channel.start.group" />
             </h4>
         </StartBase>
     );