applesauce-wallet 0.0.0-next-20250310162525 → 0.0.0-next-20250310173615

package/dist/queries/tokens.js

@@ -1,5 +1,27 @@
 import { combineLatest, filter, map, startWith } from "rxjs";
 import { getTokenDetails, isTokenDetailsLocked, WALLET_TOKEN_KIND } from "../helpers/tokens.js";
+/** removes deleted events from sorted array */
+function filterDeleted(tokens) {
+    const deleted = new Set();
+    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, locked) {
     return {
@@ -7,12 +29,16 @@ export function WalletTokensQuery(pubkey, locked) {
         run: (events) => {
             const updates = events.updates.pipe(filter((e) => e.kind === WALLET_TOKEN_KIND && e.pubkey === pubkey), startWith(undefined));
             const timeline = events.timeline({ kinds: [WALLET_TOKEN_KIND], authors: [pubkey] });
-            return combineLatest([updates, timeline]).pipe(map(([_, tokens]) => {
+            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));
         },
     };
 }
@@ -23,28 +49,15 @@ export function WalletBalanceQuery(pubkey) {
         run: (events) => {
             const updates = events.updates.pipe(filter((e) => e.kind === WALLET_TOKEN_KIND && e.pubkey === pubkey), startWith(undefined));
             const timeline = events.timeline({ kinds: [WALLET_TOKEN_KIND], authors: [pubkey] });
-            return combineLatest([updates, timeline]).pipe(map(([_, tokens]) => {
-                const deleted = new Set();
-                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 };
-                }, {}));
-            }));
+            return combineLatest([updates, timeline]).pipe(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 };
+            }, {})));
         },
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-wallet",
-  "version": "0.0.0-next-20250310162525",
+  "version": "0.0.0-next-20250310173615",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -42,7 +42,7 @@
     }
   },
   "dependencies": {
-    "applesauce-core": "0.0.0-next-20250310162525",
+    "applesauce-core": "0.0.0-next-20250310173615",
     "nostr-tools": "^2.10.4",
     "rxjs": "^7.8.1"
   },