From f2072e90edf7f1b543be25ac9070218c379f89b8 Mon Sep 17 00:00:00 2001 From: Terence Ng Date: Mon, 26 Feb 2024 13:31:48 +0800 Subject: [PATCH] [ENG-3193] refactor: Refactor away from selectedOrdinal (#791) * commit changes * remove selectedOrdinal for raresat screen * update recover screens * fix translation text * revert non null assertion * fix bug * fix merge --- .../collectibleCollectionGridItem/index.tsx | 18 +++--- ...nscription.ts => useAddressInscription.ts} | 2 +- src/app/hooks/stores/useOrdinalReducer.ts | 17 ----- .../confirmOrdinalTransaction/index.tsx | 12 ++-- src/app/screens/nftCollection/index.tsx | 2 +- .../screens/ordinalDetail/useOrdinalDetail.ts | 8 +-- src/app/screens/ordinals/index.tsx | 10 +-- src/app/screens/ordinalsCollection/index.tsx | 10 +-- src/app/screens/rareSatsBundle/index.tsx | 11 ++-- .../restoreFunds/restoreOrdinals/index.tsx | 64 +++++++++---------- .../restoreOrdinals/ordinalRow.tsx | 57 +++++++++-------- src/app/screens/sendOrdinal/index.tsx | 7 +- .../stores/nftData/actions/actionCreator.ts | 10 --- src/app/stores/nftData/actions/types.ts | 14 +--- src/app/stores/nftData/reducer.ts | 7 -- 15 files changed, 89 insertions(+), 160 deletions(-) rename src/app/hooks/queries/ordinals/{useInscription.ts => useAddressInscription.ts} (93%) delete mode 100644 src/app/hooks/stores/useOrdinalReducer.ts diff --git a/src/app/components/collectibleCollectionGridItem/index.tsx b/src/app/components/collectibleCollectionGridItem/index.tsx index d11c4be81..d2a876aa1 100644 --- a/src/app/components/collectibleCollectionGridItem/index.tsx +++ b/src/app/components/collectibleCollectionGridItem/index.tsx @@ -1,3 +1,4 @@ +import { Inscription, NonFungibleToken } from '@secretkeylabs/xverse-core'; import { StyledP } from '@ui-library/common.styled'; import { ReactNode } from 'react'; import styled from 'styled-components'; @@ -48,12 +49,12 @@ const GridItemContainer = styled.button` `; interface Props { - item: any; - itemId: string; + item?: Inscription | NonFungibleToken; + itemId?: string; itemSubText?: string; itemSubTextColor?: Color; children: ReactNode; - onClick?: (collectible: any) => void; + onClick?: (item: Inscription | NonFungibleToken) => void; } export function CollectibleCollectionGridItem({ item, @@ -63,11 +64,12 @@ export function CollectibleCollectionGridItem({ children, onClick, }: Props) { - const handleOnClick = onClick - ? () => { - onClick(item); - } - : undefined; + const handleOnClick = + onClick && item + ? () => { + onClick(item); + } + : undefined; return ( diff --git a/src/app/hooks/queries/ordinals/useInscription.ts b/src/app/hooks/queries/ordinals/useAddressInscription.ts similarity index 93% rename from src/app/hooks/queries/ordinals/useInscription.ts rename to src/app/hooks/queries/ordinals/useAddressInscription.ts index b57a2c5f5..07d39f9a4 100644 --- a/src/app/hooks/queries/ordinals/useInscription.ts +++ b/src/app/hooks/queries/ordinals/useAddressInscription.ts @@ -4,7 +4,7 @@ import { useQuery } from '@tanstack/react-query'; import { handleRetries, InvalidParamsError } from '@utils/query'; /** - * Get inscriptions details by collection id + * Get inscription details belonging to an address by ordinalId */ const useAddressInscription = (ordinalId: string, ordinal?: Inscription | null) => { const { ordinalsAddress, network } = useWalletSelector(); diff --git a/src/app/hooks/stores/useOrdinalReducer.ts b/src/app/hooks/stores/useOrdinalReducer.ts deleted file mode 100644 index 86f7f2645..000000000 --- a/src/app/hooks/stores/useOrdinalReducer.ts +++ /dev/null @@ -1,17 +0,0 @@ -import type { Inscription } from '@secretkeylabs/xverse-core'; -import { setSelectedOrdinalAction } from '@stores/nftData/actions/actionCreator'; -import { useDispatch } from 'react-redux'; - -const useOrdinalDataReducer = () => { - const dispatch = useDispatch(); - - const setSelectedOrdinalDetails = (data: Inscription | null) => { - dispatch(setSelectedOrdinalAction(data)); - }; - - return { - setSelectedOrdinalDetails, - }; -}; - -export default useOrdinalDataReducer; diff --git a/src/app/screens/confirmOrdinalTransaction/index.tsx b/src/app/screens/confirmOrdinalTransaction/index.tsx index 512d93233..886ea5b51 100644 --- a/src/app/screens/confirmOrdinalTransaction/index.tsx +++ b/src/app/screens/confirmOrdinalTransaction/index.tsx @@ -1,9 +1,8 @@ import { ConfirmOrdinalsTransactionState, LedgerTransactionType } from '@common/types/ledger'; import ConfirmBtcTransactionComponent from '@components/confirmBtcTransactionComponent'; +import useAddressInscription from '@hooks/queries/ordinals/useAddressInscription'; 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'; @@ -14,7 +13,7 @@ import { useMutation } from '@tanstack/react-query'; import { isLedgerAccount } from '@utils/helper'; import BigNumber from 'bignumber.js'; import { useEffect, useState } from 'react'; -import { useLocation, useNavigate } from 'react-router-dom'; +import { useLocation, useNavigate, useParams } from 'react-router-dom'; import styled from 'styled-components'; import SendLayout from '../../layouts/sendLayout'; @@ -53,9 +52,8 @@ function ConfirmOrdinalTransaction() { if (!BigNumber.isBigNumber(fee)) { fee = BigNumber(fee); } - - const { selectedOrdinal } = useNftDataSelector(); - const { setSelectedOrdinalDetails } = useOrdinalDataReducer(); + const { id } = useParams(); + const { data: selectedOrdinal } = useAddressInscription(id!); const { setSelectedSatBundleDetails } = useSatBundleDataReducer(); const { refetch } = useBtcWalletData(); const [currentFee, setCurrentFee] = useState(fee); @@ -76,7 +74,6 @@ function ConfirmOrdinalTransaction() { useEffect(() => { if (btcTxBroadcastData) { - setSelectedOrdinalDetails(null); setSelectedSatBundleDetails(null); navigate('/tx-status', { state: { @@ -95,7 +92,6 @@ function ConfirmOrdinalTransaction() { useEffect(() => { if (txError) { - setSelectedOrdinalDetails(null); setSelectedSatBundleDetails(null); navigate('/tx-status', { state: { diff --git a/src/app/screens/nftCollection/index.tsx b/src/app/screens/nftCollection/index.tsx index 2a1ca6085..3cea73cd4 100644 --- a/src/app/screens/nftCollection/index.tsx +++ b/src/app/screens/nftCollection/index.tsx @@ -129,7 +129,7 @@ function IsVisibleOrPlaceholder({ children }: PropsWithChildren) { {isVisible ? ( children ) : ( - + )} diff --git a/src/app/screens/ordinalDetail/useOrdinalDetail.ts b/src/app/screens/ordinalDetail/useOrdinalDetail.ts index 989a2d902..8666ceff2 100644 --- a/src/app/screens/ordinalDetail/useOrdinalDetail.ts +++ b/src/app/screens/ordinalDetail/useOrdinalDetail.ts @@ -1,8 +1,7 @@ +import useAddressInscription from '@hooks/queries/ordinals/useAddressInscription'; import { useGetUtxoOrdinalBundle } from '@hooks/queries/ordinals/useAddressRareSats'; import useInscriptionCollectionMarketData from '@hooks/queries/ordinals/useCollectionMarketData'; -import useAddressInscription from '@hooks/queries/ordinals/useInscription'; import usePendingOrdinalTxs from '@hooks/queries/usePendingOrdinalTx'; -import useOrdinalDataReducer from '@hooks/stores/useOrdinalReducer'; import useSatBundleDataReducer from '@hooks/stores/useSatBundleReducer'; import useTextOrdinalContent from '@hooks/useTextOrdinalContent'; import useWalletSelector from '@hooks/useWalletSelector'; @@ -28,7 +27,6 @@ export default function useOrdinalDetail() { ordinalData?.collection_id, ); - const { setSelectedOrdinalDetails } = useOrdinalDataReducer(); const { isPending, pendingTxHash } = usePendingOrdinalTxs(ordinalData?.tx_id); const textContent = useTextOrdinalContent(ordinalData!); const { setSelectedSatBundleDetails } = useSatBundleDataReducer(); @@ -54,14 +52,12 @@ export default function useOrdinalDetail() { ); const handleBackButtonClick = () => { - setSelectedOrdinalDetails(null); if (ordinalData?.collection_id) navigate(`/nft-dashboard/ordinals-collection/${ordinalData?.collection_id}`); else navigate('/nft-dashboard?tab=inscriptions'); }; const openInGalleryView = async () => { - if (ordinalData) setSelectedOrdinalDetails(ordinalData); await chrome.tabs.create({ url: chrome.runtime.getURL(`options.html#/nft-dashboard/ordinal-detail/${id}`), }); @@ -80,7 +76,6 @@ export default function useOrdinalDetail() { showAlert(); return; } - if (ordinalData) setSelectedOrdinalDetails(ordinalData); if (isLedgerAccount(selectedAccount) && !isInOptions()) { await chrome.tabs.create({ url: chrome.runtime.getURL(`options.html#/nft-dashboard/ordinal-detail/${id}/send-ordinal`), @@ -105,7 +100,6 @@ export default function useOrdinalDetail() { if (!bundle || !ordinalData) { return; } - setSelectedOrdinalDetails(ordinalData); setSelectedSatBundleDetails(bundle); navigate('/nft-dashboard/rare-sats-bundle', { state: { source: 'OrdinalDetail' } }); }; diff --git a/src/app/screens/ordinals/index.tsx b/src/app/screens/ordinals/index.tsx index 8153df5c7..5ac85f1ce 100644 --- a/src/app/screens/ordinals/index.tsx +++ b/src/app/screens/ordinals/index.tsx @@ -1,4 +1,3 @@ -import useOrdinalDataReducer from '@hooks/stores/useOrdinalReducer'; import type { Inscription } from '@secretkeylabs/xverse-core'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom'; @@ -46,15 +45,8 @@ const GridItemContainer = styled.button((props) => ({ function Ordinal({ asset, isGalleryOpen }: Props) { const navigate = useNavigate(); const { t } = useTranslation('translation', { keyPrefix: 'NFT_DASHBOARD_SCREEN' }); - const { setSelectedOrdinalDetails } = useOrdinalDataReducer(); - - const handleOnClick = () => { - setSelectedOrdinalDetails(asset); - navigate(`/nft-dashboard/ordinal-detail/${asset.id}`); - }; - return ( - + navigate(`/nft-dashboard/ordinal-detail/${asset.id}`)}> {isGalleryOpen ? ( diff --git a/src/app/screens/ordinalsCollection/index.tsx b/src/app/screens/ordinalsCollection/index.tsx index c8773ceba..2a69cedab 100644 --- a/src/app/screens/ordinalsCollection/index.tsx +++ b/src/app/screens/ordinalsCollection/index.tsx @@ -11,12 +11,10 @@ import WebGalleryButton from '@components/webGalleryButton'; import WrenchErrorMessage from '@components/wrenchErrorMessage'; import useAddressInscriptions from '@hooks/queries/ordinals/useAddressInscriptions'; import useInscriptionCollectionMarketData from '@hooks/queries/ordinals/useCollectionMarketData'; -import useOrdinalDataReducer from '@hooks/stores/useOrdinalReducer'; import { useResetUserFlow } from '@hooks/useResetUserFlow'; import { ArrowLeft } from '@phosphor-icons/react'; import { GridContainer } from '@screens/nftDashboard/collectiblesTabs'; import OrdinalImage from '@screens/ordinals/ordinalImage'; -import { Inscription } from '@secretkeylabs/xverse-core'; import { StyledHeading, StyledP } from '@ui-library/common.styled'; import { EMPTY_LABEL } from '@utils/constants'; import { @@ -138,7 +136,6 @@ const StyledBarLoader = styled(BetterBarLoader)((props) => ({ function OrdinalsCollection() { const { t } = useTranslation('translation', { keyPrefix: 'COLLECTIBLE_COLLECTION_SCREEN' }); const navigate = useNavigate(); - const { setSelectedOrdinalDetails } = useOrdinalDataReducer(); const { id: collectionId } = useParams(); const { data, error, isLoading, hasNextPage, isFetchingNextPage, fetchNextPage } = useAddressInscriptions(collectionId); @@ -170,11 +167,6 @@ function OrdinalsCollection() { ? `${collectionMarketData?.floor_price?.toFixed(8)} BTC` : EMPTY_LABEL; - const handleOnClick = (item: Inscription) => { - setSelectedOrdinalDetails(item); - navigate(`/nft-dashboard/ordinal-detail/${item.id}`); - }; - return ( <> {isGalleryOpen ? ( @@ -241,7 +233,7 @@ function OrdinalsCollection() { itemId={getInscriptionsCollectionGridItemId(inscription)} itemSubText={getInscriptionsCollectionGridItemSubText(inscription)} itemSubTextColor={getInscriptionsCollectionGridItemSubTextColor(inscription)} - onClick={handleOnClick} + onClick={() => navigate(`/nft-dashboard/ordinal-detail/${inscription.id}`)} > diff --git a/src/app/screens/rareSatsBundle/index.tsx b/src/app/screens/rareSatsBundle/index.tsx index 621270972..29cd8f5fe 100644 --- a/src/app/screens/rareSatsBundle/index.tsx +++ b/src/app/screens/rareSatsBundle/index.tsx @@ -166,7 +166,7 @@ function RareSatsBundle() { const location = useLocation(); const { source } = location.state || {}; const { network, selectedAccount, ordinalsAddress } = useWalletSelector(); - const { selectedSatBundle: bundle, selectedOrdinal } = useNftDataSelector(); + const { selectedSatBundle: bundle } = useNftDataSelector(); const { isPending, pendingTxHash } = usePendingOrdinalTxs(bundle?.txid); const [showSendOrdinalsAlert, setShowSendOrdinalsAlert] = useState(false); const { setSelectedSatBundleDetails } = useSatBundleDataReducer(); @@ -219,11 +219,12 @@ function RareSatsBundle() { navigate('/nft-dashboard/supported-rarity-scale'); }; - const isEmpty = !bundle?.satRanges?.length; + const goBackText = + location.state && location.state.source === 'OrdinalDetail' + ? t('SEND.MOVE_TO_ASSET_DETAIL') + : t('NFT_DETAIL_SCREEN.MOVE_TO_ASSET_DETAIL'); - const goBackText = selectedOrdinal?.id - ? t('SEND.MOVE_TO_ASSET_DETAIL') - : t('NFT_DETAIL_SCREEN.MOVE_TO_ASSET_DETAIL'); + const isEmpty = !bundle?.satRanges?.length; return ( <> diff --git a/src/app/screens/restoreFunds/restoreOrdinals/index.tsx b/src/app/screens/restoreFunds/restoreOrdinals/index.tsx index 7289f97c7..3642d6e75 100644 --- a/src/app/screens/restoreFunds/restoreOrdinals/index.tsx +++ b/src/app/screens/restoreFunds/restoreOrdinals/index.tsx @@ -1,7 +1,6 @@ import ActionButton from '@components/button'; import BottomTabBar from '@components/tabBar'; import TopRow from '@components/topRow'; -import useOrdinalDataReducer from '@hooks/stores/useOrdinalReducer'; import useBtcClient from '@hooks/useBtcClient'; import useOrdinalsByAddress from '@hooks/useOrdinalsByAddress'; import useSeedVault from '@hooks/useSeedVault'; @@ -10,7 +9,6 @@ import { BtcOrdinal, ErrorCodes, getBtcFiatEquivalent, - Inscription, SignedBtcTx, signOrdinalSendTransaction, } from '@secretkeylabs/xverse-core'; @@ -69,9 +67,8 @@ function RestoreOrdinals() { const { network, ordinalsAddress, btcAddress, selectedAccount, btcFiatRate } = useWalletSelector(); const { getSeed } = useSeedVault(); - const { setSelectedOrdinalDetails } = useOrdinalDataReducer(); const navigate = useNavigate(); - const { ordinals } = useOrdinalsByAddress(btcAddress); + const ordinalsQuery = useOrdinalsByAddress(btcAddress); const [error, setError] = useState(''); const [transferringOrdinalId, setTransferringOrdinalId] = useState(null); const location = useLocation(); @@ -79,7 +76,10 @@ function RestoreOrdinals() { const isRestoreFundFlow = location.state?.isRestoreFundFlow; - const ordinalsUtxos = useMemo(() => ordinals?.map((ord) => ord.utxo), [ordinals]); + const ordinalsUtxos = useMemo( + () => ordinalsQuery.ordinals?.map((ord) => ord.utxo), + [ordinalsQuery.ordinals], + ); const { isLoading, @@ -119,11 +119,10 @@ function RestoreOrdinals() { } }; - const onClickTransfer = async (selectedOrdinal: BtcOrdinal, ordinalData: Inscription) => { + const onClickTransfer = async (selectedOrdinal: BtcOrdinal) => { setTransferringOrdinalId(selectedOrdinal.id); const seedPhrase = await getSeed(); const signedTx = await mutateAsync({ ordinal: selectedOrdinal, seedPhrase }); - setSelectedOrdinalDetails(ordinalData); navigate(`/nft-dashboard/confirm-ordinal-tx/${selectedOrdinal.id}`, { state: { signedTxHex: signedTx.signedTx, @@ -138,42 +137,37 @@ function RestoreOrdinals() { }); }; - const showContent = - ordinals?.length === 0 ? ( - <> - {t('RESTORE_ORDINAL_SCREEN.NO_FUNDS')} - - - - - ) : ( - <> - {t('RESTORE_ORDINAL_SCREEN.DESCRIPTION')} - {ordinals?.map((ordinal) => ( - - ))} - - {error} - - - ); - return ( <> - {!ordinals ? ( + {ordinalsQuery.isLoading ? ( + ) : ordinalsQuery.ordinals?.length === 0 ? ( + <> + {t('RESTORE_ORDINAL_SCREEN.NO_FUNDS')} + + + + ) : ( - showContent + <> + {t('RESTORE_ORDINAL_SCREEN.DESCRIPTION')} + {ordinalsQuery.ordinals?.map((ordinal) => ( + + ))} + + {error} + + )} diff --git a/src/app/screens/restoreFunds/restoreOrdinals/ordinalRow.tsx b/src/app/screens/restoreFunds/restoreOrdinals/ordinalRow.tsx index 788ecafc1..14d0dddc6 100644 --- a/src/app/screens/restoreFunds/restoreOrdinals/ordinalRow.tsx +++ b/src/app/screens/restoreFunds/restoreOrdinals/ordinalRow.tsx @@ -1,6 +1,6 @@ import useInscriptionDetails from '@hooks/queries/ordinals/useInscriptionDetails'; import OrdinalImage from '@screens/ordinals/ordinalImage'; -import type { BtcOrdinal, Inscription } from '@secretkeylabs/xverse-core'; +import type { BtcOrdinal } from '@secretkeylabs/xverse-core'; import Spinner from '@ui-library/spinner'; import { useTranslation } from 'react-i18next'; import styled from 'styled-components'; @@ -62,42 +62,43 @@ interface Props { ordinal: BtcOrdinal; isLoading: boolean; disableTransfer: boolean; - handleOrdinalTransfer: (ordinal: BtcOrdinal, ordinalData: Inscription) => Promise; + handleOrdinalTransfer: (ordinal: BtcOrdinal) => Promise; } function OrdinalRow({ ordinal, isLoading, disableTransfer, handleOrdinalTransfer }: Props) { const { t } = useTranslation('translation'); - const ordinalData = useInscriptionDetails(ordinal.id); + const inscriptionQuery = useInscriptionDetails(ordinal.id); const onClick = async () => { - if (ordinalData && ordinalData.data) { - await handleOrdinalTransfer(ordinal, ordinalData.data); + if (inscriptionQuery && inscriptionQuery.data) { + await handleOrdinalTransfer(ordinal); } }; - return ( - - - - - - - {`Inscription ${ordinalData?.data?.number}`} - Ordinal - - - - {isLoading ? ( - - - - ) : ( - t('RESTORE_ORDINAL_SCREEN.TRANSFER') - )} - - - - ); + if (!inscriptionQuery.isLoading) { + return ( + + + + + + {`Inscription ${inscriptionQuery.data!.number}`} + Ordinal + + + + {isLoading ? ( + + + + ) : ( + t('RESTORE_ORDINAL_SCREEN.TRANSFER') + )} + + + + ); + } } export default OrdinalRow; diff --git a/src/app/screens/sendOrdinal/index.tsx b/src/app/screens/sendOrdinal/index.tsx index 9f2383cdd..85a4c3fcd 100644 --- a/src/app/screens/sendOrdinal/index.tsx +++ b/src/app/screens/sendOrdinal/index.tsx @@ -1,5 +1,5 @@ import ActionButton from '@components/button'; -import useNftDataSelector from '@hooks/stores/useNftDataSelector'; +import useAddressInscription from '@hooks/queries/ordinals/useAddressInscription'; import useBtcClient from '@hooks/useBtcClient'; import { useResetUserFlow } from '@hooks/useResetUserFlow'; import useSeedVault from '@hooks/useSeedVault'; @@ -21,7 +21,7 @@ import { InputFeedback, InputFeedbackProps, isDangerFeedback } from '@ui-library import BigNumber from 'bignumber.js'; import { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { useLocation, useNavigate } from 'react-router-dom'; +import { useLocation, useNavigate, useParams } from 'react-router-dom'; import styled from 'styled-components'; import SendLayout from '../../layouts/sendLayout'; @@ -93,9 +93,10 @@ const StyledCallout = styled(Callout)` function SendOrdinal() { const { t } = useTranslation('translation', { keyPrefix: 'SEND' }); const navigate = useNavigate(); - const { selectedOrdinal } = useNftDataSelector(); const btcClient = useBtcClient(); const location = useLocation(); + const { id } = useParams(); + const { data: selectedOrdinal } = useAddressInscription(id!); const { network, ordinalsAddress, btcAddress, selectedAccount, btcFiatRate } = useWalletSelector(); const { getSeed } = useSeedVault(); diff --git a/src/app/stores/nftData/actions/actionCreator.ts b/src/app/stores/nftData/actions/actionCreator.ts index e87b88878..bde5b8170 100644 --- a/src/app/stores/nftData/actions/actionCreator.ts +++ b/src/app/stores/nftData/actions/actionCreator.ts @@ -1,15 +1,5 @@ -import { Inscription } from '@secretkeylabs/xverse-core'; import * as actions from './types'; -export function setSelectedOrdinalAction( - selectedOrdinal: Inscription | null, -): actions.SetSelectedOrdinal { - return { - type: actions.SetSelectedOrdinalKey, - selectedOrdinal, - }; -} - export function setSelectedSatBundleAction( selectedSatBundle: actions.NftDataState['selectedSatBundle'], ): actions.SetSelectedSatBundle { diff --git a/src/app/stores/nftData/actions/types.ts b/src/app/stores/nftData/actions/types.ts index 0d3885ca4..cd9181d57 100644 --- a/src/app/stores/nftData/actions/types.ts +++ b/src/app/stores/nftData/actions/types.ts @@ -1,20 +1,13 @@ -import { Bundle, Inscription } from '@secretkeylabs/xverse-core'; +import { Bundle } from '@secretkeylabs/xverse-core'; export interface NftDataState { - selectedOrdinal: Inscription | null; selectedSatBundle: Bundle | null; selectedSatBundleItemIndex: number | null; } -export const SetSelectedOrdinalKey = 'SetSelectedOrdinal'; export const SetSelectedSatBundleKey = 'SetSelectedSatBundle'; export const SetSelectedSatBundleItemIndexKey = 'SetSelectedSatBundleItemIndex'; -export interface SetSelectedOrdinal { - type: typeof SetSelectedOrdinalKey; - selectedOrdinal: Inscription | null; -} - export interface SetSelectedSatBundle { type: typeof SetSelectedSatBundleKey; selectedSatBundle: NftDataState['selectedSatBundle']; @@ -24,7 +17,4 @@ export interface SetSelectedSatBundleItemIndex { selectedSatBundleItemIndex: NftDataState['selectedSatBundleItemIndex']; } -export type NftDataAction = - | SetSelectedOrdinal - | SetSelectedSatBundle - | SetSelectedSatBundleItemIndex; +export type NftDataAction = SetSelectedSatBundle | SetSelectedSatBundleItemIndex; diff --git a/src/app/stores/nftData/reducer.ts b/src/app/stores/nftData/reducer.ts index 4d37c0bb7..2dd506276 100644 --- a/src/app/stores/nftData/reducer.ts +++ b/src/app/stores/nftData/reducer.ts @@ -1,13 +1,11 @@ import { NftDataAction, NftDataState, - SetSelectedOrdinalKey, SetSelectedSatBundleItemIndexKey, SetSelectedSatBundleKey, } from './actions/types'; const initialNftDataState: NftDataState = { - selectedOrdinal: null, selectedSatBundle: null, selectedSatBundleItemIndex: null, }; @@ -18,11 +16,6 @@ const NftDataStateReducer = ( action: NftDataAction, ): NftDataState => { switch (action.type) { - case SetSelectedOrdinalKey: - return { - ...state, - selectedOrdinal: action.selectedOrdinal, - }; case SetSelectedSatBundleKey: return { ...state,