bringing things to the top especially handlers... cleaner?

packages/desktop/src/components/lines/lineRow.tsx/index.tsx

@@ -16,8 +16,10 @@ import { useRecoilState } from "recoil";
 
 export default function LineRow({
   masterLineData,
+  handleSelectLine,
 }: {
   masterLineData: MasterLineData;
+  handleSelectLine: (lineId: string) => void;
 }) {
   const [selectedLineId, setSelectedLineId] = useRecoilState($selectedLineId);
   const { data: userData } = useGetUserDetails();
@@ -25,24 +27,6 @@ export default function LineRow({
   // TODO: p2 move those socket handler functions to another hook so that they don't come from the context as this will cause each line row to re-render on changes to the context state/value
   const { handleUnTuneToLine } = useLineDataProvider();
 
-  /** show user line details */
-  const handleSelectLine = useCallback(() => {
-    // if not already selected so that we are not changing this recoil atom of selected line id and causing a mess
-    if (selectedLineId !== masterLineData.lineDetails._id.toString()) {
-      setSelectedLineId((prevSelectedLineId) => {
-        // untune myself from the previously selected if it was a temporary one/inbox
-        // todo: p3: consolidate this logic as it's used in escape but different scenarios sort of so p3
-        if (
-          prevSelectedLineId &&
-          masterLineData.currentUserMember?.state === LineMemberState.INBOX
-        )
-          handleUnTuneToLine(prevSelectedLineId);
-
-        return masterLineData.lineDetails._id.toString();
-      });
-    }
-  }, [setSelectedLineId, masterLineData, selectedLineId]);
-
   // take the source of truth list of memeberIds tuned in, and see if I'm in it
   const isUserTunedIn = useMemo(
     () =>
@@ -131,7 +115,9 @@ export default function LineRow({
 
   return (
     <div
-      onClick={handleSelectLine}
+      onClick={() =>
+        handleSelectLine(masterLineData.lineDetails._id.toString())
+      }
       className={`flex flex-row items-center justify-start gap-2 p-2 px-4 h-14 hover:bg-gray-200 cursor-pointer transition-all
   last:border-b-0 border-b border-b-gray-200 relative z-50 ${
     selectedLineId === masterLineData.lineDetails._id.toString() &&

packages/desktop/src/pages/terminal/index.tsx

@@ -52,6 +52,30 @@ export default function NirvanaTerminal() {
     );
   }, [linesMap]);
 
+  const selectedLine: MasterLineData | undefined = useMemo(() => {
+    if (!selectedLineId) return undefined;
+
+    // find the line from the data provider
+    if (linesMap[selectedLineId]) {
+      console.log("looking for selected Line in map for details section");
+
+      const foundSelectedLine = linesMap[selectedLineId];
+
+      // on mount of this, we want to temporarily tune into the line if we are not already tuned in...which would happen if we toggle tuned in
+      if (
+        !foundSelectedLine.tunedInMemberIds?.includes(
+          userDetails?.user?._id.toString()
+        )
+      ) {
+        handleTuneToLine(selectedLineId, false);
+      }
+
+      return { ...foundSelectedLine };
+    }
+
+    return undefined;
+  }, [selectedLineId, linesMap, userDetails]);
+
   // todo: sort/order based on activity and activity date and currently broadcasting/live
 
   const handleEscape = useCallback(() => {
@@ -59,15 +83,30 @@ export default function NirvanaTerminal() {
 
     setSelectedLineId((prevSelectedLineId) => {
       // ! only want to untune if it's a temporarily tuned line
-      if (
+      if (selectedLine.currentUserMember?.state === LineMemberState.INBOX)
-        linesMap[prevSelectedLineId].currentUserMember?.state ===
-        LineMemberState.INBOX
-      )
         handleUnTuneToLine(prevSelectedLineId);
 
       return null;
     });
-  }, [setSelectedLineId, linesMap]);
+  }, [setSelectedLineId, selectedLine]);
+
+  /** show user line details on click of one line */
+  const handleSelectLine = useCallback(
+    (newLineIdToSelect: string) => {
+      setSelectedLineId((prevSelectedLineId) => {
+        // untune myself from the previously selected if it was a temporary one/inbox
+        // todo: p3: consolidate this logic as it's used in escape but different scenarios sort of so p3
+        if (
+          prevSelectedLineId &&
+          selectedLine.currentUserMember?.state === LineMemberState.INBOX
+        )
+          handleUnTuneToLine(prevSelectedLineId);
+
+        return newLineIdToSelect;
+      });
+    },
+    [setSelectedLineId, selectedLine]
+  );
 
   const handleStartBroadcast = useCallback(
     (lineId: string) => () => {
@@ -115,30 +154,6 @@ export default function NirvanaTerminal() {
     [selectedLineId]
   );
 
-  const selectedLine: MasterLineData | undefined = useMemo(() => {
-    if (!selectedLineId) return undefined;
-
-    // find the line from the data provider
-    if (linesMap[selectedLineId]) {
-      console.log("looking for selected Line in map for details section");
-
-      const foundSelectedLine = linesMap[selectedLineId];
-
-      // on mount of this, we want to temporarily tune into the line if we are not already tuned in...which would happen if we toggle tuned in
-      if (
-        !foundSelectedLine.tunedInMemberIds?.includes(
-          userDetails?.user?._id.toString()
-        )
-      ) {
-        handleTuneToLine(selectedLineId, false);
-      }
-
-      return { ...foundSelectedLine };
-    }
-
-    return undefined;
-  }, [selectedLineId, linesMap, userDetails]);
-
   return (
     <>
       <GlobalHotKeys handlers={handlers} keyMap={keyMap} allowChanges />
@@ -181,6 +196,7 @@ export default function NirvanaTerminal() {
                 <LineRow
                   key={`terminalListLines-${masterLineData.lineDetails._id.toString()}`}
                   masterLineData={masterLineData}
+                  handleSelectLine={handleSelectLine}
                 />
               ))}
             </div>
@@ -202,6 +218,7 @@ export default function NirvanaTerminal() {
                 <LineRow
                   key={`terminalListLines-${masterLineData.lineDetails._id.toString()}`}
                   masterLineData={masterLineData}
+                  handleSelectLine={handleSelectLine}
                 />
               ))
             )}