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.
stackernews · Feb 12, 2025 · f95d71b · f95d71b
1 parent 4a4658d
commit f95d71b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/api/resolvers/notifications.js b/api/resolvers/notifications.js
@@ -354,7 +354,9 @@ export default {
         -- we want to show notifications only if no more automated retries will be attempted.
         -- automated retries depend on if the user has wallets or not.
         -- failed posts are an exception where we want to show them immediately and thus never automatically retry.
-        ${meFull.sendWallets ? `AND ("Invoice"."paymentAttempt" >= ${WALLET_MAX_RETRIES} OR "Invoice"."actionType" = 'ITEM_CREATE')` : ''}
+        ${meFull.sendWallets
+          ? `AND ("Invoice"."paymentAttempt" >= ${WALLET_MAX_RETRIES} OR "Invoice"."actionType" = 'ITEM_CREATE' OR "Invoice"."userCancel" = true)`
+          : ''}
         AND (
           "Invoice"."actionType" = 'ITEM_CREATE' OR
           "Invoice"."actionType" = 'ZAP' OR

diff --git a/api/resolvers/user.js b/api/resolvers/user.js
@@ -554,6 +554,9 @@ export default {
                   },
                   {
                     actionType: 'ITEM_CREATE'
+                  },
+                  {
+                    userCancel: true
                   }
                 ]
               }
-Original file line number
+Diff line change
@@ Expand Up / @@ -554,6 +554,9 @@ export default { @@
                       },
                       {
                         actionType: 'ITEM_CREATE'
+                      },
+                      {
+                        userCancel: true
                       }
                     ]
                   }
@@ Expand Down @@