fix: button sort

Author: lissavxo

pages/payments/index.tsx

@@ -146,9 +146,8 @@ export default function Payments ({ user, userId }: PaybuttonsProps): React.Reac
         Header: () => (<div style={{ textAlign: 'right' }}>Amount</div>),
         accessor: 'amount',
         sortType: compareNumericString,
-        Cell: ({ cell }) => {
-          const original = cell.value
-          const { networkId, amount } = original
+        Cell: (cellProps) => {
+          const { networkId, amount } = cellProps.cell.row.original.amount
           const networkTicker = NETWORK_TICKERS_FROM_ID[networkId]
           const formattedAmount = Number(amount).toLocaleString(undefined, {
             minimumFractionDigits: DECIMALS[networkTicker],

services/transactionService.ts

@@ -151,11 +151,10 @@ export async function fetchTransactionsByAddressListWithPagination (
   pageSize: number,
   orderBy?: string,
   orderDesc = true,
-  networkIdsListFilter?: number[],
+  networkIdsListFilter?: number[]
 ): Promise<TransactionsWithPaybuttonsAndPrices[]> {
-
   const orderDescString: Prisma.SortOrder = orderDesc ? 'desc' : 'asc'
-  
+
   // Get query for orderBy that works with nested properties (e.g. `address.networkId`)
   let orderByQuery
   if (orderBy !== undefined && orderBy !== '') {
@@ -192,7 +191,7 @@ export async function fetchTransactionsByAddressListWithPagination (
     include: includePaybuttonsAndPrices,
     orderBy: orderByQuery,
     skip: page * pageSize,
-    take: pageSize,
+    take: pageSize
   })
 }
 
@@ -578,7 +577,7 @@ export async function fetchTransactionsByPaybuttonIdWithPagination (
     pageSize,
     orderBy,
     orderDesc,
-    networkIds);
+    networkIds)
 
   if (transactions.length === 0) {
     throw new Error(RESPONSE_MESSAGES.NO_TRANSACTION_FOUND_404.message)
@@ -705,6 +704,10 @@ export async function getPaymentsByUserIdOrderedByButtonName (
     })
     if (tx.amount > 0) {
       payments.push({
+        amount: {
+          amount: tx.amount,
+          networkId: tx.networkId
+        },
         timestamp: tx.timestamp,
         values: {
           values: ret,