Skip to content

fix: button detail for 0 txs #1016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Klakurka merged 1 commit into from
Jun 20, 2025
Merged

fix: button detail for 0 txs #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions components/TableContainer/TableContainerGetter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand All @@ -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 {
Expand Down Expand Up @@ -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>
))}
Expand All @@ -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>
)
Expand Down
4 changes: 2 additions & 2 deletions components/Transaction/PaybuttonTransactions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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: {
Expand Down
4 changes: 0 additions & 4 deletions services/transactionService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down