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

Jump to bottom

fix: enforce pool redirection when closing removal modal after success #1136

Merged
merged 2 commits into from
Sep 30, 2024
Merged

fix: enforce pool redirection when closing removal modal after success #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a239665
fix: enforce pool redirection when closing removal modal after success
agualis Sep 30, 2024
6885865
fix: avoid updating transaction if it's already successful
agualis Sep 30, 2024
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
5 changes: 3 additions & 2 deletions lib/modules/pool/actions/remove-liquidity/RemoveLiquidityProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ import { useRemoveLiquidityPriceImpactQuery } from './queries/useRemoveLiquidity
import { RemoveLiquidityType } from './remove-liquidity.types'
import { Address, Hash } from 'viem'
import { emptyTokenAmounts, toHumanAmount } from '../LiquidityActionHelpers'
import { useDisclosure } from '@chakra-ui/hooks'
import { getPoolTokens, isCowAmmPool } from '../../pool.helpers'
import { isWrappedNativeAsset } from '@/lib/modules/tokens/token.helpers'
import { useRemoveLiquiditySimulationQuery } from './queries/useRemoveLiquiditySimulationQuery'
import { useRemoveLiquiditySteps } from './useRemoveLiquiditySteps'
import { useTransactionSteps } from '@/lib/modules/transactions/transaction-steps/useTransactionSteps'
import { HumanTokenAmountWithAddress } from '@/lib/modules/tokens/token.types'
import { getUserWalletBalance } from '../../user-balance.helpers'
import { useModalWithPoolRedirect } from '../../useModalWithPoolRedirect'

export type UseRemoveLiquidityResponse = ReturnType<typeof _useRemoveLiquidity>
export const RemoveLiquidityContext = createContext<UseRemoveLiquidityResponse | null>(null)
Expand All @@ -46,7 +46,6 @@ export function _useRemoveLiquidity(urlTxHash?: Hash) {
const { getToken, usdValueForToken, getNativeAssetToken, getWrappedNativeAssetToken } =
useTokens()
const { isConnected } = useUserAccount()
const previewModalDisclosure = useDisclosure()

const maxHumanBptIn: HumanAmount = getUserWalletBalance(pool)
const humanBptIn: HumanAmount = bn(maxHumanBptIn)
Expand Down Expand Up @@ -234,6 +233,8 @@ export function _useRemoveLiquidity(urlTxHash?: Hash) {
transactionSteps.lastTransactionState,
])

const previewModalDisclosure = useModalWithPoolRedirect(pool, removeLiquidityTxHash)

return {
transactionSteps,
tokens: tokensToShow(),
Expand Down
3 changes: 3 additions & 0 deletions lib/modules/transactions/transaction-steps/TransactionStateProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ export function _useTransactionState() {
v = resetTransaction(v)
}

// Avoid updating transaction if it's already successful (avoids unnecessary re-renders and side-effects)
if (getTransaction(k)?.result.status === 'success') return

setTransactionMap(new Map(transactionMap.set(k, v)))
}

Expand Down
Loading