resolve merge conflicts

stackernews · Jan 8, 2025 · 825a566 · 825a566
1 parent 195aaec
commit 825a566
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/api/resolvers/notifications.js b/api/resolvers/notifications.js
@@ -268,7 +268,7 @@ export default {
               WHERE "Withdrawl"."userId" = $1
               AND "Withdrawl".status = 'CONFIRMED'
               AND "Withdrawl".created_at < $2
-              AND ("InvoiceForward"."id" IS NULL OR "Invoice"."actionType" = 'ZAP')
+              AND "InvoiceForward"."id" IS NULL
               GROUP BY "Withdrawl".id
               ORDER BY "sortTime" DESC
               LIMIT ${LIMIT})`