fix: remove unnecessary filters

geyserfund · Jun 8, 2023 · fc7f404 · fc7f404
1 parent 1eb8511
commit fc7f404
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 22 deletions.
diff --git a/src/graphql/queries/project.ts b/src/graphql/queries/project.ts
@@ -174,7 +174,6 @@ export const QUERY_PROJECT_DASHBOARD_FUNDERS = gql`
       }
       fundingTxs {
         email
-        paidAt
         amount
         uuid
       }

diff --git a/src/pages/projectDashboard/sections/ProjectContributors.tsx b/src/pages/projectDashboard/sections/ProjectContributors.tsx
@@ -153,16 +153,14 @@ export const ProjectContributors = () => {
         render({ fundingTxs }: Funder) {
           return (
             <VStack alignItems="start">
-              {fundingTxs
-                .filter((tx) => Boolean(tx.paidAt))
-                .map((tx) => (
-                  <Tooltip
-                    key={tx.uuid}
-                    label={<SatoshiAmount>{tx.amount}</SatoshiAmount>}
-                  >
-                    <Text variant="caption">{tx.uuid}</Text>
-                  </Tooltip>
-                ))}
+              {fundingTxs.map((tx) => (
+                <Tooltip
+                  key={tx.uuid}
+                  label={<SatoshiAmount>{tx.amount}</SatoshiAmount>}
+                >
+                  <Text variant="caption">{tx.uuid}</Text>
+                </Tooltip>
+              ))}
             </VStack>
           )
         },
@@ -227,10 +225,8 @@ export const ProjectContributors = () => {
           funder.amountFunded || '-',
           rewardValue || '-',
           dateString || '-',
-          funder.fundingTxs?.find((val) => val.email)?.email || '-',
-          funder.fundingTxs
-            .filter((tx) => Boolean(tx.paidAt))
-            .reduce((acc, tx) => `${acc} ${tx.uuid}`, ''),
+          funder.fundingTxs.find((val) => val.email)?.email || '-',
+          funder.fundingTxs.reduce((acc, tx) => `${acc} ${tx.uuid}`, ''),
         ]
         csvData.push(funderData)
       }

diff --git a/src/types/generated/graphql.ts b/src/types/generated/graphql.ts
@@ -254,8 +254,6 @@ export type Entry = {
   image?: Maybe<Scalars['String']>
   /** Project within which the Entry was created. */
   project?: Maybe<Project>
-  /** @deprecated This field was replaced by the status field and will eventually be removed. */
-  published: Scalars['Boolean']
   publishedAt?: Maybe<Scalars['String']>
   status: EntryStatus
   /** Title of the Entry. */
@@ -467,7 +465,8 @@ export type FundingTx = {
   source: Scalars['String']
   sourceResource?: Maybe<SourceResource>
   status: FundingStatus
-  uuid: Scalars['String']
+  /** Private reference code viewable only by the Funder and the ProjectOwner related to this FundingTx */
+  uuid?: Maybe<Scalars['String']>
 }
 
 export type FundingTxConfirmedSubscriptionResponse = {
@@ -2404,7 +2403,6 @@ export type EntryResolvers<
   id?: Resolver<ResolversTypes['BigInt'], ParentType, ContextType>
   image?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>
   project?: Resolver<Maybe<ResolversTypes['Project']>, ParentType, ContextType>
-  published?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>
   publishedAt?: Resolver<
     Maybe<ResolversTypes['String']>,
     ParentType,
@@ -2578,7 +2576,7 @@ export type FundingTxResolvers<
     ContextType
   >
   status?: Resolver<ResolversTypes['FundingStatus'], ParentType, ContextType>
-  uuid?: Resolver<ResolversTypes['String'], ParentType, ContextType>
+  uuid?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>
 }
 
@@ -4102,7 +4100,7 @@ export type FundingTxWithInvoiceStatusFragment = {
 export type FundingTxFragment = {
   __typename?: 'FundingTx'
   id: any
-  uuid: string
+  uuid?: string | null
   invoiceId: string
   paymentRequest?: string | null
   amount: number
@@ -5311,7 +5309,8 @@ export type ProjectDashboardFundersQuery = {
     fundingTxs: Array<{
       __typename?: 'FundingTx'
       email?: string | null
-      uuid: string
+      amount: number
+      uuid?: string | null
     }>
     rewards: Array<{
       __typename?: 'FunderReward'
@@ -8937,6 +8936,7 @@ export const ProjectDashboardFundersDocument = gql`
       }
       fundingTxs {
         email
+        amount
         uuid
       }
       rewards {