diff --git a/components/TableContainer/TableContainerGetter.tsx b/components/TableContainer/TableContainerGetter.tsx
index c2b4e8e6c..62f794c03 100644
--- a/components/TableContainer/TableContainerGetter.tsx
+++ b/components/TableContainer/TableContainerGetter.tsx
@@ -3,7 +3,7 @@ import { useTable, usePagination } from 'react-table'
 import { DEFAULT_EMPTY_TABLE_MESSAGE } from 'constants/index'
 import style from './table-container.module.css'
 
-interface DataGetterReturn {
+export interface DataGetterReturn {
   data: any
   totalCount: number
 }
@@ -35,7 +35,7 @@ const TableContainer = ({ columns, dataGetter, opts, ssr, tableRefreshCount, emp
   const [pageCount, setPageCount] = useState(0)
   const [loading, setLoading] = useState(true)
   const emptyMessageDisplay = emptyMessage ?? DEFAULT_EMPTY_TABLE_MESSAGE
-  const [hiddenColumns, setHiddenColumns] = useState({})
+  const [hiddenColumns, setHiddenColumns] = useState<Record<string, boolean>>({})
 
   const triggerSort = (column: any): void => {
     if (column.disableSortBy === true || hiddenColumns[column.id]) return
@@ -49,9 +49,9 @@ const TableContainer = ({ columns, dataGetter, opts, ssr, tableRefreshCount, emp
     }
     gotoPage(0)
   }
-  
+
   const toggleColumn = (id: any): void => {
-    setHiddenColumns((prev) => ({ ...prev, [id]: !prev[id]}))
+    setHiddenColumns((prev) => ({ ...prev, [id]: !prev[id] }))
   }
 
   const {
@@ -122,12 +122,12 @@ const TableContainer = ({ columns, dataGetter, opts, ssr, tableRefreshCount, emp
                 <th {...column.getHeaderProps()} style={column.disableSortBy === true ? null : { cursor: 'pointer' }} onClick={() => { triggerSort(column) }}>
                   <div>
                   {column.render('Header')}
-                  {column.shrinkable && (
+                  {column.shrinkable === true && (
                     <span onClick={() => toggleColumn(column.id)} style={{ cursor: 'pointer' }}>
-                      {hiddenColumns[column.id] ? <div style= {{marginRight: '5px'}} className='table-arrow-right' /> : <div style= {{marginRight: '5px'}} className='table-sort-arrow-down' />}
+                      {hiddenColumns[column.id] ? <div style= {{ marginRight: '5px' }} className='table-arrow-right' /> : <div style= {{ marginRight: '5px' }} className='table-sort-arrow-down' />}
                     </span>
                   )}
-                  {!column.shrinkable && generateSortingIndicator(column)}
+                  {column.shrinkable !== true && generateSortingIndicator(column)}
                   </div>
                 </th>
               ))}
@@ -143,7 +143,7 @@ const TableContainer = ({ columns, dataGetter, opts, ssr, tableRefreshCount, emp
                 return (
                 <tr {...row.getRowProps()}>
                   {row.cells.map((cell: any) =>
-                      hiddenColumns[cell.column.id] ? <td> </td> : <td {...cell.getCellProps()}>{cell.render('Cell')}</td>
+                    hiddenColumns[cell.column.id] ? <td> </td> : <td {...cell.getCellProps()}>{cell.render('Cell')}</td>
                   )}
                 </tr>
                 )
diff --git a/components/Transaction/PaybuttonTransactions.tsx b/components/Transaction/PaybuttonTransactions.tsx
index e05814d49..94b5685f3 100644
--- a/components/Transaction/PaybuttonTransactions.tsx
+++ b/components/Transaction/PaybuttonTransactions.tsx
@@ -9,7 +9,7 @@ import Plus from 'assets/plus.png'
 import Pencil from 'assets/pencil.png'
 import FileText from 'assets/file-text.png'
 
-import TableContainerGetter from '../TableContainer/TableContainerGetter'
+import TableContainerGetter, { DataGetterReturn } from '../TableContainer/TableContainerGetter'
 import { compareNumericString } from 'utils/index'
 import moment from 'moment-timezone'
 import { XEC_TX_EXPLORER_URL, BCH_TX_EXPLORER_URL } from 'constants/index'
@@ -26,7 +26,7 @@ interface IProps {
   timezone: string
 }
 
-function fetchTransactionsByPaybuttonId (paybuttonId: string): Function {
+function fetchTransactionsByPaybuttonId (paybuttonId: string): (page: number, pageSize: number, orderBy: string, orderDesc: boolean) => Promise<DataGetterReturn> {
   return async (page: number, pageSize: number, orderBy: string, orderDesc: boolean) => {
     const response = await fetch(`/api/paybutton/transactions/${paybuttonId}?page=${page}&pageSize=${pageSize}&orderBy=${orderBy}&orderDesc=${String(orderDesc)}`, {
       headers: {
diff --git a/services/transactionService.ts b/services/transactionService.ts
index 06a1a2649..f43d0a0fd 100644
--- a/services/transactionService.ts
+++ b/services/transactionService.ts
@@ -587,10 +587,6 @@ export async function fetchTransactionsByPaybuttonIdWithPagination (
     orderDesc,
     networkIds)
 
-  if (transactions.length === 0) {
-    throw new Error(RESPONSE_MESSAGES.NO_TRANSACTION_FOUND_404.message)
-  }
-
   return transactions
 }