diff --git a/packages/root-config/src/microfrontend-layout.html b/packages/root-config/src/microfrontend-layout.html
index 20dcf9fc..a038df33 100644
--- a/packages/root-config/src/microfrontend-layout.html
+++ b/packages/root-config/src/microfrontend-layout.html
@@ -7,6 +7,10 @@
         </route>
         <route path="#!/transactions">
         </route>
+        <route path="#!/transactions/:transactionId">
+        </route>
+        <route path="#!/audits">
+        </route>
         <route path="#!/channels">
         </route>
         <route path="#!/audits">
@@ -50,7 +54,7 @@
           <application name="@jembi/portal-admin"></application>
         </div>
       </route>
-      <route path="#!/transactions">
+      <route path="#!/transactions" exact>
         <div style="flex-grow: 1">
           <application name="@jembi/transaction-log"></application>
         </div>
diff --git a/packages/transaction-log/jest.config.js b/packages/transaction-log/jest.config.js
index 20529f31..0bb11750 100644
--- a/packages/transaction-log/jest.config.js
+++ b/packages/transaction-log/jest.config.js
@@ -1,3 +1,5 @@
+const path = require('path')
+
 module.exports = {
   rootDir: 'src',
   testEnvironment: 'jsdom',
@@ -6,7 +8,11 @@ module.exports = {
   },
   moduleNameMapper: {
     '\\.(css)$': 'identity-obj-proxy',
-    'single-spa-react/parcel': 'single-spa-react/lib/cjs/parcel.cjs'
+    'single-spa-react/parcel': 'single-spa-react/lib/cjs/parcel.cjs',
+    '^@jembi/openhim-core-api$': path.resolve(
+      __dirname,
+      '../openhim-core-api/src/jembi-openhim-core-api.ts'
+    )
   },
   setupFilesAfterEnv: ['@testing-library/jest-dom']
 }
