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

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