From 17b27afce661262a433842eaa6aa0cec9f0faf60 Mon Sep 17 00:00:00 2001
From: talksik <patel.arjun50@gmail.com>
Date: Wed, 18 May 2022 20:30:59 -0500
Subject: [PATCH] ordering wrong

---
 packages/desktop/src/providers/StreamProvider.tsx |  2 ++
 .../desktop/src/providers/TerminalProvider.tsx    | 15 ++++++++++-----
 packages/desktop/src/tree/electronApp.tsx         |  8 +++-----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/desktop/src/providers/StreamProvider.tsx b/packages/desktop/src/providers/StreamProvider.tsx
index 53b7839..f448cb8 100644
--- a/packages/desktop/src/providers/StreamProvider.tsx
+++ b/packages/desktop/src/providers/StreamProvider.tsx
@@ -81,6 +81,8 @@ export function StreamProvider({ children }: { children: React.ReactChild }) {
               line={line}
             />
           );
+
+        console.log(line.tunedInMemberIds);
       })}
 
       {children}
diff --git a/packages/desktop/src/providers/TerminalProvider.tsx b/packages/desktop/src/providers/TerminalProvider.tsx
index 714ec58..0debaae 100644
--- a/packages/desktop/src/providers/TerminalProvider.tsx
+++ b/packages/desktop/src/providers/TerminalProvider.tsx
@@ -29,6 +29,7 @@ import { User } from '@nirvana/core/models/user.model';
 import SidePanel from '../tree/protected/terminal/panels/SidePanel';
 import MainPanel from '../tree/protected/terminal/panels/MainPanel';
 import useElectron from './ElectronProvider';
+import { StreamProvider } from './StreamProvider';
 
 type LineIdToMasterLine = {
   [lineId: string]: MasterLineData;
@@ -358,13 +359,17 @@ export function TerminalProvider({ children }: { children: React.ReactChild }) {
         handleShowNewChannelForm,
       }}
     >
-      <div className="flex flex-row flex-1 h-full w-full">
-        <SidePanel />
+      <StreamProvider>
+        <>
+          <div className="flex flex-row flex-1 h-full w-full">
+            <SidePanel />
 
-        {desktopMode === 'mainApp' && <MainPanel />}
-      </div>
+            {desktopMode === 'mainApp' && <MainPanel />}
+          </div>
 
-      {children}
+          {children}
+        </>
+      </StreamProvider>
     </TerminalContext.Provider>
   );
 }
diff --git a/packages/desktop/src/tree/electronApp.tsx b/packages/desktop/src/tree/electronApp.tsx
index 52f2383..15b5f4a 100644
--- a/packages/desktop/src/tree/electronApp.tsx
+++ b/packages/desktop/src/tree/electronApp.tsx
@@ -15,11 +15,9 @@ export default function ElectronApp() {
         <ProtectedRoute>
           <SocketProvider>
             <RoomsProvider>
-              <StreamProvider>
-                <TerminalProvider>
-                  <></>
-                </TerminalProvider>
-              </StreamProvider>
+              <TerminalProvider>
+                <></>
+              </TerminalProvider>
             </RoomsProvider>
           </SocketProvider>
         </ProtectedRoute>