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: block adding too unbalanced #92

Merged
merged 14 commits into from
Oct 24, 2024
Merged

feat: block adding too unbalanced #92

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
de6b7f9
intercept BAL#304 error and show msg
groninge01 Oct 22, 2024
3a0473a
revert test settings
groninge01 Oct 22, 2024
a189a0c
Merge branch 'main' into feat/add-msg-for-bal-error-304
groninge01 Oct 23, 2024
54eef45
use TokenInputsValidationProvider ( and .includes() )
groninge01 Oct 23, 2024
4255f9c
update text
groninge01 Oct 23, 2024
988c9f4
revert change
groninge01 Oct 23, 2024
00bb29d
add custom error
groninge01 Oct 23, 2024
b1df5c4
exclude specific error here
groninge01 Oct 23, 2024
42b44ac
update text
groninge01 Oct 23, 2024
887df68
refactored and updated with v3 error
groninge01 Oct 24, 2024
69b6c08
revert changes
groninge01 Oct 24, 2024
2bcd38e
rename
groninge01 Oct 24, 2024
6c43a16
rename
groninge01 Oct 24, 2024
d9a46a7
move error msg
groninge01 Oct 24, 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
1 change: 0 additions & 1 deletion packages/lib/modules/pool/actions/add-liquidity/AddLiquidityProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export function _useAddLiquidity(urlTxHash?: Hash) {
const [wethIsEth, setWethIsEth] = useState(false)
const [totalUSDValue, setTotalUSDValue] = useState('0')
const [proportionalSlippage, setProportionalSlippage] = useState<string>('0')

const { pool, refetch: refetchPool, isLoading } = usePool()
const { getToken, getNativeAssetToken, getWrappedNativeAssetToken, isLoadingTokenPrices } =
useTokens()
Expand Down
17 changes: 17 additions & 0 deletions packages/lib/modules/pool/actions/add-liquidity/form/AddLiquidityForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ import { BalAlert } from '@repo/lib/shared/components/alerts/BalAlert'
import { SafeAppAlert } from '@repo/lib/shared/components/alerts/SafeAppAlert'
import { useTokens } from '@repo/lib/modules/tokens/TokensProvider'

type PriceImpactErrorType = Error & { shortMessage: string }

// small wrapper to prevent out of context error
export function AddLiquidityForm() {
const { validTokens, proportionalSlippage } = useAddLiquidity()
Expand Down Expand Up @@ -87,6 +89,7 @@ function AddLiquidityMainForm() {
proportionalSlippage,
slippage,
setProportionalSlippage,
humanAmountsIn,
} = useAddLiquidity()

const nextBtn = useRef(null)
Expand All @@ -103,6 +106,20 @@ function AddLiquidityMainForm() {
setPriceImpact(priceImpactQuery.data)
}, [priceImpactQuery.data])

useEffect(() => {
humanAmountsIn.forEach(amount => {
if (priceImpactQuery.error?.message.includes('BAL#304') && amount.humanAmount) {
setValidationError(amount.tokenAddress, 'Amount is causing an unbalanced join')
groninge01 marked this conversation as resolved.
Show resolved Hide resolved
}
})
}, [priceImpactQuery.error])

useEffect(() => {
humanAmountsIn.forEach(amount => {
setValidationError(amount.tokenAddress, '')
})
}, [humanAmountsIn])
groninge01 marked this conversation as resolved.
Show resolved Hide resolved

const hasPriceImpact = priceImpact !== undefined && priceImpact !== null
const priceImpactLabel = hasPriceImpact ? fNum('priceImpact', priceImpact) : '-'

Expand Down
126 changes: 65 additions & 61 deletions packages/lib/modules/price-impact/PriceImpactAccordion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { usePriceImpact } from '@repo/lib/modules/price-impact/PriceImpactProvid
import { fNum } from '@repo/lib/shared/utils/numbers'
import { ReactNode, useEffect } from 'react'
import { PriceImpactAcceptModal } from './PriceImpactAcceptModal'
import { useTokenInputsValidation } from '../tokens/TokenInputsValidationProvider'

interface PriceImpactAccordionProps {
setNeedsToAcceptPIRisk: (value: boolean) => void
Expand All @@ -39,6 +40,8 @@ export function PriceImpactAccordion({
cannotCalculatePriceImpact = false,
}: PriceImpactAccordionProps) {
const acceptHighImpactDisclosure = useDisclosure()
const { hasValidationErrors } = useTokenInputsValidation()

const {
priceImpactLevel,
priceImpactColor,
Expand Down Expand Up @@ -88,69 +91,70 @@ export function PriceImpactAccordion({
<AccordionPanel py="md">{accordionPanelComponent}</AccordionPanel>
</AccordionItem>
</Accordion>
{(priceImpactLevel === 'high' || priceImpactLevel === 'max' || isUnknownPriceImpact) && (
<>
<VStack align="start" mt="md" spacing="md" w="full">
<Alert status="error">
<PriceImpactIcon mt="1" priceImpactLevel={priceImpactLevel} size={24} />
<Box ml="md">
<AlertTitle>
{isUnknownPriceImpact
? 'Unknown price impact'
: `Price impact is high: Exceeds ${
priceImpactLevel === 'high' ? '1' : '5'
}.00%`}
</AlertTitle>
<AlertDescription>
<Text color="font.dark" fontSize="sm">
{!hasValidationErrors &&
(priceImpactLevel === 'high' || priceImpactLevel === 'max' || isUnknownPriceImpact) && (
groninge01 marked this conversation as resolved.
Show resolved Hide resolved
<>
<VStack align="start" mt="md" spacing="md" w="full">
<Alert status="error">
<PriceImpactIcon mt="1" priceImpactLevel={priceImpactLevel} size={24} />
<Box ml="md">
<AlertTitle>
{isUnknownPriceImpact
? 'The price impact cannot be calculated. Only proceed if you know exactly what you are doing.'
: 'The higher the price impact, the worse exchange rate you get for this swap.'}
</Text>
</AlertDescription>
</Box>
</Alert>
<Card variant="subSection">
<CardBody>
<Text fontWeight="bold" mb="sm">
Price impact acknowledgement
</Text>
{isUnknownPriceImpact ? (
<Text color="grayText" fontSize="sm">
I accept that the price impact of this transaction is unknown. I understand that
proceeding may result in losses if my transaction moves the market price
unfavorably based on the current depth of the market.
</Text>
) : (
<Text color="grayText" fontSize="sm">
I accept the high price impact of{' '}
{priceImpact && fNum('priceImpact', priceImpact)}. I understand that this may
result in losses, since the size of my swap is likely to move the market price
unfavorably based on the current depth of the market.
? 'Unknown price impact'
: `Price impact is high: Exceeds ${
priceImpactLevel === 'high' ? '1' : '5'
}.00%`}
</AlertTitle>
<AlertDescription>
<Text color="font.dark" fontSize="sm">
{isUnknownPriceImpact
? 'The price impact cannot be calculated. Only proceed if you know exactly what you are doing.'
: 'The higher the price impact, the worse exchange rate you get for this swap.'}
</Text>
</AlertDescription>
</Box>
</Alert>
<Card variant="subSection">
<CardBody>
<Text fontWeight="bold" mb="sm">
Price impact acknowledgement
</Text>
)}
</CardBody>
<CardFooter pt="md">
{!acceptPriceImpactRisk ? (
<Button onClick={handleClick} variant="secondary" w="full">
I accept {isUnknownPriceImpact ? 'unknown' : 'high'} price impact
</Button>
) : (
<Button isDisabled variant="secondary" w="full">
{isUnknownPriceImpact ? 'Unknown' : 'High'} price impact accepted
</Button>
)}
</CardFooter>
</Card>
</VStack>
<PriceImpactAcceptModal
isOpen={acceptHighImpactDisclosure.isOpen}
onClose={acceptHighImpactDisclosure.onClose}
onOpen={acceptHighImpactDisclosure.onOpen}
setAcceptHighPriceImpact={setAcceptPriceImpactRisk}
/>
</>
)}
{isUnknownPriceImpact ? (
<Text color="grayText" fontSize="sm">
I accept that the price impact of this transaction is unknown. I understand
that proceeding may result in losses if my transaction moves the market price
unfavorably based on the current depth of the market.
</Text>
) : (
<Text color="grayText" fontSize="sm">
I accept the high price impact of{' '}
{priceImpact && fNum('priceImpact', priceImpact)}. I understand that this may
result in losses, since the size of my swap is likely to move the market price
unfavorably based on the current depth of the market.
</Text>
)}
</CardBody>
<CardFooter pt="md">
{!acceptPriceImpactRisk ? (
<Button onClick={handleClick} variant="secondary" w="full">
I accept {isUnknownPriceImpact ? 'unknown' : 'high'} price impact
</Button>
) : (
<Button isDisabled variant="secondary" w="full">
{isUnknownPriceImpact ? 'Unknown' : 'High'} price impact accepted
</Button>
)}
</CardFooter>
</Card>
</VStack>
<PriceImpactAcceptModal
isOpen={acceptHighImpactDisclosure.isOpen}
onClose={acceptHighImpactDisclosure.onClose}
onOpen={acceptHighImpactDisclosure.onOpen}
setAcceptHighPriceImpact={setAcceptPriceImpactRisk}
/>
</>
)}
</Box>
)
}
Loading