From 5e9426ddbad4975ae65e9f991eab631fc08a5202 Mon Sep 17 00:00:00 2001
From: Jennifer Echenim <echenimjennifer@gmail.com>
Date: Mon, 8 Jul 2024 12:13:55 +0400
Subject: [PATCH] Update noResultsWord to noResultsText in DataTable component

---
 tools/tenscan/frontend/pages/batches/index.tsx     |  2 +-
 tools/tenscan/frontend/pages/blocks/index.tsx      |  2 +-
 tools/tenscan/frontend/pages/rollups/index.tsx     |  2 +-
 .../tenscan/frontend/pages/transactions/index.tsx  |  2 +-
 .../modules/common/data-table/data-table.tsx       | 10 +++++-----
 .../src/components/modules/personal/index.tsx      | 14 +++++++-------
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tools/tenscan/frontend/pages/batches/index.tsx b/tools/tenscan/frontend/pages/batches/index.tsx
index 3a6b25a521..e8d88d3fbc 100644
--- a/tools/tenscan/frontend/pages/batches/index.tsx
+++ b/tools/tenscan/frontend/pages/batches/index.tsx
@@ -57,7 +57,7 @@ export default function Batches() {
           refetch={refetchBatches}
           total={+Total}
           isLoading={isBatchesLoading}
-          noResultsWord="batches"
+          noResultsText="batches"
         />
       </div>
     </Layout>
diff --git a/tools/tenscan/frontend/pages/blocks/index.tsx b/tools/tenscan/frontend/pages/blocks/index.tsx
index 4a48663d11..158a1214dd 100644
--- a/tools/tenscan/frontend/pages/blocks/index.tsx
+++ b/tools/tenscan/frontend/pages/blocks/index.tsx
@@ -54,7 +54,7 @@ export default function Blocks() {
           total={+Total}
           refetch={refetchBlocks}
           isLoading={isBlocksLoading}
-          noResultsWord="blocks"
+          noResultsText="blocks"
         />
       </div>
     </Layout>
diff --git a/tools/tenscan/frontend/pages/rollups/index.tsx b/tools/tenscan/frontend/pages/rollups/index.tsx
index a58b584e2b..8793dd2ad4 100644
--- a/tools/tenscan/frontend/pages/rollups/index.tsx
+++ b/tools/tenscan/frontend/pages/rollups/index.tsx
@@ -54,7 +54,7 @@ export default function Rollups() {
           refetch={refetchRollups}
           total={+Total}
           isLoading={isRollupsLoading}
-          noResultsWord="rollups"
+          noResultsText="rollups"
         />
       </div>
     </Layout>
diff --git a/tools/tenscan/frontend/pages/transactions/index.tsx b/tools/tenscan/frontend/pages/transactions/index.tsx
index ce1a0b97f2..2a63269e16 100644
--- a/tools/tenscan/frontend/pages/transactions/index.tsx
+++ b/tools/tenscan/frontend/pages/transactions/index.tsx
@@ -65,7 +65,7 @@ export default function Transactions() {
           refetch={refetchTransactions}
           total={+Total}
           isLoading={isTransactionsLoading}
-          noResultsWord="transactions"
+          noResultsText="transactions"
         />
       </div>
     </Layout>
diff --git a/tools/tenscan/frontend/src/components/modules/common/data-table/data-table.tsx b/tools/tenscan/frontend/src/components/modules/common/data-table/data-table.tsx
index f5546fa11a..982835d6d4 100644
--- a/tools/tenscan/frontend/src/components/modules/common/data-table/data-table.tsx
+++ b/tools/tenscan/frontend/src/components/modules/common/data-table/data-table.tsx
@@ -45,7 +45,7 @@ interface DataTableProps<TData, TValue> {
   total: number;
   isLoading?: boolean;
   noPagination?: boolean;
-  noResultsWord?: string;
+  noResultsText?: string;
   noResultsMessage?: string;
 }
 
@@ -57,7 +57,7 @@ export function DataTable<TData, TValue>({
   total,
   isLoading,
   noPagination,
-  noResultsWord,
+  noResultsText,
   noResultsMessage,
 }: DataTableProps<TData, TValue>) {
   const { query, push, pathname } = useRouter();
@@ -175,7 +175,7 @@ export function DataTable<TData, TValue>({
                 >
                   {pagination.pageIndex > 1 ? (
                     <p>
-                      No {noResultsWord || "results"} found for the selected
+                      No {noResultsText || "results"} found for the selected
                       filters.
                       <Button
                         variant={"link"}
@@ -190,7 +190,7 @@ export function DataTable<TData, TValue>({
                   ) : (
                     <p>
                       {noResultsMessage ||
-                        `No ${noResultsWord || "results"} found.`}
+                        `No ${noResultsText || "results"} found.`}
                     </p>
                   )}
                 </TableCell>
@@ -199,7 +199,7 @@ export function DataTable<TData, TValue>({
           </TableBody>
         </Table>
       </div>
-      {(data || isLoading) && !noPagination && (
+      {data && !isLoading && !noPagination && (
         <DataTablePagination
           table={table}
           refetch={refetch}
diff --git a/tools/tenscan/frontend/src/components/modules/personal/index.tsx b/tools/tenscan/frontend/src/components/modules/personal/index.tsx
index 77743c59f4..c54b5a478c 100644
--- a/tools/tenscan/frontend/src/components/modules/personal/index.tsx
+++ b/tools/tenscan/frontend/src/components/modules/personal/index.tsx
@@ -35,13 +35,13 @@ export default function PersonalTransactions() {
           </p> */}
         </div>
       </div>
-      {personalTxnsLoading ? (
-        <Skeleton className="h-96" />
-      ) : Receipts ? (
-        <DataTable columns={columns} data={Receipts} total={Total} />
-      ) : (
-        <p>No transactions found.</p>
-      )}
+      <DataTable
+        columns={columns}
+        data={Receipts}
+        total={Total}
+        isLoading={personalTxnsLoading}
+        noResultsText="personal transactions"
+      />
     </>
   );
 }