From 825a566b9a82a10df35c304bbe9659da73ea322d Mon Sep 17 00:00:00 2001 From: Soxasora Date: Wed, 8 Jan 2025 09:59:24 +0100 Subject: [PATCH] resolve merge conflicts --- api/resolvers/notifications.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/resolvers/notifications.js b/api/resolvers/notifications.js index 59045fc8e..d4c4ebd24 100644 --- 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})`