diff --git a/package-lock.json b/package-lock.json
index 25ebe9a3f..736fcde5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "xverse-web-extension",
-  "version": "0.22.1",
+  "version": "0.23.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "xverse-web-extension",
-      "version": "0.22.1",
+      "version": "0.23.0",
       "dependencies": {
         "@ledgerhq/hw-transport-webusb": "^6.27.13",
         "@phosphor-icons/react": "^2.0.10",
diff --git a/package.json b/package.json
index d6c93f731..8dcc16c02 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xverse-web-extension",
   "description": "A Bitcoin wallet for Web3",
-  "version": "0.22.1",
+  "version": "0.23.0",
   "private": true,
   "engines": {
     "node": "^18.18.2"
diff --git a/src/app/hooks/queries/useStacksCollectibles.ts b/src/app/hooks/queries/useStacksCollectibles.ts
index 3f2e4d754..3ad6c3c0a 100644
--- a/src/app/hooks/queries/useStacksCollectibles.ts
+++ b/src/app/hooks/queries/useStacksCollectibles.ts
@@ -5,15 +5,9 @@ import { useQuery } from '@tanstack/react-query';
 import { handleRetries } from '@utils/query';
 
 const useStacksCollectibles = () => {
-  let { stxAddress } = useWalletSelector();
+  const { stxAddress } = useWalletSelector();
   const selectedNetwork = useNetworkSelector();
 
-  // TODO remove this after testing
-  const testAddress = localStorage.getItem('stxAddress');
-  if (testAddress) {
-    stxAddress = testAddress;
-  }
-
   const fetchNftCollections = (): Promise<StacksCollectionList> =>
     getNftCollections(stxAddress, selectedNetwork);
 
diff --git a/src/app/screens/confirmOrdinalTransaction/index.tsx b/src/app/screens/confirmOrdinalTransaction/index.tsx
index 11bbccec9..4c77769bb 100644
--- a/src/app/screens/confirmOrdinalTransaction/index.tsx
+++ b/src/app/screens/confirmOrdinalTransaction/index.tsx
@@ -6,6 +6,8 @@ import BottomBar from '@components/tabBar';
 import { useGetUtxoOrdinalBundle } from '@hooks/queries/ordinals/useAddressRareSats';
 import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useNftDataSelector from '@hooks/stores/useNftDataSelector';
+import useOrdinalDataReducer from '@hooks/stores/useOrdinalReducer';
+import useSatBundleDataReducer from '@hooks/stores/useSatBundleReducer';
 import useBtcClient from '@hooks/useBtcClient';
 import { useResetUserFlow } from '@hooks/useResetUserFlow';
 import useWalletSelector from '@hooks/useWalletSelector';
@@ -74,6 +76,8 @@ function ConfirmOrdinalTransaction() {
   }
 
   const { selectedOrdinal, selectedSatBundle } = useNftDataSelector();
+  const { setSelectedOrdinalDetails } = useOrdinalDataReducer();
+  const { setSelectedSatBundleDetails } = useSatBundleDataReducer();
   const { refetch } = useBtcWalletData();
   const [currentFee, setCurrentFee] = useState(fee);
   const [currentFeeRate, setCurrentFeeRate] = useState(feePerVByte);
@@ -96,6 +100,8 @@ function ConfirmOrdinalTransaction() {
 
   useEffect(() => {
     if (btcTxBroadcastData) {
+      setSelectedOrdinalDetails(null);
+      setSelectedSatBundleDetails(null);
       navigate('/tx-status', {
         state: {
           txid: btcTxBroadcastData.tx.hash,
@@ -113,6 +119,8 @@ function ConfirmOrdinalTransaction() {
 
   useEffect(() => {
     if (txError) {
+      setSelectedOrdinalDetails(null);
+      setSelectedSatBundleDetails(null);
       navigate('/tx-status', {
         state: {
           txid: '',