fix merge errors

web/src/components/App/Sidebar.jsx

@@ -21,28 +21,21 @@ const Sidebar = ({ isDrawerOpen, setIsDonationDialogOpen, isOffline, isLoading }
     <AppSidebarStyle isDrawerOpen={isDrawerOpen}>
       <List>
         <AddDialogButton isOffline={isOffline} isLoading={isLoading} />
-
         <RemoveAll isOffline={isOffline} isLoading={isLoading} />
       </List>
-
       <Divider />
-
       <List>
         <SettingsDialog />
-        <CloseServer isOffline={isOffline} isLoading={isLoading} />
       </List>
-
-      <Divider />
-
       <List>
         <AboutDialog />
-
         <ListItem button onClick={() => setIsDonationDialogOpen(true)}>
           <ListItemIcon>
             <CreditCardIcon />
           </ListItemIcon>
           <ListItemText primary={t('Donate')} />
         </ListItem>
+        <CloseServer isOffline={isOffline} isLoading={isLoading} />
       </List>
     </AppSidebarStyle>
   )

web/src/components/App/index.jsx

@@ -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>

web/src/components/App/style.js

@@ -86,5 +86,6 @@ export const LanguageSwitch = styled.div`
   @media (max-width: 700px) {
     height: 28px;
     width: 28px;
+    font-size: 12px;
   }
 `