fix merge errors

This commit is contained in:
nikk gitanes
2021-06-17 22:18:48 +03:00
parent abd379ed55
commit 3ec9b58ebc
4 changed files with 11 additions and 12 deletions

View File

@@ -93,14 +93,19 @@ export default function App() {
<div style={{ justifySelf: 'end' }}>
<LanguageSwitch onClick={() => (currentLang === 'en' ? changeLang('ru') : changeLang('en'))}>
{currentLang === 'en' ? 'ru' : 'en'}
{currentLang === 'en' ? 'RU' : 'EN'}
</LanguageSwitch>
</div>
</AppHeader>
<ThemeProvider theme={darkTheme}>
<Sidebar isDrawerOpen={isDrawerOpen} setIsDonationDialogOpen={setIsDonationDialogOpen} />
<Sidebar
isOffline={isOffline}
isLoading={isLoading}
isDrawerOpen={isDrawerOpen}
setIsDonationDialogOpen={setIsDonationDialogOpen}
/>
</ThemeProvider>
<TorrentList />
<TorrentList isOffline={isOffline} torrents={torrents} isLoading={isLoading} />
<ThemeProvider theme={lightTheme}>
{isDonationDialogOpen && <DonateDialog onClose={() => setIsDonationDialogOpen(false)} />}
</ThemeProvider>