diff --git a/packages/transaction-log/src/components/buttons/status.button.component.tsx b/packages/transaction-log/src/components/buttons/status.button.component.tsx
new file mode 100644
index 00000000..23bfde11
--- /dev/null
+++ b/packages/transaction-log/src/components/buttons/status.button.component.tsx
@@ -0,0 +1,26 @@
+import React from 'react'
+import {Button} from '@mui/material'
+import {StatusButtonProps} from '../../interfaces/index.interface'
+
+const StatusButton: React.FC<StatusButtonProps> = ({status, buttonText}) => {
+  const buttonColor =
+    status === 'Processing'
+      ? 'info'
+      : status === 'Pending Async'
+      ? 'info'
+      : status === 'Successful'
+      ? 'success'
+      : status === 'Completed'
+      ? 'warning'
+      : status === 'Completed with error(s)'
+      ? 'warning'
+      : 'error'
+
+  return (
+    <Button variant="contained" color={buttonColor}>
+      {buttonText}
+    </Button>
+  )
+}
+
+export default StatusButton
diff --git a/packages/transaction-log/src/components/common/app.main.component.tsx b/packages/transaction-log/src/components/common/app.main.component.tsx
index 5d5471a1..296cc018 100644
--- a/packages/transaction-log/src/components/common/app.main.component.tsx
+++ b/packages/transaction-log/src/components/common/app.main.component.tsx
@@ -41,6 +41,8 @@ const App: React.FC = () => {
   const [client, setClient] = useState(NO_FILTER)
   const [method, setMethod] = useState(NO_FILTER)
   const [clients, setClients] = useState([])
+  const [loading, setLoading] = useState(false)
+  const [timestampFilter, setTimestampFilter] = useState<string | null>(null)
 
   const fetchTransactionLogs = useCallback(
     async (timestampFilter?: string) => {
@@ -112,17 +114,20 @@ const App: React.FC = () => {
           fetchParams.filterPage = 0
         }
 
-        const transactions = await getTransactions(fetchParams);
+        const newTransactions = await getTransactions(fetchParams)
 
-        const transactionsWithChannelDetails = await Promise.all(
-          transactions.map(async transaction => {
+        const newTransactionsWithChannelDetails = await Promise.all(
+          newTransactions.map(async transaction => {
             const channelName = await fetchChannelDetails(transaction.channelID)
             const clientName = await fetchClientDetails(transaction.clientID)
             return {...transaction, channelName, clientName}
           })
         )
 
-        setTransactions(transactionsWithChannelDetails)
+        setTransactions(prevTransactions => [
+          ...newTransactionsWithChannelDetails,
+          ...prevTransactions
+        ])
       } catch (error) {
         console.error('Error fetching logs:', error)
       }
@@ -140,7 +145,8 @@ const App: React.FC = () => {
       path,
       param,
       client,
-      method
+      method,
+      loading
     ]
   )
 
@@ -165,6 +171,21 @@ const App: React.FC = () => {
     fetchAvailableChannels(), fetchAvailableClients()
   }, [fetchTransactionLogs, fetchAvailableChannels, fetchAvailableClients])
 
+  useEffect(() => {
+    const interval = setInterval(() => {
+      const currentTimestamp = new Date().toISOString()
+      setTimestampFilter(currentTimestamp)
+    }, 5000)
+
+    return () => clearInterval(interval)
+  }, [])
+
+  useEffect(() => {
+    if (timestampFilter) {
+      fetchTransactionLogs(timestampFilter)
+    }
+  }, [timestampFilter, fetchTransactionLogs])
+
   const handleTabChange = (event: React.ChangeEvent<{}>, newValue: number) => {
     setTabValue(newValue)
   }
@@ -191,8 +212,16 @@ const App: React.FC = () => {
     }
   }
 
-  const loadMore = () => {
-    setLimit(prevLimit => prevLimit + 20)
+  const loadMore = async () => {
+    setLoading(true)
+    try {
+      setLimit(prevLimit => prevLimit + 20)
+
+      await fetchTransactionLogs()
+    } catch (error) {
+    } finally {
+      setLoading(false)
+    }
   }
 
   const filteredTransactions = transactions.filter(transaction => {
@@ -208,8 +237,8 @@ const App: React.FC = () => {
     ].some(field => field?.toLowerCase().includes(searchTerm))
   })
 
-  const handleRowClick = (transaction) => {
-    console.log('Transaction clicked:', transaction);
+  const handleRowClick = transaction => {
+    console.log('Transaction clicked:', transaction)
   }
 
   return (
@@ -311,6 +340,7 @@ const App: React.FC = () => {
             <TransactionLogTable
               transactions={filteredTransactions}
               loadMore={loadMore}
+              loading={loading}
               onRowClick={handleRowClick}
             />
           </CardContent>
diff --git a/packages/transaction-log/src/components/common/transactionlog.datatable.component.tsx b/packages/transaction-log/src/components/common/transactionlog.datatable.component.tsx
index 6dc8cba5..3ff6b7fd 100644
--- a/packages/transaction-log/src/components/common/transactionlog.datatable.component.tsx
+++ b/packages/transaction-log/src/components/common/transactionlog.datatable.component.tsx
@@ -11,25 +11,68 @@ import {
   Typography,
   Button,
   IconButton,
-  TableFooter
+  TableFooter,
+  CircularProgress
 } from '@mui/material'
 import SettingsIcon from '@mui/icons-material/Settings'
 import SettingsDialog from '../dialogs/settings.dialog.component'
 import {ChevronRight} from '@mui/icons-material'
+import LockIcon from '@mui/icons-material/Lock'
+import convertTimestampFormat from '../helpers/timestampformat.helper.component'
+import StatusButton from '../buttons/status.button.component'
 
 const TransactionLogTable: React.FC<{
   transactions: any[]
   loadMore: () => void
-  onRowClick: (transaction) => void
-}> = ({transactions, loadMore, onRowClick}) => {
+  loading: boolean
+  onRowClick: (transaction: any) => void
+}> = ({transactions, loadMore, onRowClick, loading}) => {
   const [settingsOpen, setSettingsOpen] = useState(false)
   const [openInNewTab, setOpenInNewTab] = useState(false)
   const [autoUpdate, setAutoUpdate] = useState(false)
+  const [selectedRows, setSelectedRows] = useState<Set<number>>(new Set())
+  const [selectAll, setSelectAll] = useState(false)
 
   const handleSettingsApply = () => {
     setSettingsOpen(false)
   }
 
+  const handleRowClick = (event: React.MouseEvent, transaction: {_id: any}) => {
+    const nonClickableColumnClass = 'non-clickable-column'
+    if ((event.target as HTMLElement).closest(`.${nonClickableColumnClass}`)) {
+      return
+    }
+    const transactionDetailsUrl = `/#!/transactions/${transaction._id}`
+
+    if (openInNewTab) {
+      window.open(transactionDetailsUrl, '_blank')
+    } else {
+      window.location.href = transactionDetailsUrl
+    }
+  }
+
+  const handleRowSelect = (rowIndex: number) => {
+    setSelectedRows(prevSelectedRows => {
+      const newSelectedRows = new Set(prevSelectedRows)
+      if (newSelectedRows.has(rowIndex)) {
+        newSelectedRows.delete(rowIndex)
+      } else {
+        newSelectedRows.add(rowIndex)
+      }
+      return newSelectedRows
+    })
+  }
+
+  const handleSelectAll = () => {
+    if (selectAll) {
+      setSelectedRows(new Set())
+    } else {
+      const allRowIndexes = transactions.map((_, index) => index)
+      setSelectedRows(new Set(allRowIndexes))
+    }
+    setSelectAll(!selectAll)
+  }
+
   return (
     <Box sx={{padding: '16px'}}>
       <Box
@@ -55,7 +98,7 @@ const TransactionLogTable: React.FC<{
             <TableHead>
               <TableRow>
                 <TableCell padding="checkbox">
-                  <Checkbox />
+                  <Checkbox checked={selectAll} onChange={handleSelectAll} />
                 </TableCell>
                 <TableCell>Type</TableCell>
                 <TableCell>Method</TableCell>
@@ -65,29 +108,38 @@ const TransactionLogTable: React.FC<{
                 <TableCell>Params</TableCell>
                 <TableCell>Channel</TableCell>
                 <TableCell>Client</TableCell>
+                <TableCell>Status</TableCell>
                 <TableCell>Time</TableCell>
               </TableRow>
             </TableHead>
             <TableBody>
               {transactions.map((transaction, index) => (
-                <TableRow key={index} hover style={{cursor: 'pointer'}} onClick={() => onRowClick(transaction)}>
-                  <TableCell padding="checkbox">
-                    <Checkbox />
+                <TableRow
+                  key={index}
+                  hover
+                  style={{cursor: 'pointer'}}
+                  onClick={event => handleRowClick(event, transaction)}
+                >
+                  <TableCell
+                    padding="checkbox"
+                    className="non-clickable-column"
+                  >
+                    <Checkbox
+                      checked={selectedRows.has(index)}
+                      onChange={() => handleRowSelect(index)}
+                    />
                   </TableCell>
                   <TableCell>
-                    <svg
-                      width="32"
-                      height="32"
-                      viewBox="0 0 32 32"
-                      fill="none"
-                      xmlns="http://www.w3.org/2000/svg"
+                    <IconButton
+                      sx={{
+                        height: '32px',
+                        width: '32px',
+                        backgroundColor: '#FECDD2',
+                        borderRadius: 0
+                      }}
                     >
-                      <rect width="32" height="32" rx="4" fill="#FECDD2" />
-                      <path
-                        d="M22 12H21V10C21 7.24 18.76 5 16 5C13.24 5 11 7.24 11 10V12H10C8.9 12 8 12.9 8 14V24C8 25.1 8.9 26 10 26H22C23.1 26 24 25.1 24 24V14C24 12.9 23.1 12 22 12ZM16 21C14.9 21 14 20.1 14 19C14 17.9 14.9 17 16 17C17.1 17 18 17.9 18 19C18 20.1 17.1 21 16 21ZM19.1 12H12.9V10C12.9 8.29 14.29 6.9 16 6.9C17.71 6.9 19.1 8.29 19.1 10V12Z"
-                        fill="#C62828"
-                      />
-                    </svg>
+                      <LockIcon style={{color: '#C62828'}} />
+                    </IconButton>
                   </TableCell>
                   <TableCell>{transaction.request.method}</TableCell>
                   <TableCell>{transaction.request.host}</TableCell>
@@ -96,15 +148,31 @@ const TransactionLogTable: React.FC<{
                   <TableCell>{transaction.request.params}</TableCell>
                   <TableCell>{transaction.channelName}</TableCell>
                   <TableCell>{transaction.clientName}</TableCell>
-                  <TableCell>{transaction.request.timestamp}</TableCell>
+                  <TableCell>
+                    <StatusButton
+                      status={transaction.status}
+                      buttonText={transaction.status}
+                    />
+                  </TableCell>
+                  <TableCell>
+                    {convertTimestampFormat(transaction.request.timestamp)}
+                  </TableCell>
                 </TableRow>
               ))}
             </TableBody>
             <TableFooter>
               <TableRow>
-                <TableCell colSpan={10} align="right">
-                  <Button onClick={loadMore} endIcon={<ChevronRight />}>
-                    Load 20 more results
+                <TableCell colSpan={11} align="right">
+                  <Button
+                    onClick={loadMore}
+                    endIcon={<ChevronRight />}
+                    disabled={loading}
+                  >
+                    {loading ? (
+                      <CircularProgress size={24} />
+                    ) : (
+                      'Load 20 more results'
+                    )}
                   </Button>
                 </TableCell>
               </TableRow>
diff --git a/packages/transaction-log/src/components/dialogs/reruntransactions.dialog.component.tsx b/packages/transaction-log/src/components/dialogs/reruntransactions.dialog.component.tsx
new file mode 100644
index 00000000..1022cdfe
--- /dev/null
+++ b/packages/transaction-log/src/components/dialogs/reruntransactions.dialog.component.tsx
@@ -0,0 +1,184 @@
+import React from 'react'
+import {
+  Modal,
+  Button,
+  Typography,
+  Box,
+  FormControl,
+  InputLabel,
+  Select,
+  MenuItem,
+  Checkbox,
+  FormControlLabel,
+  Alert
+} from '@mui/material'
+
+interface Batch {
+  value: number
+  label: string
+}
+
+interface Props {
+  open: boolean
+  handleClose: () => void
+  rerunSuccess: boolean | undefined
+  transactionsSelected: number[]
+  transactionsCount: number
+  alerts: {rerun: {type?: string; msg: string}[]}
+  bulkRerunActive: boolean
+  batchSizes: Batch[]
+  taskSetup: {batchSize: number; paused: boolean}
+  setTaskSetup: React.Dispatch<
+    React.SetStateAction<{batchSize: number; paused: boolean}>
+  >
+  confirmRerun: () => void
+}
+
+const RerunTransactionsConfirmationModal: React.FC<Props> = ({
+  open,
+  handleClose,
+  rerunSuccess,
+  transactionsSelected,
+  transactionsCount,
+  alerts,
+  bulkRerunActive,
+  batchSizes,
+  taskSetup,
+  setTaskSetup,
+  confirmRerun
+}) => {
+  const handleBatchSizeChange = (
+    event: React.ChangeEvent<{value: unknown}>
+  ) => {
+    setTaskSetup(prevState => ({
+      ...prevState,
+      batchSize: event.target.value as number
+    }))
+  }
+
+  const handlePausedChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setTaskSetup(prevState => ({
+      ...prevState,
+      paused: event.target.checked
+    }))
+  }
+
+  return (
+    <Modal open={open} onClose={handleClose}>
+      <Box
+        sx={{
+          width: 400,
+          padding: 3,
+          bgcolor: 'background.paper',
+          margin: 'auto',
+          mt: 10
+        }}
+      >
+        <Box
+          sx={{
+            display: 'flex',
+            justifyContent: 'space-between',
+            alignItems: 'center',
+            mb: 2
+          }}
+        >
+          <Typography variant="h6" component="div">
+            <i className="glyphicon glyphicon-repeat"></i>
+            &nbsp;&nbsp;Transactions Rerun Confirmation
+          </Typography>
+          <Button onClick={handleClose}>&times;</Button>
+        </Box>
+        <Box sx={{mb: 2}}>
+          {!rerunSuccess ? (
+            <>
+              {transactionsSelected.length === 0 && transactionsCount === 0 ? (
+                <Typography variant="h6">
+                  You have not selected any transactions to be rerun. <br />
+                  <br />
+                  Please select the transactions you wish to rerun by ticking
+                  the boxes on the left and try again
+                </Typography>
+              ) : (
+                <Typography variant="h6">
+                  {transactionsSelected.length === 1 && (
+                    <div style={{marginBottom: 15}}>
+                      You have selected that transaction{' '}
+                      <strong>#{transactionsSelected[0]}</strong> should be
+                      rerun.
+                    </div>
+                  )}
+                  {(transactionsSelected.length > 1 || transactionsCount) && (
+                    <div style={{marginBottom: 15}}>
+                      You have selected a total of{' '}
+                      <strong>
+                        {bulkRerunActive
+                          ? transactionsCount
+                          : transactionsSelected.length}
+                      </strong>{' '}
+                      transactions to be rerun.
+                    </div>
+                  )}
+                  {alerts.rerun.map((alert, index) => (
+                    <Alert key={index} severity={'warning'}>
+                      {alert.msg}
+                    </Alert>
+                  ))}
+                  <div>
+                    Are you sure you wish to proceed with this operation?
+                  </div>
+                </Typography>
+              )}
+            </>
+          ) : (
+            <Typography variant="h6">
+              {transactionsSelected.length === 1
+                ? 'Your selected transaction has been added to the queue to be rerun.'
+                : 'Your selected transactions have been added to the queue to be rerun.'}
+            </Typography>
+          )}
+        </Box>
+        {!rerunSuccess &&
+          (transactionsSelected.length > 1 || transactionsCount > 0) && (
+            <Box sx={{mb: 2, display: 'flex', alignItems: 'center'}}>
+              <FormControl variant="outlined" sx={{mr: 2}}>
+                <InputLabel>Batch size</InputLabel>
+                <Select
+                  value={taskSetup.batchSize}
+                  //   onChange={handleBatchSizeChange}
+                  label="Batch size"
+                >
+                  {batchSizes.map(batch => (
+                    <MenuItem key={batch.value} value={batch.value}>
+                      {batch.label}
+                    </MenuItem>
+                  ))}
+                </Select>
+              </FormControl>
+              <FormControlLabel
+                control={
+                  <Checkbox
+                    checked={taskSetup.paused}
+                    onChange={handlePausedChange}
+                  />
+                }
+                label="Paused"
+                sx={{ml: 2}}
+              />
+            </Box>
+          )}
+        <Box sx={{display: 'flex', justifyContent: 'flex-end'}}>
+          <Button variant="outlined" onClick={handleClose} sx={{mr: 2}}>
+            Close
+          </Button>
+          {transactionsSelected.length > 0 || transactionsCount > 0 ? (
+            <Button variant="contained" color="primary" onClick={confirmRerun}>
+              Confirm Batch Rerun
+            </Button>
+          ) : null}
+        </Box>
+      </Box>
+    </Modal>
+  )
+}
+
+export default RerunTransactionsConfirmationModal
diff --git a/packages/transaction-log/src/components/helpers/loader.helper.component.tsx b/packages/transaction-log/src/components/helpers/loader.helper.component.tsx
new file mode 100644
index 00000000..00f0c3a2
--- /dev/null
+++ b/packages/transaction-log/src/components/helpers/loader.helper.component.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import {CircularProgress, Box} from '@mui/material'
+
+const Loader: React.FC = () => {
+  return (
+    <Box
+      display="flex"
+      justifyContent="center"
+      alignItems="center"
+      height="100vh"
+    >
+      <CircularProgress />
+    </Box>
+  )
+}
+
+export default Loader
diff --git a/packages/transaction-log/src/components/helpers/timestampformat.helper.component.tsx b/packages/transaction-log/src/components/helpers/timestampformat.helper.component.tsx
new file mode 100644
index 00000000..6fda0d02
--- /dev/null
+++ b/packages/transaction-log/src/components/helpers/timestampformat.helper.component.tsx
@@ -0,0 +1,28 @@
+const convertTimestampFormat = (isoStringDate: Date) => {
+  const date = new Date(isoStringDate)
+
+  const options: Intl.DateTimeFormatOptions = {
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+    timeZoneName: 'short'
+  }
+  const formattedDate = date.toLocaleString('en-CA', options)
+  const [datePart, timePart] = formattedDate.split(/, | /)
+
+  if (isoStringDate instanceof Date === false) isoStringDate = new Date()
+  const off = isoStringDate.getTimezoneOffset() * -1
+  isoStringDate = new Date(isoStringDate.getTime() + off * 60000)
+
+  return (
+    `${datePart.replace(/\//g, '-')} ${timePart}` +
+    (off < 0 ? '-' : ' +') +
+    ('0' + Math.abs(Math.floor(off / 60))).substr(-2) +
+    ('0' + Math.abs(off % 60)).substr(-2)
+  )
+}
+
+export default convertTimestampFormat
diff --git a/packages/transaction-log/src/declarations.d.ts b/packages/transaction-log/src/declarations.d.ts
index 9a7c00a3..e135b4ab 100644
--- a/packages/transaction-log/src/declarations.d.ts
+++ b/packages/transaction-log/src/declarations.d.ts
@@ -40,3 +40,4 @@ declare module '*.svg' {
 
 declare module '@jembi/openhim-core-api'
 declare module '@jembi/openhim-theme'
+declare module '@jembi/legacy-app'
diff --git a/packages/transaction-log/src/interfaces/index.interface.ts b/packages/transaction-log/src/interfaces/index.interface.ts
index aba50437..3435e6d6 100644
--- a/packages/transaction-log/src/interfaces/index.interface.ts
+++ b/packages/transaction-log/src/interfaces/index.interface.ts
@@ -68,3 +68,8 @@ export interface SettingsDialogProps {
   autoUpdate: boolean
   setAutoUpdate: (value: boolean) => void
 }
+
+export interface StatusButtonProps {
+  status: string
+  buttonText: string
+}
diff --git a/packages/transaction-log/src/root.component.test.tsx b/packages/transaction-log/src/root.component.test.tsx
index 0b4f8eca..e776319e 100644
--- a/packages/transaction-log/src/root.component.test.tsx
+++ b/packages/transaction-log/src/root.component.test.tsx
@@ -3,5 +3,5 @@ import TransactionsLogRootApp from './root.component'
 import React from 'react'
 
 describe('Root component', () => {
-    it.skip('should be in the document', () => {})
+  it.skip('should be in the document', () => {})
 })
diff --git a/packages/transaction-log/src/services/api.service.spec.ts b/packages/transaction-log/src/services/api.service.spec.ts
new file mode 100644
index 00000000..a169956b
--- /dev/null
+++ b/packages/transaction-log/src/services/api.service.spec.ts
@@ -0,0 +1,145 @@
+import {
+  getClients,
+  getClientById,
+  getChannels,
+  getChannelById,
+  getTransactions
+} from './api.service'
+import {
+  fetchClients,
+  fetchClientById,
+  fetchChannels,
+  fetchChannelById,
+  fetchTransactions
+} from '@jembi/openhim-core-api'
+import {Client, Channel} from '../types'
+
+jest.mock('@jembi/openhim-core-api', () => ({
+  fetchClients: jest.fn(),
+  fetchClientById: jest.fn(),
+  fetchChannels: jest.fn(),
+  fetchChannelById: jest.fn(),
+  fetchTransactions: jest.fn()
+}))
+
+describe('API Service Tests', () => {
+  afterEach(() => {
+    jest.clearAllMocks()
+  })
+
+  describe('getClients', () => {
+    it('should return a list of clients', async () => {
+      const mockClients: Client[] = [
+        {_id: '1', name: 'Client One'},
+        {_id: '2', name: 'Client Two'}
+      ]
+
+      ;(fetchClients as jest.Mock).mockResolvedValue(mockClients)
+
+      const clients = await getClients()
+      expect(clients).toEqual(mockClients)
+      expect(fetchClients).toHaveBeenCalledTimes(1)
+    })
+
+    it('should throw an error if fetchClients fails', async () => {
+      const errorMessage = 'Failed to fetch clients'
+      ;(fetchClients as jest.Mock).mockRejectedValue(new Error(errorMessage))
+
+      await expect(getClients()).rejects.toThrow(errorMessage)
+      expect(fetchClients).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('getClientById', () => {
+    it('should return a client by ID', async () => {
+      const mockClient: Client = {_id: '1', name: 'Client One'}
+
+      ;(fetchClientById as jest.Mock).mockResolvedValue(mockClient)
+
+      const client = await getClientById('1')
+      expect(client).toEqual(mockClient)
+      expect(fetchClientById).toHaveBeenCalledWith('1')
+    })
+
+    it('should throw an error if fetchClientById fails', async () => {
+      const errorMessage = 'Failed to fetch client'
+      ;(fetchClientById as jest.Mock).mockRejectedValue(new Error(errorMessage))
+
+      await expect(getClientById('1')).rejects.toThrow(errorMessage)
+      expect(fetchClientById).toHaveBeenCalledWith('1')
+    })
+  })
+
+  describe('getChannels', () => {
+    it('should return a list of channels', async () => {
+      const mockChannels: Channel[] = [
+        {_id: '1', name: 'Channel One'},
+        {_id: '2', name: 'Channel Two'}
+      ]
+
+      ;(fetchChannels as jest.Mock).mockResolvedValue(mockChannels)
+
+      const channels = await getChannels()
+      expect(channels).toEqual(mockChannels)
+      expect(fetchChannels).toHaveBeenCalledTimes(1)
+    })
+
+    it('should throw an error if fetchChannels fails', async () => {
+      const errorMessage = 'Failed to fetch channels'
+      ;(fetchChannels as jest.Mock).mockRejectedValue(new Error(errorMessage))
+
+      await expect(getChannels()).rejects.toThrow(errorMessage)
+      expect(fetchChannels).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('getChannelById', () => {
+    it('should return a channel by ID', async () => {
+      const mockChannel: Channel = {_id: '1', name: 'Channel One'}
+
+      ;(fetchChannelById as jest.Mock).mockResolvedValue(mockChannel)
+
+      const channel = await getChannelById('1')
+      expect(channel).toEqual(mockChannel)
+      expect(fetchChannelById).toHaveBeenCalledWith('1')
+    })
+
+    it('should throw an error if fetchChannelById fails', async () => {
+      const errorMessage = 'Failed to fetch channel'
+      ;(fetchChannelById as jest.Mock).mockRejectedValue(
+        new Error(errorMessage)
+      )
+
+      await expect(getChannelById('1')).rejects.toThrow(errorMessage)
+      expect(fetchChannelById).toHaveBeenCalledWith('1')
+    })
+  })
+
+  describe('getTransactions', () => {
+    it('should return a list of transactions', async () => {
+      const mockTransactions = [
+        {id: '1', type: 'Transaction One'},
+        {id: '2', type: 'Transaction Two'}
+      ]
+
+      ;(fetchTransactions as jest.Mock).mockResolvedValue(mockTransactions)
+
+      const transactions = await getTransactions({})
+      expect(transactions).toEqual(mockTransactions)
+
+      expect(fetchTransactions).toHaveBeenCalledWith({})
+    })
+
+    it('should throw an error if fetchTransactions fails', async () => {
+      const errorMessage = 'Failed to fetch transactions'
+
+      ;(fetchTransactions as jest.Mock).mockRejectedValue(
+        new Error(errorMessage)
+      )
+
+      await expect(getTransactions({})).rejects.toThrow(errorMessage)
+
+      expect(fetchTransactions).toHaveBeenCalledWith({})
+    })
+  })
+})
diff --git a/packages/transaction-log/src/services/api.service.ts b/packages/transaction-log/src/services/api.service.ts
index ac3c713e..259d3cda 100644
--- a/packages/transaction-log/src/services/api.service.ts
+++ b/packages/transaction-log/src/services/api.service.ts
@@ -47,13 +47,9 @@ export async function getChannelById(id: String): Promise<Channel> {
   }
 }
 
-export async function getTransactions(
-  filters: {}
-): Promise<any[]> {
+export async function getTransactions(filters: {}): Promise<any[]> {
   try {
-    const transactions = await fetchTransactions(
-      filters
-    )
+    const transactions = await fetchTransactions(filters)
 
     return transactions
   } catch (error) {