From 69ffa0d2292361086cb35b3e2eb8b18aca408c4d Mon Sep 17 00:00:00 2001
From: Andrey Kud <a-kud@users.noreply.github.com>
Date: Thu, 21 Dec 2023 18:30:54 -0300
Subject: [PATCH] Bug on table first load  (#3117)

fix: Bug on table first load
---
 .../components/RecordTableBody.tsx             |  4 ++--
 .../RecordTableBodyFetchMoreLoader.tsx         | 18 +++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBody.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBody.tsx
index 40caf9245..590da317a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBody.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBody.tsx
@@ -10,7 +10,7 @@ export const RecordTableBody = () => {
   const tableRowIds = useRecoilValue(tableRowIdsState);
 
   return (
-    <>
+    <tbody>
       {tableRowIds.map((rowId, rowIndex) => (
         <RowIdContext.Provider value={rowId} key={rowId}>
           <RowIndexContext.Provider value={rowIndex}>
@@ -19,6 +19,6 @@ export const RecordTableBody = () => {
         </RowIdContext.Provider>
       ))}
       <RecordTableBodyFetchMoreLoader />
-    </>
+    </tbody>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyFetchMoreLoader.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyFetchMoreLoader.tsx
index 02cfa6369..5ea98abb2 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyFetchMoreLoader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableBodyFetchMoreLoader.tsx
@@ -30,15 +30,11 @@ export const RecordTableBodyFetchMoreLoader = () => {
     onChange: onLastRowVisible,
   });
 
-  return (
-    <tbody ref={tbodyRef}>
-      {isFetchingMoreObjects && (
-        <StyledRow selected={false}>
-          <td style={{ height: 50 }} colSpan={1000}>
-            Loading more...
-          </td>
-        </StyledRow>
-      )}
-    </tbody>
-  );
+  return isFetchingMoreObjects ? (
+    <StyledRow ref={tbodyRef} selected={false}>
+      <td style={{ height: 50 }} colSpan={1000}>
+        Loading more...
+      </td>
+    </StyledRow>
+  ) : null;
 };