Fix Create Guild

theADAMJR · Aug 9, 2021 · 977faa0 · 977faa0
1 parent bc15c5a
commit 977faa0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/frontend/src/components/modals/create-guild.tsx b/frontend/src/components/modals/create-guild.tsx
@@ -8,6 +8,7 @@ import Modal from './modal';
 const CreateGuild: React.FunctionComponent = () => {
   const dispatch = useDispatch();
   const { register, handleSubmit } = useForm();
+  const { register: register2, handleSubmit: handleSubmit2 } = useForm();
 
   const submitCreate = (data) => dispatch(createGuild(data.name));
   const submitJoin = (data) => dispatch(joinGuild(data.inviteCode));
@@ -35,11 +36,11 @@ const CreateGuild: React.FunctionComponent = () => {
 
       <h3 className="uppercase font-bold mt-10">Make Your Own</h3>
 
-      <form onSubmit={handleSubmit(submitCreate)}>
+      <form onSubmit={handleSubmit2(submitCreate)}>
         <Input
           label="Server Name"
           name="name"
-          register={register} />
+          register={register2} />
         <NormalButton className="w-full h-11 mt-8">Create</NormalButton>
       </form>
     </Modal>

diff --git a/frontend/src/components/navigation/sidebar/sidebar-content.tsx b/frontend/src/components/navigation/sidebar/sidebar-content.tsx
@@ -12,20 +12,19 @@ import './sidebar-content.scoped.css';
 
 const SidebarContent: React.FunctionComponent = () => {  
   const dispatch = useDispatch();
-  const ui = useSelector((s: Store.AppStore) => s.ui);
+  const { activeGuild, activeChannel } = useSelector((s: Store.AppStore) => s.ui);
 
-  const isActive = (c) => c.id === ui.activeChannel?.id;
-  const channels = ui.activeGuild?.channels.map(c => (
+  const channels = activeGuild?.channels.map(c => (
     <ContextMenuTrigger key={c.id} id={c.id}>
       <Link
-        to={`/channels/${ui.activeGuild!.id}/${c.id}`}
+        to={`/channels/${activeGuild!.id}/${c.id}`}
         className={`
           cursor-pointer flex items-center rounded h-8 p-2 pl-3
-          ${isActive(c) && 'active'}`}>
+          ${c.id === activeChannel?.id && 'active'}`}>
         <FontAwesomeIcon
           className="float-left mr-2 scale-150 muted fill-current"
           icon={faHashtag} />
-        <span className={`${!isActive(c) && 'font'}`}>{c.name}</span>
+        <span>{c.name}</span>
       </Link>
       <ChannelMenu channel={c} />
     </ContextMenuTrigger>