Skip to content

Commit f95d71b

Browse files
committed
Stop hiding userCancel in notifications
As mentioned in a previous commit, I want to show anything that will not be attempted anymore in notifications. Before, I wanted to hide manually cancelled invoices but to not change experience unnecessarily and to decrease mental overhead, I changed my mind.
1 parent 4a4658d commit f95d71b

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

api/resolvers/notifications.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,9 @@ export default {
354354
-- we want to show notifications only if no more automated retries will be attempted.
355355
-- automated retries depend on if the user has wallets or not.
356356
-- failed posts are an exception where we want to show them immediately and thus never automatically retry.
357-
${meFull.sendWallets ? `AND ("Invoice"."paymentAttempt" >= ${WALLET_MAX_RETRIES} OR "Invoice"."actionType" = 'ITEM_CREATE')` : ''}
357+
${meFull.sendWallets
358+
? `AND ("Invoice"."paymentAttempt" >= ${WALLET_MAX_RETRIES} OR "Invoice"."actionType" = 'ITEM_CREATE' OR "Invoice"."userCancel" = true)`
359+
: ''}
358360
AND (
359361
"Invoice"."actionType" = 'ITEM_CREATE' OR
360362
"Invoice"."actionType" = 'ZAP' OR

api/resolvers/user.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,9 @@ export default {
554554
},
555555
{
556556
actionType: 'ITEM_CREATE'
557+
},
558+
{
559+
userCancel: true
557560
}
558561
]
559562
}

0 commit comments

Comments
 (0)