From 1716bd1445e4ac32329a892de25686069548e71a Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Fri, 28 Apr 2023 14:07:25 -0400 Subject: [PATCH] skip some queries --- src/components/app/AppStatusHeader.tsx | 2 +- src/components/token/TokenContent.tsx | 1 + src/components/token/TokenListItem.tsx | 7 +++++-- src/components/transaction/TransactionCATInput.tsx | 1 + src/hooks/wallet/useSelectedWallet.ts | 5 ++++- src/pages/Detokenization/CancelDetokenization.tsx | 6 +++++- src/pages/Detokenization/RequestDetokenization.tsx | 6 +++++- src/pages/Retire/Retire.tsx | 6 +++++- src/pages/Send/Send.tsx | 6 +++++- 9 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/components/app/AppStatusHeader.tsx b/src/components/app/AppStatusHeader.tsx index 028be2c2..8e624120 100644 --- a/src/components/app/AppStatusHeader.tsx +++ b/src/components/app/AppStatusHeader.tsx @@ -125,7 +125,7 @@ export default function AppStatusHeader() { // XCH const { data: walletBalance } = useGetWalletBalanceQuery( { walletId: chiaWalletId }, - { pollingInterval: 10000 } + { pollingInterval: 10000, skip: !chiaWalletId } ) const { wallet, unit = '', loading } = useWallet(chiaWalletId) diff --git a/src/components/token/TokenContent.tsx b/src/components/token/TokenContent.tsx index 2ca4c571..b921d967 100644 --- a/src/components/token/TokenContent.tsx +++ b/src/components/token/TokenContent.tsx @@ -80,6 +80,7 @@ const TokenContent = () => { }, { pollingInterval: 10000, + skip: !walletId, } ) diff --git a/src/components/token/TokenListItem.tsx b/src/components/token/TokenListItem.tsx index 38e41b23..30d6a289 100644 --- a/src/components/token/TokenListItem.tsx +++ b/src/components/token/TokenListItem.tsx @@ -76,7 +76,10 @@ const TokenListItem = ({ walletId }: TokenListItemProps) => { ) const { walletId: selectedWalletId, setWalletId } = useSelectedWallet() - const { data: assetId } = useGetCATAssetIdQuery({ walletId: walletId }) + const { data: assetId } = useGetCATAssetIdQuery( + { walletId: walletId }, + { skip: !walletId } + ) const { data: asset, isLoading: isLoadingAsset, @@ -85,7 +88,7 @@ const TokenListItem = ({ walletId }: TokenListItemProps) => { const { data: walletBalance } = useGetWalletBalanceQuery( { walletId }, - { pollingInterval: 10000 } + { pollingInterval: 10000, skip: !walletId } ) const { wallet, unit = '' } = useWallet(walletId) const isSelected = walletId === Number(selectedWalletId) diff --git a/src/components/transaction/TransactionCATInput.tsx b/src/components/transaction/TransactionCATInput.tsx index bda84f20..716cad27 100644 --- a/src/components/transaction/TransactionCATInput.tsx +++ b/src/components/transaction/TransactionCATInput.tsx @@ -15,6 +15,7 @@ const TransactionCATInput = () => { }, { pollingInterval: 10000, + skip: !walletId, } ) const { diff --git a/src/hooks/wallet/useSelectedWallet.ts b/src/hooks/wallet/useSelectedWallet.ts index eb1d488c..2a949e64 100644 --- a/src/hooks/wallet/useSelectedWallet.ts +++ b/src/hooks/wallet/useSelectedWallet.ts @@ -7,7 +7,10 @@ import { useGetCATAssetIdQuery } from '@chia/api-react' const useSelectedWallet = () => { const walletId = useTypedSelector((state) => state.wallet.walletId) const wallets = useWallet(walletId) - const { data: assetId } = useGetCATAssetIdQuery({ walletId: walletId }) + const { data: assetId } = useGetCATAssetIdQuery( + { walletId: walletId }, + { skip: !walletId } + ) const { data: asset, isLoading: isLoadingAsset, diff --git a/src/pages/Detokenization/CancelDetokenization.tsx b/src/pages/Detokenization/CancelDetokenization.tsx index 071af852..b0794385 100644 --- a/src/pages/Detokenization/CancelDetokenization.tsx +++ b/src/pages/Detokenization/CancelDetokenization.tsx @@ -80,7 +80,10 @@ const CancelDetokenization = () => { mode: 'onChange', }) - const { data: assetId } = useGetCATAssetIdQuery({ walletId }) + const { data: assetId } = useGetCATAssetIdQuery( + { walletId: walletId }, + { skip: !walletId } + ) const { data: cwAsset, isLoading: isLoadingAsset } = useGetAllCWAssetsById(assetId) @@ -92,6 +95,7 @@ const CancelDetokenization = () => { }, { pollingInterval: 10000, + skip: !walletId, } ) diff --git a/src/pages/Detokenization/RequestDetokenization.tsx b/src/pages/Detokenization/RequestDetokenization.tsx index 50af3b04..24d0bd71 100644 --- a/src/pages/Detokenization/RequestDetokenization.tsx +++ b/src/pages/Detokenization/RequestDetokenization.tsx @@ -66,7 +66,10 @@ const RequestDetokenization = () => { }) const { register, formState, handleSubmit, reset, getValues } = methods - const { data: assetId } = useGetCATAssetIdQuery({ walletId }) + const { data: assetId } = useGetCATAssetIdQuery( + { walletId: walletId }, + { skip: !walletId } + ) const { data: cwAsset } = useGetAllCWAssetsById(assetId) const { data: walletBalance } = useGetWalletBalanceQuery( { @@ -74,6 +77,7 @@ const RequestDetokenization = () => { }, { pollingInterval: 10000, + skip: !walletId, } ) diff --git a/src/pages/Retire/Retire.tsx b/src/pages/Retire/Retire.tsx index a7cd34b5..668ecaac 100644 --- a/src/pages/Retire/Retire.tsx +++ b/src/pages/Retire/Retire.tsx @@ -63,7 +63,10 @@ const Retire = () => { mode: 'onChange', }) - const { data: assetId } = useGetCATAssetIdQuery({ walletId }) + const { data: assetId } = useGetCATAssetIdQuery( + { walletId: walletId }, + { skip: !walletId } + ) const { data: cwAsset, isLoading: isLoadingAsset } = useGetAllCWAssetsById(assetId) @@ -75,6 +78,7 @@ const Retire = () => { }, { pollingInterval: 10000, + skip: !walletId, } ) diff --git a/src/pages/Send/Send.tsx b/src/pages/Send/Send.tsx index 2db86a38..d1f1e806 100644 --- a/src/pages/Send/Send.tsx +++ b/src/pages/Send/Send.tsx @@ -54,7 +54,10 @@ const Send = () => { mode: 'onChange', }) - const { data: assetId } = useGetCATAssetIdQuery({ walletId }) + const { data: assetId } = useGetCATAssetIdQuery( + { walletId: walletId }, + { skip: !walletId } + ) const { data: cwAsset, isLoading: isLoadingAsset } = useGetAllCWAssetsById(assetId) @@ -66,6 +69,7 @@ const Send = () => { }, { pollingInterval: 10000, + skip: !walletId, } )