fix: providers order

This commit is contained in:
RadoslavDimchev 2023-08-23 13:26:55 +03:00
parent 894d7aa575
commit 6fee0c376c
2 changed files with 18 additions and 14 deletions

View File

@ -8,9 +8,9 @@ import DeviceHealthCheck from './pages/DeviceHealthCheck/DeviceHealthCheck'
import ConnectDevicePage from './pages/ConnectDevicePage/ConnectDevicePage' import ConnectDevicePage from './pages/ConnectDevicePage/ConnectDevicePage'
import DeviceSyncStatus from './pages/DeviceSyncStatus/DeviceSyncStatus' import DeviceSyncStatus from './pages/DeviceSyncStatus/DeviceSyncStatus'
import PairDevice from './pages/PairDevice/PairDevice' import PairDevice from './pages/PairDevice/PairDevice'
import { Provider as ReduxProvider } from 'react-redux' import { useSelector } from 'react-redux'
import PinnedNotification from './components/General/PinnedNottification' import PinnedNotification from './components/General/PinnedNottification'
import store from './redux/store' import { RootState } from './redux/store'
import CreateLocalNodePage from './pages/CreateLocalNodePage/CreateLocalNodePage' import CreateLocalNodePage from './pages/CreateLocalNodePage/CreateLocalNodePage'
const router = createBrowserRouter([ const router = createBrowserRouter([
@ -38,17 +38,17 @@ const router = createBrowserRouter([
]) ])
function App() { function App() {
const theme = useSelector((state: RootState) => state.theme)
return ( return (
<ReduxProvider store={store}>
<TamaguiProvider config={config}> <TamaguiProvider config={config}>
<StatusProvider> <StatusProvider>
<Theme name={'light'}> <Theme name={theme}>
<PinnedNotification /> <PinnedNotification />
<RouterProvider router={router} /> <RouterProvider router={router} />
</Theme> </Theme>
</StatusProvider> </StatusProvider>
</TamaguiProvider> </TamaguiProvider>
</ReduxProvider>
) )
} }

View File

@ -1,10 +1,14 @@
import React from 'react' import React from 'react'
import ReactDOM from 'react-dom/client' import ReactDOM from 'react-dom/client'
import { Provider as ReduxProvider } from 'react-redux'
import App from './App.tsx' import App from './App.tsx'
import './index.css' import './index.css'
import store from './redux/store.tsx'
ReactDOM.createRoot(document.getElementById('root')!).render( ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode> <React.StrictMode>
<ReduxProvider store={store}>
<App /> <App />
</React.StrictMode> </ReduxProvider>
</React.StrictMode>,
) )