ordering wrong

This commit is contained in:
talksik
2022-05-18 20:30:59 -05:00
parent 46e8f14436
commit 17b27afce6
3 changed files with 15 additions and 10 deletions
@@ -81,6 +81,8 @@ export function StreamProvider({ children }: { children: React.ReactChild }) {
line={line}
/>
);
console.log(line.tunedInMemberIds);
})}
{children}
@@ -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>
);
}
+3 -5
View File
@@ -15,11 +15,9 @@ export default function ElectronApp() {
<ProtectedRoute>
<SocketProvider>
<RoomsProvider>
<StreamProvider>
<TerminalProvider>
<></>
</TerminalProvider>
</StreamProvider>
<TerminalProvider>
<></>
</TerminalProvider>
</RoomsProvider>
</SocketProvider>
</ProtectedRoute>