refactor: clean up

Author: lissavxo

pages/payments/index.tsx

@@ -163,7 +163,7 @@ export default function Payments ({ user, userId }: PaybuttonsProps): React.Reac
         sortType: compareNumericString,
         disableSortBy: true,
         Cell: (cellProps) => {
-          return <div style={{ textAlign: 'right', fontWeight: '600' }}> ${formatQuoteValue(cellProps.cell.value.values, user.userProfile.preferredCurrencyId)}</div>
+          return <div style={{ textAlign: 'right', fontWeight: '600' }}> ${formatQuoteValue(cellProps.cell.value, user.userProfile.preferredCurrencyId)}</div>
         }
       },
       {

redis/dashboardCache.ts

@@ -69,14 +69,14 @@ export const getButtonPaymentData = (n: number, periodString: string, paymentLis
           },
           total: {
             payments: 1,
-            revenue: p.values.values
+            revenue: p.values
           }
         }
         buttonPaymentData[b.id] = newEntry
         return
       }
       prevObj.total.payments += 1
-      prevObj.total.revenue = sumQuoteValues(prevObj.total.revenue, p.values.values)
+      prevObj.total.revenue = sumQuoteValues(prevObj.total.revenue, p.values)
       prevObj.displayData.isXec = prevObj.displayData.isXec === true || (p.networkId === XEC_NETWORK_ID)
       prevObj.displayData.isBch = prevObj.displayData.isBch === true || (p.networkId === BCH_NETWORK_ID)
       const lastPayment = prevObj.displayData.lastPayment as number
@@ -100,8 +100,8 @@ export const sumPaymentsValue = function (paymentList: Payment[]): QuoteValues {
   }
 
   for (const p of paymentList) {
-    ret.usd = ret.usd.plus(p.values.values.usd)
-    ret.cad = ret.cad.plus(p.values.values.cad)
+    ret.usd = ret.usd.plus(p.values.usd)
+    ret.cad = ret.cad.plus(p.values.cad)
   }
   return ret
 }
@@ -161,11 +161,11 @@ const generateDashboardDataFromStream = async function (
           if (paybuttonIds !== undefined && paybuttonIds.length > 0) {
             const paymentButtonIds = payment.buttonDisplayDataList.map(b => b.id)
             if (paymentButtonIds.some(item => paybuttonIds.includes(item))) {
-              revenueAccumulators[period][index] = sumQuoteValues(revenueAccumulators[period][index], payment.values.values)
+              revenueAccumulators[period][index] = sumQuoteValues(revenueAccumulators[period][index], payment.values)
               paymentCounters[period][index] += 1
             }
           } else {
-            revenueAccumulators[period][index] = sumQuoteValues(revenueAccumulators[period][index], payment.values.values)
+            revenueAccumulators[period][index] = sumQuoteValues(revenueAccumulators[period][index], payment.values)
             paymentCounters[period][index] += 1
           }
         }
@@ -315,13 +315,13 @@ function processButtonData (
             lastPayment: payment.timestamp
           },
           total: {
-            revenue: payment.values.values,
+            revenue: payment.values,
             payments: 1
           }
         }
       } else {
         const buttonData = buttonDataAccumulators[period][button.id]
-        buttonData.total.revenue = sumQuoteValues(buttonData.total.revenue, payment.values.values)
+        buttonData.total.revenue = sumQuoteValues(buttonData.total.revenue, payment.values)
         buttonData.total.payments += 1
         buttonData.displayData.lastPayment = Math.max(
           buttonData.displayData.lastPayment ?? 0,

redis/paymentCache.ts

@@ -81,10 +81,7 @@ export const generatePaymentFromTx = async (tx: TransactionsWithPaybuttonsAndPri
   }
   return {
     timestamp: tx.timestamp,
-    values: {
-      values,
-      amount: tx.amount
-    },
+    values,
     amount: tx.amount,
     networkId: tx.address.networkId,
     hash: tx.hash,
@@ -113,7 +110,7 @@ export const generateAndCacheGroupedPaymentsAndInfoForAddress = async (address:
     paymentCount
   }
 
-  paymentList = paymentList.filter((p) => p.values.values.usd > new Prisma.Decimal(0))
+  paymentList = paymentList.filter((p) => p.values.usd > new Prisma.Decimal(0))
   const groupedPayments = getPaymentsByWeek(address.address, paymentList)
   return {
     groupedPayments,
@@ -197,7 +194,7 @@ export const cacheManyTxs = async (txs: TransactionsWithPaybuttonsAndPrices[]):
   const zero = new Prisma.Decimal(0)
   for (const tx of txs.filter(tx => tx.amount > zero)) {
     const payment = await generatePaymentFromTx(tx)
-    if (payment.values.values.usd !== new Prisma.Decimal(0)) {
+    if (payment.values.usd !== new Prisma.Decimal(0)) {
       const paymentsGroupedByKey = getPaymentsByWeek(tx.address.address, [payment])
       void await cacheGroupedPaymentsAppend(paymentsGroupedByKey)
     }

redis/types.ts

@@ -46,14 +46,10 @@ export interface ButtonDisplayData {
   lastPayment?: number
   providerUserId?: string
 }
-export interface AmountData {
-  values: QuoteValues
-  amount: Decimal
-}
 
 export interface Payment {
   timestamp: number
-  values: AmountData
+  values: QuoteValues
   amount?: Decimal
   networkId: number
   hash: string

services/transactionService.ts

@@ -706,10 +706,7 @@ export async function getPaymentsByUserIdOrderedByButtonName (
       payments.push({
         amount: tx.amount,
         timestamp: tx.timestamp,
-        values: {
-          values: ret,
-          amount: tx.amount
-        },
+        values: ret,
         networkId: tx.networkId,
         hash: tx.hash,
         buttonDisplayDataList