mirror of
https://github.com/status-im/nimbus-gui.git
synced 2025-02-03 23:24:20 +00:00
fix: providers order
This commit is contained in:
parent
894d7aa575
commit
6fee0c376c
24
src/App.tsx
24
src/App.tsx
@ -8,9 +8,9 @@ import DeviceHealthCheck from './pages/DeviceHealthCheck/DeviceHealthCheck'
|
||||
import ConnectDevicePage from './pages/ConnectDevicePage/ConnectDevicePage'
|
||||
import DeviceSyncStatus from './pages/DeviceSyncStatus/DeviceSyncStatus'
|
||||
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 store from './redux/store'
|
||||
import { RootState } from './redux/store'
|
||||
import CreateLocalNodePage from './pages/CreateLocalNodePage/CreateLocalNodePage'
|
||||
|
||||
const router = createBrowserRouter([
|
||||
@ -38,17 +38,17 @@ const router = createBrowserRouter([
|
||||
])
|
||||
|
||||
function App() {
|
||||
const theme = useSelector((state: RootState) => state.theme)
|
||||
|
||||
return (
|
||||
<ReduxProvider store={store}>
|
||||
<TamaguiProvider config={config}>
|
||||
<StatusProvider>
|
||||
<Theme name={'light'}>
|
||||
<PinnedNotification />
|
||||
<RouterProvider router={router} />
|
||||
</Theme>
|
||||
</StatusProvider>
|
||||
</TamaguiProvider>
|
||||
</ReduxProvider>
|
||||
<TamaguiProvider config={config}>
|
||||
<StatusProvider>
|
||||
<Theme name={theme}>
|
||||
<PinnedNotification />
|
||||
<RouterProvider router={router} />
|
||||
</Theme>
|
||||
</StatusProvider>
|
||||
</TamaguiProvider>
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -1,10 +1,14 @@
|
||||
import React from 'react'
|
||||
import ReactDOM from 'react-dom/client'
|
||||
import { Provider as ReduxProvider } from 'react-redux'
|
||||
import App from './App.tsx'
|
||||
import './index.css'
|
||||
import store from './redux/store.tsx'
|
||||
|
||||
ReactDOM.createRoot(document.getElementById('root')!).render(
|
||||
<React.StrictMode>
|
||||
<App />
|
||||
</React.StrictMode>
|
||||
<ReduxProvider store={store}>
|
||||
<App />
|
||||
</ReduxProvider>
|
||||
</React.StrictMode>,
|
||||
)
|
||||
|
Loading…
x
Reference in New Issue
Block a user