wip

src/app/debug.ts

@@ -60,6 +60,9 @@ const debug = {
   bypassInscriptionChecks() {
     store.dispatch(settingsSlice.actions.dangerouslyChosenToBypassAllInscriptionChecks());
   },
+  resetInscriptionState() {
+    store.dispatch(settingsSlice.actions.resetInscriptionState());
+  },
 };
 
 export function setDebugOnGlobal() {

src/app/features/collectibles/components/bitcoin/inscription.tsx

@@ -30,7 +30,11 @@ function openInscriptionUrl(num: number) {
 export function Inscription({ inscription }: InscriptionProps) {
   const navigate = useNavigate();
   const location = useLocation();
-  const { hasBeenDiscarded, discardInscription, recoverInscription } = useDiscardedInscriptions();
+  const { hasBeenDiscarded, discardInscription, recoverInscription, discardedInscriptions } =
+    useDiscardedInscriptions();
+
+  // console.log(inscription);
+  // console.log(discardedInscriptions);
 
   const openSendInscriptionModal = useCallback(() => {
     navigate(RouteUrls.SendOrdinalInscription, {
@@ -114,15 +118,16 @@ export function Inscription({ inscription }: InscriptionProps) {
     <Box position="relative">
       {content}
       <HighSatValueUtxoWarning inscription={inscription} />
-      IsDiscarded: {String(hasBeenDiscarded(inscription.id))}
+      IsDiscarded: {String(hasBeenDiscarded(inscription.txid, inscription.output))}
       <br />
       value: {inscription.value}
       <br />
       <button
         onClick={() => {
-          hasBeenDiscarded(inscription.id)
-            ? recoverInscription(inscription.id)
-            : discardInscription(inscription.id);
+          // change api to use txid and output obj
+          hasBeenDiscarded(inscription.txid, inscription.output)
+            ? recoverInscription(inscription.txid, inscription.output)
+            : discardInscription(inscription.txid, inscription.output);
         }}
       >
         toggle safe to spend

src/app/pages/home/home.tsx

@@ -16,13 +16,14 @@ import { whenPageMode } from '@app/common/utils';
 import { ActivityList } from '@app/features/activity-list/activity-list';
 import { FeedbackButton } from '@app/features/feedback-button/feedback-button';
 import { Assets } from '@app/pages/home/components/assets';
+import { useCurrentNativeSegwitUtxos } from '@app/query/bitcoin/address/utxos-by-address.hooks';
 import { homePageModalRoutes } from '@app/routes/app-routes';
 import { ModalBackgroundWrapper } from '@app/routes/components/modal-background-wrapper';
 import { useCurrentAccountIndex } from '@app/store/accounts/account';
 import { useCurrentAccountNativeSegwitAddressIndexZero } from '@app/store/accounts/blockchain/bitcoin/native-segwit-account.hooks';
 import { useCurrentStacksAccount } from '@app/store/accounts/blockchain/stacks/stacks-account.hooks';
 import { useTogglePrivateMode } from '@app/store/settings/settings.actions';
-import { useIsPrivateMode } from '@app/store/settings/settings.selectors';
+import { useDiscardedInscriptions, useIsPrivateMode } from '@app/store/settings/settings.selectors';
 import { AccountCard } from '@app/ui/components/account/account.card';
 
 import { AccountActions } from './components/account-actions';
@@ -41,6 +42,14 @@ export function Home() {
     address: account?.address || '',
     index: currentAccountIndex || 0,
   });
+  const { hasBeenDiscarded, discardInscription, recoverInscription, discardedInscriptions } =
+    useDiscardedInscriptions();
+
+  console.log(discardedInscriptions);
+
+  const { data: utxos } = useCurrentNativeSegwitUtxos();
+
+  console.log(utxos);
 
   const btcAddress = useCurrentAccountNativeSegwitAddressIndexZero();
   const { totalUsdBalance, isPending, isLoadingAdditionalData } = useTotalBalance({

src/app/store/settings/settings.selectors.ts

@@ -3,6 +3,7 @@ import { useDispatch, useSelector } from 'react-redux';
 
 import { createSelector } from '@reduxjs/toolkit';
 
+import { useCurrentNativeSegwitUtxos } from '@app/query/bitcoin/address/utxos-by-address.hooks';
 import { RootState } from '@app/store';
 
 import { settingsSlice } from './settings.slice';
@@ -51,14 +52,16 @@ export function useDiscardedInscriptions() {
   return useMemo(
     () => ({
       discardedInscriptions,
-      hasBeenDiscarded(inscriptionId: string) {
-        return discardedInscriptions.includes(inscriptionId);
+      hasBeenDiscarded(txid: string, vout: string) {
+        return discardedInscriptions.includes([txid, vout].join(':'));
       },
-      discardInscription(inscriptionId: string) {
-        dispatch(settingsSlice.actions.discardInscription(inscriptionId));
+      discardInscription(txid: string, vout: string) {
+        console.log('discarding inscription', [txid, vout].join(':'));
+        dispatch(settingsSlice.actions.discardInscription([txid, vout].join(':')));
       },
-      recoverInscription(inscriptionId: string) {
-        dispatch(settingsSlice.actions.recoverInscription(inscriptionId));
+      recoverInscription(txid: string, vout: string) {
+        console.log('recovering inscription', [txid, vout].join(':'));
+        dispatch(settingsSlice.actions.recoverInscription([txid, vout].join(':')));
       },
     }),
     [discardedInscriptions, dispatch]

src/app/store/settings/settings.slice.ts

@@ -41,9 +41,13 @@ export const settingsSlice = createSlice({
       state.discardedInscriptions.push(action.payload);
     },
     recoverInscription(state, action: PayloadAction<string>) {
+      console.log('recovering inscription', action.payload);
       state.discardedInscriptions = state.discardedInscriptions.filter(
         inscriptionId => inscriptionId !== action.payload
       );
     },
+    resetInscriptionState(state) {
+      state.discardedInscriptions = [];
+    },
   },
 });