refactor: clean up

Author: lissavxo

pages/payments/index.tsx

@@ -147,7 +147,7 @@ export default function Payments ({ user, userId }: PaybuttonsProps): React.Reac
         accessor: 'amount',
         sortType: compareNumericString,
         Cell: (cellProps) => {
-          const { networkId, amount } = cellProps.cell.row.original.amount
+          const { networkId, amount } = cellProps.cell.row.original
           const networkTicker = NETWORK_TICKERS_FROM_ID[networkId]
           const formattedAmount = Number(amount).toLocaleString(undefined, {
             minimumFractionDigits: DECIMALS[networkTicker],

redis/paymentCache.ts

@@ -83,13 +83,9 @@ export const generatePaymentFromTx = async (tx: TransactionsWithPaybuttonsAndPri
     timestamp: tx.timestamp,
     values: {
       values,
-      amount: tx.amount,
-      networkId: tx.address.networkId
-    },
-    amount: {
-      amount: tx.amount,
-      networkId: tx.address.networkId
+      amount: tx.amount
     },
+    amount: tx.amount,
     networkId: tx.address.networkId,
     hash: tx.hash,
     buttonDisplayDataList,

redis/types.ts

@@ -48,18 +48,12 @@ export interface ButtonDisplayData {
 export interface AmountData {
   values: QuoteValues
   amount: Decimal
-  networkId?: number
-}
-
-export interface Amount {
-  amount: Decimal
-  networkId?: number
 }
 
 export interface Payment {
   timestamp: number
   values: AmountData
-  amount?: Amount
+  amount?: Decimal
   networkId: number
   hash: string
   buttonDisplayDataList: ButtonDisplayData[]

services/transactionService.ts

@@ -704,10 +704,7 @@ export async function getPaymentsByUserIdOrderedByButtonName (
     })
     if (tx.amount > 0) {
       payments.push({
-        amount: {
-          amount: tx.amount,
-          networkId: tx.networkId
-        },
+        amount: tx.amount,
         timestamp: tx.timestamp,
         values: {
           values: ret,