Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: stop refetching network fees after hop execution #8570

Merged
merged 2 commits into from
Jan 14, 2025
Merged

feat: stop refetching network fees after hop execution #8570

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6c63e1
feat: stop refetching network fees after hop execution
gomesalexandre Jan 14, 2025
d1fb8aa
Merge branch 'develop' into feat_stop_refetching_hop_executed
gomesalexandre Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion .../MultiHopTrade/components/MultiHopTradeConfirm/hooks/useTradeNetworkFeeCryptoBaseUnit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ import {
selectActiveQuote,
selectActiveSwapperName,
selectConfirmedTradeExecution,
selectHopExecutionMetadata,
selectHopSellAccountId,
selectTradeSlippagePercentageDecimal,
} from 'state/slices/tradeQuoteSlice/selectors'
import { HopExecutionState, TransactionExecutionState } from 'state/slices/tradeQuoteSlice/types'
import { useAppSelector } from 'state/store'

export const useTradeNetworkFeeCryptoBaseUnit = ({
Expand Down Expand Up @@ -60,6 +62,24 @@ export const useTradeNetworkFeeCryptoBaseUnit = ({
const hop = useMemo(() => getHopByIndex(tradeQuote, hopIndex), [tradeQuote, hopIndex])
const swapper = useMemo(() => (swapperName ? swappers[swapperName] : undefined), [swapperName])

const activeTrade = useAppSelector(selectActiveQuote)
const activeTradeId = activeTrade?.id

const hopExecutionMetadataFilter = useMemo(() => {
if (!activeTradeId) return undefined

return {
tradeId: activeTradeId,
hopIndex,
}
}, [activeTradeId, hopIndex])

const hopExecutionMetadata = useAppSelector(state =>
hopExecutionMetadataFilter
? selectHopExecutionMetadata(state, hopExecutionMetadataFilter)
: undefined,
)

const quoteNetworkFeesCryptoBaseUnitQuery = useQuery({
queryKey: ['quoteNetworkFeesCryptoBaseUnit', tradeQuote],
refetchInterval: 15_000,
Expand All @@ -72,7 +92,10 @@ export const useTradeNetworkFeeCryptoBaseUnit = ({
sellAssetAccountId &&
swapper &&
hop &&
isExecutableTradeQuote(tradeQuote)
isExecutableTradeQuote(tradeQuote) &&
// Stop fetching once the Tx is executed for this step
hopExecutionMetadata?.state === HopExecutionState.AwaitingSwap &&
hopExecutionMetadata?.swap?.state === TransactionExecutionState.AwaitingConfirmation
? async () => {
const { accountType, bip44Params } = accountMetadata
const accountNumber = bip44Params.accountNumber
Expand Down