src/components/Dashboard/Finance/Invoices.jsx

@@ -80,7 +80,6 @@ const Invoices = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Finance/Payments.jsx

@@ -80,7 +80,6 @@ const Payments = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Finance/TaxRecords.jsx

@@ -80,7 +80,6 @@ const TaxRecords = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Inventory/FilamentStocks.jsx

@@ -85,7 +85,6 @@ const FilamentStocks = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Inventory/OrderItems.jsx

@@ -80,7 +80,6 @@ const OrderItems = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Inventory/PartStocks.jsx

@@ -85,7 +85,6 @@ const PartStocks = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Inventory/ProductStocks.jsx

@@ -86,7 +86,6 @@ const ProductStocks = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Inventory/PurchaseOrders.jsx

@@ -80,7 +80,6 @@ const PurchaseOrders = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Inventory/Shipments.jsx

@@ -80,7 +80,6 @@ const Shipments = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Inventory/StockAudits.jsx

@@ -85,7 +85,6 @@ const StockAudits = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Inventory/StockEvents.jsx

@@ -68,7 +68,6 @@ const StockEvents = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Inventory/StockLocations.jsx

@@ -83,7 +83,6 @@ const StockLocations = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Inventory/StockTransfers.jsx

@@ -83,7 +83,6 @@ const StockTransfers = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/AppPasswords.jsx

@@ -79,7 +79,6 @@ const AppPasswords = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/CourierServices.jsx

@@ -80,7 +80,6 @@ const CourierServices = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/Couriers.jsx

@@ -79,7 +79,6 @@ const Couriers = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/DocumentJobs.jsx

@@ -80,7 +80,6 @@ const DocumentJobs = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/DocumentPrinters.jsx

@@ -79,7 +79,6 @@ const DocumentPrinters = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/DocumentSizes.jsx

@@ -78,7 +78,6 @@ const DocumentSizes = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/DocumentTemplates.jsx

@@ -80,7 +80,6 @@ const DocumentTemplates = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/FilamentSkus.jsx

@@ -83,7 +83,6 @@ const FilamentSkus = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/Filaments.jsx

@@ -85,7 +85,6 @@ const Filaments = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/Files.jsx

@@ -68,7 +68,6 @@ const Files = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/Hosts.jsx

@@ -84,7 +84,6 @@ const Hosts = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/Materials.jsx

@@ -82,7 +82,6 @@ const Materials = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/NoteTypes.jsx

@@ -80,7 +80,6 @@ const NoteTypes = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/PartSkus.jsx

@@ -82,7 +82,6 @@ const PartSkus = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/Parts.jsx

@@ -84,7 +84,6 @@ const Parts = (filter) => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/ProductCategories.jsx

@@ -82,7 +82,6 @@ const ProductCategories = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/ProductSkus.jsx

@@ -83,7 +83,6 @@ const ProductSkus = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/Products.jsx

@@ -356,7 +356,6 @@ const Products = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/TaxRates.jsx

@@ -79,7 +79,6 @@ const TaxRates = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Management/Vendors.jsx

@@ -79,7 +79,6 @@ const Vendors = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Production/FilamentProfiles.jsx

@@ -76,7 +76,6 @@ const FilamentProfiles = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Production/GCodeFiles.jsx

@@ -82,7 +82,6 @@ const GCodeFiles = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Production/Jobs.jsx

@@ -26,7 +26,8 @@ const Jobs = () => {
   const [showFilterSidebar, setShowFilterSidebar] =
     useFilterSidebarVisibility('Jobs')
 
-  const [showSortSidebar, setShowSortSidebar] = useSortSidebarVisibility('Jobs')
+  const [showSortSidebar, setShowSortSidebar] =
+    useSortSidebarVisibility('Jobs')
 
   const actionItems = {
     items: [
@@ -84,7 +85,6 @@ const Jobs = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Production/PrinterProfiles.jsx

@@ -75,7 +75,6 @@ const PrinterProfiles = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Production/Printers.jsx

@@ -85,7 +85,6 @@ const Printers = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Production/SubJobs.jsx

@@ -70,7 +70,6 @@ const SubJobs = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Sales/Clients.jsx

@@ -79,7 +79,6 @@ const Clients = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Sales/Listings.jsx

@@ -80,7 +80,6 @@ const Listings = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Sales/Marketplaces.jsx

@@ -80,7 +80,6 @@ const Marketplaces = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/Sales/SalesOrders.jsx

@@ -80,7 +80,6 @@ const SalesOrders = () => {
             <ObjectTableViewButton
               viewMode={viewMode}
               setViewMode={setViewMode}
-              showEndingDivider={true}
             />
           </Space>
         </Flex>

src/components/Dashboard/common/ObjectTable.jsx

@@ -302,9 +302,7 @@ const ObjectTable = forwardRef(
     }, [])
 
     const mergeLoadedPage = useCallback((currentPages, loadedPage) => {
-      const withoutSkeletons = currentPages.filter(
+      const withoutSkeletons = currentPages.filter((page) => !page.isSkeletonPage)
-        (page) => !page.isSkeletonPage
-      )
       const withoutDuplicate = withoutSkeletons.filter(
         (page) => page.pageNum !== loadedPage.pageNum
       )
@@ -1436,7 +1434,7 @@ const ObjectTable = forwardRef(
             <Splitter.Panel defaultSize={'25%'}>
               <Flex
                 vertical
-                gap='large'
+                gap='middle'
                 style={{ height: '100%', minHeight: 0 }}
               >
                 {showSortSidebar && (

src/components/Dashboard/common/ObjectTableViewButton.jsx

@@ -1,39 +1,20 @@
 import PropTypes from 'prop-types'
-import { Button, Divider, Flex } from 'antd'
+import { Button } from 'antd'
 import GridIcon from '../../Icons/GridIcon'
 import ListIcon from '../../Icons/ListIcon'
 
-const ObjectTableViewButton = ({
+const ObjectTableViewButton = ({ viewMode, setViewMode, ...buttonProps }) => (
-  viewMode,
-  setViewMode,
-  showEndingDivider = false,
-  ...buttonProps
-}) => {
-  const content = (
   <Button
     icon={viewMode === 'cards' ? <ListIcon /> : <GridIcon />}
     onClick={() => setViewMode(viewMode === 'cards' ? 'list' : 'cards')}
-      title={
+    title={viewMode === 'cards' ? 'Switch to list view' : 'Switch to card view'}
-        viewMode === 'cards' ? 'Switch to list view' : 'Switch to card view'
-      }
     {...buttonProps}
   />
 )
-  if (showEndingDivider) {
-    return (
-      <Flex gap='small' align='center'>
-        <Divider type='vertical' style={{ margin: '0 4px', height: '18px' }} />
-        {content}
-      </Flex>
-    )
-  }
-  return content
-}
 
 ObjectTableViewButton.propTypes = {
   viewMode: PropTypes.oneOf(['list', 'cards']).isRequired,
-  setViewMode: PropTypes.func.isRequired,
+  setViewMode: PropTypes.func.isRequired
-  showEndingDivider: PropTypes.bool
 }
 
 export default ObjectTableViewButton