Merge branch 'main' into dev

vloddot · Dec 16, 2023 · b069ccd · b069ccd
2 parents 196e563 + 7c56a88
commit b069ccd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/components/TextChannel/index.tsx b/src/components/TextChannel/index.tsx
@@ -173,7 +173,7 @@ function TextChannelMeta(props: MetaProps) {
 					return;
 				}
 
-				if (membersList.state != 'ready') {
+				if (membersList() == undefined) {
 					return;
 				}
 

diff --git a/src/lib/context/collections/ServerMembersList.tsx b/src/lib/context/collections/ServerMembersList.tsx
@@ -1,5 +1,5 @@
-import { createContext, createResource, type Resource } from 'solid-js';
+import { createContext, createResource, type Accessor } from 'solid-js';
 
-export const ServerMembersListContext = createContext<Resource<AllMemberResponseMap | undefined>>(
+export const ServerMembersListContext = createContext<Accessor<AllMemberResponseMap | undefined>>(
 	createResource(() => undefined)[0]
 );
diff --git a/src/pages/(app)/servers/:sid/layout.tsx b/src/pages/(app)/servers/:sid/layout.tsx
@@ -39,7 +39,7 @@ export default function ServerWrapper() {
 					<Show when={server()} fallback={<p>Unresolved server</p>}>
 						{(server) => {
 							return (
-								<SelectedServerContext.Provider value={() => server()}>
+								<SelectedServerContext.Provider value={server}>
 									<ServerMembersListContext.Provider value={members}>
 										<ChannelBar />
 										<main class="main-content-container">