ordering wrong
This commit is contained in:
@@ -81,6 +81,8 @@ export function StreamProvider({ children }: { children: React.ReactChild }) {
|
|||||||
line={line}
|
line={line}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
console.log(line.tunedInMemberIds);
|
||||||
})}
|
})}
|
||||||
|
|
||||||
{children}
|
{children}
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ import { User } from '@nirvana/core/models/user.model';
|
|||||||
import SidePanel from '../tree/protected/terminal/panels/SidePanel';
|
import SidePanel from '../tree/protected/terminal/panels/SidePanel';
|
||||||
import MainPanel from '../tree/protected/terminal/panels/MainPanel';
|
import MainPanel from '../tree/protected/terminal/panels/MainPanel';
|
||||||
import useElectron from './ElectronProvider';
|
import useElectron from './ElectronProvider';
|
||||||
|
import { StreamProvider } from './StreamProvider';
|
||||||
|
|
||||||
type LineIdToMasterLine = {
|
type LineIdToMasterLine = {
|
||||||
[lineId: string]: MasterLineData;
|
[lineId: string]: MasterLineData;
|
||||||
@@ -358,13 +359,17 @@ export function TerminalProvider({ children }: { children: React.ReactChild }) {
|
|||||||
handleShowNewChannelForm,
|
handleShowNewChannelForm,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div className="flex flex-row flex-1 h-full w-full">
|
<StreamProvider>
|
||||||
<SidePanel />
|
<>
|
||||||
|
<div className="flex flex-row flex-1 h-full w-full">
|
||||||
|
<SidePanel />
|
||||||
|
|
||||||
{desktopMode === 'mainApp' && <MainPanel />}
|
{desktopMode === 'mainApp' && <MainPanel />}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{children}
|
{children}
|
||||||
|
</>
|
||||||
|
</StreamProvider>
|
||||||
</TerminalContext.Provider>
|
</TerminalContext.Provider>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,11 +15,9 @@ export default function ElectronApp() {
|
|||||||
<ProtectedRoute>
|
<ProtectedRoute>
|
||||||
<SocketProvider>
|
<SocketProvider>
|
||||||
<RoomsProvider>
|
<RoomsProvider>
|
||||||
<StreamProvider>
|
<TerminalProvider>
|
||||||
<TerminalProvider>
|
<></>
|
||||||
<></>
|
</TerminalProvider>
|
||||||
</TerminalProvider>
|
|
||||||
</StreamProvider>
|
|
||||||
</RoomsProvider>
|
</RoomsProvider>
|
||||||
</SocketProvider>
|
</SocketProvider>
|
||||||
</ProtectedRoute>
|
</ProtectedRoute>
|
||||||
|
|||||||
Reference in New Issue
Block a user