ignore deleted tokens in tokens query

Author: hzrd149

packages/wallet/src/queries/tokens.ts

@@ -4,6 +4,27 @@ import { NostrEvent } from "nostr-tools";
 
 import { getTokenDetails, isTokenDetailsLocked, WALLET_TOKEN_KIND } from "../helpers/tokens.js";
 
+/** removes deleted events from sorted array */
+function filterDeleted(tokens: NostrEvent[]) {
+  const deleted = new Set<string>();
+  return Array.from(tokens)
+    .reverse()
+    .filter((token) => {
+      // skip this event if it a newer event says its deleted
+      if (deleted.has(token.id)) return false;
+      // skip if token is locked
+      if (isTokenDetailsLocked(token)) return false;
+      else {
+        // add ids to deleted array
+        const details = getTokenDetails(token);
+        for (const id of details.del) deleted.add(id);
+      }
+
+      return true;
+    })
+    .reverse();
+}
+
 /** A query that subscribes to all token events for a wallet, passing locked will filter by token locked status */
 export function WalletTokensQuery(pubkey: string, locked?: boolean | undefined): Query<NostrEvent[]> {
   return {
@@ -16,10 +37,13 @@ export function WalletTokensQuery(pubkey: string, locked?: boolean | undefined):
       const timeline = events.timeline({ kinds: [WALLET_TOKEN_KIND], authors: [pubkey] });
 
       return combineLatest([updates, timeline]).pipe(
+        // filter out locked tokens
         map(([_, tokens]) => {
           if (locked === undefined) return tokens;
           else return tokens.filter((t) => isTokenDetailsLocked(t) === locked);
         }),
+        // remove deleted events
+        map(filterDeleted),
       );
     },
   };
@@ -37,33 +61,20 @@ export function WalletBalanceQuery(pubkey: string): Query<Record<string, number>
       const timeline = events.timeline({ kinds: [WALLET_TOKEN_KIND], authors: [pubkey] });
 
       return combineLatest([updates, timeline]).pipe(
-        map(([_, tokens]) => {
-          const deleted = new Set<string>();
-
-          return (
-            tokens
-              // count the tokens from newest to oldest (so del gets applied correctly)
-              .reverse()
-              .reduce(
-                (totals, token) => {
-                  // skip this event if it a newer event says its deleted
-                  if (deleted.has(token.id)) return totals;
-                  // skip if token is locked
-                  if (isTokenDetailsLocked(token)) return totals;
-
-                  const details = getTokenDetails(token);
-                  if (!details) return totals;
-
-                  // add deleted ids
-                  for (const id of details.del) deleted.add(id);
-
-                  const total = details.proofs.reduce((t, p) => t + p.amount, 0);
-                  return { ...totals, [details.mint]: (totals[details.mint] ?? 0) + total };
-                },
-                {} as Record<string, number>,
-              )
-          );
-        }),
+        map(([_, tokens]) => tokens),
+        // filter out deleted tokens
+        map(filterDeleted),
+        // map tokens to totals
+        map((tokens) =>
+          tokens.reduce(
+            (totals, token) => {
+              const details = getTokenDetails(token);
+              const total = details.proofs.reduce((t, p) => t + p.amount, 0);
+              return { ...totals, [details.mint]: (totals[details.mint] ?? 0) + total };
+            },
+            {} as Record<string, number>,
+          ),
+        ),
       );
     },
   };