@1sat/sweep-ui 0.0.95 → 0.0.96

package/dist/index.js

@@ -1,4 +1,5 @@
 // src/components/SweepApp.tsx
+import { groupBsv20Tokens as groupBsv20Tokens2 } from "@1sat/actions";
 import { PrivateKey as PrivateKey3 } from "@bsv/sdk";
 import { useCallback as useCallback2, useEffect as useEffect2, useMemo, useState as useState5 } from "react";
 import { Toaster, toast } from "sonner";
@@ -84,7 +85,6 @@ function toScannedAssets(result) {
     funding: result.funding,
     ordinals: result.ordinals.map(enrichOrdinal),
     opnsNames: result.opnsNames.map(enrichOrdinal),
-    listings: result.listings.map(enrichOrdinal),
     bsv21Tokens: enrichTokenBalances(result.bsv21Tokens),
     bsv20Tokens: result.bsv20Tokens,
     locked: result.locked,
@@ -276,13 +276,16 @@ async function legacyBurnOrdinals(params) {
 
 // src/lib/sweeper.ts
 import {
+  SWEEP_BATCH_SIZE,
+  bsv21SweepBatches,
   createContext,
+  groupBsv20Tokens,
   prepareSweepInputs,
   sweepBsv,
+  sweepBsv20,
   sweepBsv21,
   sweepOrdinals
 } from "@1sat/actions";
-var SWEEP_BATCH_SIZE = 25;
 function getOwner(output) {
   return output.events?.find((e) => e.startsWith("own:"))?.slice(4);
 }
@@ -304,49 +307,15 @@ function chunk(items, size) {
   return batches;
 }
 async function executeSweep(params) {
-  const {
-    wallet,
-    keys,
-    funding,
-    ordinals,
-    listings = [],
-    amount,
-    onProgress
-  } = params;
+  const { wallet, keys, funding, ordinals, amount, onProgress } = params;
   const ctx = createContext(wallet, { services: getServices(), chain: "main" });
   const result = {
     ordinalTxids: [],
-    listingTxids: [],
+    bsv20Txids: [],
     bsv21Txids: [],
     errors: [],
-    sweptOutpoints: [],
-    cancelledListings: []
+    sweptOutpoints: []
   };
-  if (listings.length > 0) {
-    const batches = chunk(listings, SWEEP_BATCH_SIZE);
-    for (let b = 0;b < batches.length; b++) {
-      const batch = batches[b];
-      onProgress(`Cancelling ${batch.length} OrdLock listing${batch.length !== 1 ? "s" : ""} into wallet...`);
-      try {
-        const inputs = await prepareSweepInputs(ctx, batch);
-        const cancelResult = await sweepOrdinals.execute(ctx, {
-          inputs,
-          keys: buildKeys(batch, keys, inputs)
-        });
-        if (cancelResult.error)
-          throw new Error(cancelResult.error);
-        const txid = cancelResult.txid?.trim();
-        if (!txid)
-          throw new Error("Cancellation returned no transaction ID");
-        result.listingTxids.push(txid);
-        result.cancelledListings.push(...batch.map((o) => o.outpoint));
-      } catch (e) {
-        result.errors.push(`Listings batch ${b + 1}: ${e instanceof Error ? e.message : String(e)}`);
-        onProgress("Sweep stopped with errors");
-        return result;
-      }
-    }
-  }
   if (funding.length > 0) {
     onProgress(`Sweeping ${funding.length} BSV UTXOs...`);
     try {
@@ -398,7 +367,46 @@ async function executeSweep(params) {
 async function sweepBsv21Token(params) {
   const { wallet, keys, token, onProgress } = params;
   const ctx = createContext(wallet, { services: getServices(), chain: "main" });
-  onProgress(`Sweeping ${token.symbol ?? token.tokenId.slice(0, 8)}...`);
+  const txids = [];
+  const errors = [];
+  const name = token.symbol ?? token.tokenId.slice(0, 8);
+  for (const batch of bsv21SweepBatches(token.outputs)) {
+    onProgress(`Sweeping ${name}...`);
+    try {
+      const sweepInputs = await prepareSweepInputs(ctx, batch);
+      const sweepInputMap = new Map(sweepInputs.map((s) => [s.outpoint, s]));
+      const inputs = batch.map((out) => {
+        const base = sweepInputMap.get(out.outpoint);
+        if (!base)
+          throw new Error(`Missing sweep input for ${out.outpoint}`);
+        return {
+          ...base,
+          tokenId: token.tokenId,
+          amount: token.amounts.get(out.outpoint) ?? "0"
+        };
+      });
+      const result = await sweepBsv21.execute(ctx, {
+        inputs,
+        keys: buildKeys(batch, keys)
+      });
+      if (result.error)
+        errors.push(result.error);
+      else if (result.txid)
+        txids.push(result.txid);
+    } catch (e) {
+      errors.push(e instanceof Error ? e.message : String(e));
+    }
+  }
+  return {
+    txid: txids.at(-1),
+    txids,
+    error: errors[0]
+  };
+}
+async function sweepBsv20Token(params) {
+  const { wallet, keys, token, onProgress } = params;
+  const ctx = createContext(wallet, { services: getServices(), chain: "main" });
+  onProgress(`Sweeping ${token.tick}...`);
   try {
     const sweepInputs = await prepareSweepInputs(ctx, token.outputs);
     const sweepInputMap = new Map(sweepInputs.map((s) => [s.outpoint, s]));
@@ -408,12 +416,14 @@ async function sweepBsv21Token(params) {
         throw new Error(`Missing sweep input for ${out.outpoint}`);
       return {
         ...base,
-        tokenId: token.tokenId,
+        tick: token.tick,
         amount: token.amounts.get(out.outpoint) ?? "0"
       };
     });
-    const tokenKeys = buildKeys(token.outputs, keys);
-    const result = await sweepBsv21.execute(ctx, { inputs, keys: tokenKeys });
+    const result = await sweepBsv20.execute(ctx, {
+      inputs,
+      keys: buildKeys(token.outputs, keys)
+    });
     if (result.error)
       return { error: result.error };
     return { txid: result.txid };
@@ -421,6 +431,68 @@ async function sweepBsv21Token(params) {
     return { error: e instanceof Error ? e.message : String(e) };
   }
 }
+async function sweepAllClasses(params) {
+  const { wallet, keys, assets, amount, onProgress } = params;
+  const result = {
+    ordinalTxids: [],
+    bsv20Txids: [],
+    bsv21Txids: [],
+    errors: [],
+    sweptOutpoints: []
+  };
+  const first = await executeSweep({
+    wallet,
+    keys,
+    funding: assets.funding,
+    ordinals: assets.ordinals,
+    amount,
+    onProgress
+  });
+  result.bsvTxid = first.bsvTxid;
+  result.ordinalTxids.push(...first.ordinalTxids);
+  result.sweptOutpoints.push(...first.sweptOutpoints);
+  result.errors.push(...first.errors);
+  if (assets.opnsNames.length > 0) {
+    const opns = await executeSweep({
+      wallet,
+      keys,
+      funding: [],
+      ordinals: assets.opnsNames,
+      onProgress
+    });
+    result.ordinalTxids.push(...opns.ordinalTxids);
+    result.sweptOutpoints.push(...opns.sweptOutpoints);
+    result.errors.push(...opns.errors);
+  }
+  for (const token of groupBsv20Tokens(assets.bsv20Tokens)) {
+    const swept = await sweepBsv20Token({
+      wallet,
+      keys,
+      token,
+      onProgress
+    });
+    if (swept.error)
+      result.errors.push(`BSV-20 ${token.tick}: ${swept.error}`);
+    else if (swept.txid)
+      result.bsv20Txids.push(swept.txid);
+  }
+  for (const token of assets.bsv21Tokens) {
+    if (token.outputs.length === 0)
+      continue;
+    const swept = await sweepBsv21Token({
+      wallet,
+      keys,
+      token,
+      onProgress
+    });
+    result.bsv21Txids.push(...swept.txids);
+    if (swept.error) {
+      result.errors.push(`BSV-21 ${token.symbol ?? token.tokenId.slice(0, 8)}: ${swept.error}`);
+    }
+  }
+  onProgress(result.errors.length > 0 ? "Sweep stopped with errors" : "Sweep complete");
+  return result;
+}
 
 // src/lib/wallet.ts
 import {
@@ -452,6 +524,7 @@ function isConnected() {
 }
 
 // src/components/asset-preview.tsx
+import { isListedOutput } from "@1sat/actions";
 import { useState } from "react";
 
 // src/lib/utils.ts
@@ -608,6 +681,13 @@ function OrdinalCard({
       /* @__PURE__ */ jsxs("div", {
         className: "min-h-[2rem] flex flex-col justify-end",
         children: [
+          isListedOutput(ordinal) && /* @__PURE__ */ jsx4("div", {
+            className: "mb-1",
+            children: /* @__PURE__ */ jsx4("span", {
+              className: "inline-block px-1 py-0.5 text-[9px] rounded bg-amber-500/20 text-amber-400",
+              children: "listed"
+            })
+          }),
           subtype && /* @__PURE__ */ jsx4("div", {
             className: "mb-1",
             children: /* @__PURE__ */ jsx4("span", {
@@ -966,6 +1046,7 @@ function TokenRow({
   onSweep,
   walletConnected
 }) {
+  const listed = tb.outputs.filter(isListedOutput).length;
   return /* @__PURE__ */ jsxs("div", {
     className: `flex items-center justify-between p-3 rounded-lg border ${tb.isActive ? "bg-muted/30 border-purple-500/10" : "bg-muted/20 border-muted/20 opacity-60"}`,
     children: [
@@ -987,7 +1068,7 @@ function TokenRow({
                 children: [
                   /* @__PURE__ */ jsx4("span", {
                     className: "font-medium text-foreground",
-                    children: tb.symbol || tb.tokenId.slice(0, 8) + "..."
+                    children: tb.symbol || `${tb.tokenId.slice(0, 8)}...`
                   }),
                   tb.isActive ? /* @__PURE__ */ jsx4("span", {
                     className: "px-1.5 py-0.5 text-[9px] rounded bg-green-600/20 text-green-700 dark:text-green-400",
@@ -1011,6 +1092,7 @@ function TokenRow({
                       tb.outputs.length,
                       " output",
                       tb.outputs.length !== 1 ? "s" : "",
+                      listed ? `, ${listed} listed` : "",
                       ")"
                     ]
                   })
@@ -1020,7 +1102,7 @@ function TokenRow({
           })
         ]
       }),
-      tb.isActive && onSweep && /* @__PURE__ */ jsx4(Button, {
+      onSweep && /* @__PURE__ */ jsx4(Button, {
         size: "sm",
         onClick: () => onSweep(tb.tokenId),
         disabled: !walletConnected,
@@ -1082,89 +1164,80 @@ function Bsv21Section({
     ]
   });
 }
-function Bsv20Section({ tokens }) {
-  if (tokens.length === 0)
-    return null;
-  return /* @__PURE__ */ jsxs("div", {
-    className: "border border-muted/30 bg-muted/10 p-4 rounded-lg",
-    children: [
-      /* @__PURE__ */ jsxs("div", {
-        className: "flex items-center gap-2 mb-2",
-        children: [
-          /* @__PURE__ */ jsx4("span", {
-            className: "h-2 w-2 rounded-full bg-muted-foreground"
-          }),
-          /* @__PURE__ */ jsx4("span", {
-            className: "text-sm font-semibold text-muted-foreground",
-            children: "BSV-20 Tokens"
-          })
-        ]
-      }),
-      /* @__PURE__ */ jsx4("p", {
-        className: "text-xs text-muted-foreground mb-2",
-        children: "Cannot be swept automatically."
-      }),
-      /* @__PURE__ */ jsxs("div", {
-        className: "flex flex-wrap gap-2",
-        children: [
-          tokens.slice(0, 10).map((o) => {
-            const tickEvent = o.events?.find((e) => e.startsWith("tick:"));
-            const tick = tickEvent ? tickEvent.slice(5) : "Token";
-            return /* @__PURE__ */ jsx4("span", {
-              className: "px-2 py-1 text-xs rounded bg-muted/30 text-muted-foreground",
-              children: tick
-            }, o.outpoint);
-          }),
-          tokens.length > 10 && /* @__PURE__ */ jsxs("span", {
-            className: "text-xs text-muted-foreground",
-            children: [
-              "+",
-              tokens.length - 10,
-              " more"
-            ]
-          })
-        ]
-      })
-    ]
-  });
-}
-function ListingsSection({
-  listings,
-  walletConnected,
-  onCancel
+function Bsv20Section({
+  tokens,
+  unparsedCount = 0,
+  onSweep,
+  walletConnected
 }) {
-  if (listings.length === 0)
+  if (tokens.length === 0 && unparsedCount === 0)
     return null;
   return /* @__PURE__ */ jsxs("div", {
-    className: "border border-primary/20 bg-primary/5 p-4 rounded-lg space-y-3",
+    className: "border border-teal-500/20 bg-teal-500/5 p-4 rounded-lg",
     children: [
       /* @__PURE__ */ jsxs("div", {
-        className: "flex items-center gap-2",
+        className: "flex items-center gap-2 mb-3",
         children: [
           /* @__PURE__ */ jsx4("span", {
-            className: "h-2 w-2 rounded-full bg-primary"
+            className: "h-2 w-2 rounded-full bg-teal-500"
           }),
           /* @__PURE__ */ jsx4("span", {
-            className: "text-sm font-semibold text-primary",
-            children: "OrdLock Listings"
+            className: "text-sm font-semibold text-teal-500",
+            children: "BSV-20 Tokens"
           })
         ]
       }),
-      /* @__PURE__ */ jsxs("p", {
-        className: "text-xs text-muted-foreground",
+      unparsedCount > 0 && /* @__PURE__ */ jsxs("p", {
+        className: "text-xs text-muted-foreground mb-3",
         children: [
-          listings.length,
-          " listed UTXO",
-          listings.length !== 1 ? "s" : "",
-          ". These are cancelled into your BRC-100 wallet on BSV sweep."
+          unparsedCount,
+          " UTXO",
+          unparsedCount !== 1 ? "s" : "",
+          " with no parseable tick/amt — leftover, not swept."
         ]
       }),
-      onCancel && /* @__PURE__ */ jsx4(Button, {
-        size: "sm",
-        disabled: !walletConnected,
-        onClick: onCancel,
-        className: "w-full",
-        children: "Cancel listings into wallet"
+      /* @__PURE__ */ jsx4("div", {
+        className: "space-y-3",
+        children: tokens.map((tb) => {
+          const listed = tb.outputs.filter(isListedOutput).length;
+          return /* @__PURE__ */ jsxs("div", {
+            className: "flex items-center justify-between p-3 rounded-lg border bg-muted/30 border-teal-500/10",
+            children: [
+              /* @__PURE__ */ jsxs("div", {
+                children: [
+                  /* @__PURE__ */ jsx4("div", {
+                    className: "font-medium text-foreground",
+                    children: tb.tick
+                  }),
+                  /* @__PURE__ */ jsxs("div", {
+                    className: "text-xs text-muted-foreground",
+                    children: [
+                      tb.totalAmount.toString(),
+                      /* @__PURE__ */ jsxs("span", {
+                        className: "ml-2",
+                        children: [
+                          "(",
+                          tb.outputs.length,
+                          " output",
+                          tb.outputs.length !== 1 ? "s" : "",
+                          listed ? `, ${listed} listed` : "",
+                          ")"
+                        ]
+                      })
+                    ]
+                  })
+                ]
+              }),
+              onSweep && /* @__PURE__ */ jsx4(Button, {
+                size: "sm",
+                onClick: () => onSweep(tb.tick),
+                disabled: !walletConnected,
+                title: walletConnected ? undefined : "Connect BRC-100 wallet to sweep",
+                children: "Sweep to Wallet"
+              })
+            ]
+          }, tb.tick);
+        })
       })
     ]
   });
@@ -1321,6 +1394,7 @@ function ConnectWallet({
 }
 
 // src/components/opns-section.tsx
+import { isListedOutput as isListedOutput2 } from "@1sat/actions";
 import { useEffect, useState as useState3 } from "react";
 import { jsx as jsx6, jsxs as jsxs3 } from "react/jsx-runtime";
 function OpnsSection({
@@ -1482,6 +1556,10 @@ function OpnsSection({
                 className: "text-sm text-foreground truncate",
                 children: displayName
               }),
+              isListedOutput2(item) && /* @__PURE__ */ jsx6("span", {
+                className: "shrink-0 text-[10px] font-medium px-1.5 py-0.5 rounded bg-amber-500/20 text-amber-400",
+                children: "listed"
+              }),
               !validating && overlayValid.has(item.outpoint) && (overlayValid.get(item.outpoint) ? /* @__PURE__ */ jsx6("span", {
                 className: "shrink-0 text-[10px] font-medium px-1.5 py-0.5 rounded bg-green-500/20 text-green-400",
                 children: "valid"
@@ -2317,6 +2395,8 @@ function SweepApp({
       { label, txid, timestamp: new Date, error }
     ]);
   }, []);
+  const groupedBsv20 = useMemo(() => assets ? groupBsv20Tokens2(assets.bsv20Tokens) : [], [assets]);
+  const unparsedBsv20 = assets ? assets.bsv20Tokens.length - groupedBsv20.reduce((n, t) => n + t.outputs.length, 0) : 0;
   const tabs = useMemo(() => {
     if (!assets)
       return [];
@@ -2329,16 +2409,24 @@ function SweepApp({
       });
     if (assets.opnsNames.length > 0)
       t.push({ id: "opns", label: "OpNS", count: assets.opnsNames.length });
+    if (groupedBsv20.length > 0 || unparsedBsv20 > 0)
+      t.push({
+        id: "bsv20",
+        label: "BSV-20",
+        count: groupedBsv20.reduce((n, tok) => n + tok.outputs.length, 0)
+      });
     if (assets.bsv21Tokens.length > 0)
-      t.push({ id: "bsv21", label: "BSV-21", count: assets.bsv21Tokens.length });
-    if (assets.bsv20Tokens.length > 0)
-      t.push({ id: "bsv20", label: "BSV-20", count: assets.bsv20Tokens.length });
+      t.push({
+        id: "bsv21",
+        label: "BSV-21",
+        count: assets.bsv21Tokens.reduce((n, tok) => n + tok.outputs.length, 0)
+      });
     if (assets.locked.length > 0)
       t.push({ id: "locks", label: "Locks", count: assets.locked.length });
     if (assets.run.length > 0)
       t.push({ id: "run", label: "RUN", count: assets.run.length });
     return t;
-  }, [assets]);
+  }, [assets, groupedBsv20, unparsedBsv20]);
   const handleToggleOrdinal = useCallback2((outpoint) => {
     setSelectedOrdinals((prev) => {
       const next = new Set(prev);
@@ -2400,17 +2488,18 @@ function SweepApp({
       ];
       const result = await scanAddresses(addresses, (p) => setScanProgress(p.detail ?? p.phase));
       setAssets(result);
-      const total = result.funding.length + result.ordinals.length + result.opnsNames.length + result.bsv21Tokens.reduce((n, t) => n + t.outputs.length, 0) + result.bsv20Tokens.length + result.listings.length + result.locked.length + result.run.length;
+      const grouped = groupBsv20Tokens2(result.bsv20Tokens);
+      const total = result.funding.length + result.ordinals.length + result.opnsNames.length + result.bsv21Tokens.reduce((n, t) => n + t.outputs.length, 0) + grouped.reduce((n, t) => n + t.outputs.length, 0) + result.locked.length + result.run.length;
       if (total === 0)
         toast.info("No assets found at legacy addresses");
       if (result.ordinals.length > 0)
         setActiveTab("ordinals");
       else if (result.opnsNames.length > 0)
         setActiveTab("opns");
+      else if (grouped.length > 0)
+        setActiveTab("bsv20");
       else if (result.bsv21Tokens.length > 0)
         setActiveTab("bsv21");
-      else if (result.bsv20Tokens.length > 0)
-        setActiveTab("bsv20");
       else if (result.locked.length > 0)
         setActiveTab("locks");
     } catch (e) {
@@ -2426,7 +2515,7 @@ function SweepApp({
   }, [initialKeys, handleScan]);
   const runOperation = useCallback2(async (label, op) => {
     setSweeping(true);
-    setSweepProgress(label + "...");
+    setSweepProgress(`${label}...`);
     try {
       const txid = await op();
       if (txid)
@@ -2466,17 +2555,11 @@ function SweepApp({
         keys: keyMap,
         funding: getSelectedFunding(),
         ordinals: [],
-        listings: assets.listings,
         amount: sweepAmount ?? undefined,
         onProgress: setSweepProgress
       });
-      for (const txid of result.listingTxids)
-        addTx("Cancel listings", txid);
-      if (result.errors.length > 0) {
-        if (result.cancelledListings.length > 0)
-          await refreshAssets();
+      if (result.errors.length > 0)
         throw new Error(result.errors[0]);
-      }
       return result.bsvTxid ?? "";
     });
   }, [
@@ -2486,43 +2569,7 @@ function SweepApp({
     sweepAmount,
     getSelectedFunding,
     runOperation,
-    keyMap,
-    addTx,
-    refreshAssets
-  ]);
-  const handleCancelListings = useCallback2(async () => {
-    const wallet = resolveWallet();
-    if (!wallet || !legacyKeys || !assets || assets.listings.length === 0)
-      return;
-    await runOperation("Cancel listings", async () => {
-      const result = await executeSweep({
-        wallet,
-        keys: keyMap,
-        funding: [],
-        ordinals: [],
-        listings: assets.listings,
-        onProgress: setSweepProgress
-      });
-      if (result.errors.length > 0) {
-        for (const txid of result.listingTxids)
-          addTx("Cancel listings", txid);
-        if (result.cancelledListings.length > 0)
-          await refreshAssets();
-        throw new Error(result.errors[0]);
-      }
-      for (let i = 0;i < result.listingTxids.length - 1; i++) {
-        addTx("Cancel listings", result.listingTxids[i]);
-      }
-      return result.listingTxids[result.listingTxids.length - 1] ?? "";
-    });
-  }, [
-    resolveWallet,
-    legacyKeys,
-    assets,
-    keyMap,
-    runOperation,
-    addTx,
-    refreshAssets
+    keyMap
   ]);
   const handleSendBsv = useCallback2(async (destination) => {
     if (!legacyKeys || !assets)
@@ -2705,11 +2752,65 @@ function SweepApp({
         token,
         onProgress: setSweepProgress
       });
+      for (const txid of result.txids.slice(0, -1))
+        addTx("BSV-21", txid);
       if (result.error)
         throw new Error(result.error);
       return result.txid ?? "";
     });
-  }, [resolveWallet, assets, keyMap, runOperation]);
+  }, [resolveWallet, assets, keyMap, runOperation, addTx]);
+  const handleSweepBsv20Token = useCallback2(async (tick) => {
+    const wallet = resolveWallet();
+    if (!wallet || !assets)
+      return;
+    const token = groupedBsv20.find((t) => t.tick === tick);
+    if (!token)
+      return;
+    await runOperation(`Sweep ${token.tick}`, async () => {
+      const result = await sweepBsv20Token({
+        wallet,
+        keys: keyMap,
+        token,
+        onProgress: setSweepProgress
+      });
+      if (result.error)
+        throw new Error(result.error);
+      return result.txid ?? "";
+    });
+  }, [resolveWallet, assets, groupedBsv20, keyMap, runOperation]);
+  const handleSweepAll = useCallback2(async () => {
+    const wallet = resolveWallet();
+    if (!wallet || !legacyKeys || !assets)
+      return;
+    await runOperation("Sweep all", async () => {
+      const result = await sweepAllClasses({
+        wallet,
+        keys: keyMap,
+        assets,
+        amount: sweepAmount ?? undefined,
+        onProgress: setSweepProgress
+      });
+      if (result.bsvTxid)
+        addTx("BSV", result.bsvTxid);
+      for (const txid of result.ordinalTxids)
+        addTx("Ordinals", txid);
+      for (const txid of result.bsv20Txids)
+        addTx("BSV-20", txid);
+      for (const txid of result.bsv21Txids)
+        addTx("BSV-21", txid);
+      if (result.errors.length > 0)
+        throw new Error(result.errors[0]);
+      return result.bsvTxid ?? result.ordinalTxids.at(-1) ?? result.bsv20Txids.at(-1) ?? result.bsv21Txids.at(-1) ?? "";
+    });
+  }, [
+    resolveWallet,
+    legacyKeys,
+    assets,
+    keyMap,
+    sweepAmount,
+    runOperation,
+    addTx
+  ]);
   return /* @__PURE__ */ jsxs6("div", {
     className: "min-h-screen bg-background text-foreground",
     children: [
@@ -2749,6 +2850,13 @@ function SweepApp({
           assets && !sweeping && /* @__PURE__ */ jsxs6("div", {
             className: "space-y-3",
             children: [
+              /* @__PURE__ */ jsx11(Button, {
+                className: "w-full",
+                disabled: !walletConnected,
+                onClick: handleSweepAll,
+                title: walletConnected ? undefined : "Connect BRC-100 wallet to sweep",
+                children: "Sweep all to wallet"
+              }),
               /* @__PURE__ */ jsx11(FundingSection, {
                 funding: assets.funding,
                 totalBsv: assets.totalBsv,
@@ -2758,11 +2866,6 @@ function SweepApp({
                 onSend: sweepOnly ? undefined : handleSendBsv,
                 walletConnected
               }),
-              /* @__PURE__ */ jsx11(ListingsSection, {
-                listings: assets.listings,
-                walletConnected,
-                onCancel: handleCancelListings
-              }),
               tabs.length > 0 && /* @__PURE__ */ jsxs6(Tabs, {
                 value: activeTab,
                 onValueChange: (v) => setActiveTab(v),
@@ -2812,6 +2915,15 @@ function SweepApp({
                       walletConnected
                     })
                   }),
+                  /* @__PURE__ */ jsx11(TabsContent, {
+                    value: "bsv20",
+                    children: /* @__PURE__ */ jsx11(Bsv20Section, {
+                      tokens: groupedBsv20,
+                      unparsedCount: unparsedBsv20,
+                      onSweep: handleSweepBsv20Token,
+                      walletConnected
+                    })
+                  }),
                   /* @__PURE__ */ jsx11(TabsContent, {
                     value: "bsv21",
                     children: /* @__PURE__ */ jsx11(Bsv21Section, {
@@ -2820,12 +2932,6 @@ function SweepApp({
                       walletConnected
                     })
                   }),
-                  /* @__PURE__ */ jsx11(TabsContent, {
-                    value: "bsv20",
-                    children: /* @__PURE__ */ jsx11(Bsv20Section, {
-                      tokens: assets.bsv20Tokens
-                    })
-                  }),
                   /* @__PURE__ */ jsx11(TabsContent, {
                     value: "locks",
                     children: /* @__PURE__ */ jsx11(LockedSection, {
@@ -2970,7 +3076,6 @@ export {
   ConnectWallet,
   FundingSection,
   Input,
-  ListingsSection,
   LockedSection,
   OpnsSection,
   OrdinalsSection,
@@ -3004,5 +3109,6 @@ export {
   legacySendOrdinals,
   scanAddress,
   scanAddresses,
+  sweepAllClasses,
   truncate
 };