Skip to content

Merge pull request #1696 from QuickSwap/hotfix/show-error-message-order-closing #1697

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

Merged
sameepsi merged 5 commits into from
Feb 25, 2025
Merged

Merge pull request #1696 from QuickSwap/hotfix/show-error-message-order-closing #1697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b362145
Fix farm list with undefined token
0xoscario Feb 24, 2025
2f5905b
Merge pull request #1694 from 0xoscario/fix/reward-v4
sameepsi Feb 24, 2025
67e5a71
show error message when closing an order on perps page
Feb 24, 2025
bc9e505
Merge branch 'dev2' into hotfix/show-error-message-order-closing
Feb 24, 2025
a56bf99
Merge pull request #1696 from QuickSwap/hotfix/show-error-message-ord…
sameepsi Feb 25, 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
8 changes: 4 additions & 4 deletions src/hooks/v3/useV3Farms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,10 +651,10 @@ export const useGetMerklRewards = (
...reasons,
[breakdown.reason]: {
unclaimed: ((reasons as any)[breakdown.reason] as any)
? ((reasons as any)[breakdown.reason] as any).unclaimed +
BigInt(breakdown.amount) -
BigInt(breakdown.claimed)
: BigInt(breakdown.amount) - BigInt(breakdown.claimed),
? ((reasons as any)[breakdown.reason] as any).unclaimed +
BigInt(breakdown.amount) -
BigInt(breakdown.claimed)
: BigInt(breakdown.amount) - BigInt(breakdown.claimed),
},
};
},
Expand Down
4 changes: 1 addition & 3 deletions src/pages/FarmPage/V3/AllMerklFarms.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,9 +482,7 @@ const AllMerklFarms: React.FC<Props> = ({
)
) : v3Farms.length > 0 ? (
v3Farms.map((farm, ind) => (
<Box key={ind} pb={2}>
<MerklFarmCard farm={farm} />
</Box>
<MerklFarmCard key={ind} farm={farm} />
))
) : (
<Box
Expand Down
166 changes: 87 additions & 79 deletions src/pages/FarmPage/V3/MerklFarmCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,92 +49,100 @@ export const MerklFarmCard: React.FC<Props> = ({ farm }) => {
const token1 = getTokenFromAddress(farm.token1, chainId, tokenMap, []);

return (
<Box width='100%' borderRadius={16} className='bg-secondary1'>
<Box padding={2} className='flex items-center flex-wrap'>
<Box
width={isMobile ? '100%' : '90%'}
className='flex items-center flex-wrap'
>
<Box
width={isMobile ? '80%' : '30%'}
className='flex items-center'
gridGap={12}
>
<DoubleCurrencyLogo
currency0={token0}
currency1={token1}
size={24}
/>
<Box className='flex items-center' gridGap={4}>
<p>
{token0?.symbol}/{token1?.symbol}
</p>
{(farm?.ammName ?? '').toLowerCase() === 'quickswapuni' &&
!!farm?.poolFee && (
<Box className='farmAPRTitleWrapper bg-textSecondary'>
<span className='text-gray32'>{farm.poolFee}%</span>
<>
{token0 && token1 && (
<Box pb={2}>
<Box width='100%' borderRadius={16} className='bg-secondary1'>
<Box padding={2} className='flex items-center flex-wrap'>
<Box
width={isMobile ? '100%' : '90%'}
className='flex items-center flex-wrap'
>
<Box
width={isMobile ? '80%' : '30%'}
className='flex items-center'
gridGap={12}
>
<DoubleCurrencyLogo
currency0={token0}
currency1={token1}
size={24}
/>
<Box className='flex items-center' gridGap={4}>
<p>
{token0?.symbol}/{token1?.symbol}
</p>
{(farm?.ammName ?? '').toLowerCase() === 'quickswapuni' &&
!!farm?.poolFee && (
<Box className='farmAPRTitleWrapper bg-textSecondary'>
<span className='text-gray32'>{farm.poolFee}%</span>
</Box>
)}
</Box>
)}
</Box>
</Box>
<Box
my={2}
width={isMobile ? '100%' : '20%'}
className='flex items-center justify-between'
>
{isMobile && <p>{t('tvl')}</p>}
<p>${formatNumber(farm.tvl)}</p>
</Box>
<Box
width={isMobile ? '100%' : '20%'}
className='flex items-center justify-between'
>
{isMobile && <p>{t('apr')}</p>}
<Box className={isMobile ? 'flex flex-col items-end' : ''}>
<small>{t('upTo')}</small>
<Box className='flex'>
<MerklFarmAPRTooltip
farms={farm.alm}
token0={farm.token0}
token1={farm.token1}
</Box>
<Box
my={2}
width={isMobile ? '100%' : '20%'}
className='flex items-center justify-between'
>
{isMobile && <p>{t('tvl')}</p>}
<p>${formatNumber(farm.tvl)}</p>
</Box>
<Box
width={isMobile ? '100%' : '20%'}
className='flex items-center justify-between'
>
{isMobile && <p>{t('apr')}</p>}
<Box className={isMobile ? 'flex flex-col items-end' : ''}>
<small>{t('upTo')}</small>
<Box className='flex'>
<MerklFarmAPRTooltip
farms={farm.alm}
token0={farm.token0}
token1={farm.token1}
>
<Box className='farmCardAPR' gridGap={4}>
<p>{formatNumber(farm.apr)}%</p>
<img src={APRHover} width={16} />
</Box>
</MerklFarmAPRTooltip>
</Box>
</Box>
</Box>
<Box
width={isMobile ? '100%' : '30%'}
my={2}
className={
isMobile ? 'flex items-center justify-between' : ''
}
>
<Box className='farmCardAPR' gridGap={4}>
<p>{formatNumber(farm.apr)}%</p>
<img src={APRHover} width={16} />
{isMobile && <p>{t('rewards')}</p>}
<Box className={isMobile ? 'flex flex-col items-end' : ''}>
<p>
{formatNumber(farm.dailyAmount)} {farm.symbolRewardToken}{' '}
<small className='text-secondary'>{t('daily')}</small>
</p>
</Box>
</MerklFarmAPRTooltip>
</Box>
</Box>
<Box width={isMobile ? '100%' : '10%'} mt={0}>
<Button
className='farmCardButton'
disabled={!farm.pool}
onClick={() => {
if (farm.pool) {
redirectWithPool(farm.pool);
}
}}
>
{t('view')}
</Button>
</Box>
</Box>
</Box>
<Box
width={isMobile ? '100%' : '30%'}
my={2}
className={isMobile ? 'flex items-center justify-between' : ''}
>
{isMobile && <p>{t('rewards')}</p>}
<Box className={isMobile ? 'flex flex-col items-end' : ''}>
<p>
{formatNumber(farm.dailyAmount)} {farm.symbolRewardToken}{' '}
<small className='text-secondary'>{t('daily')}</small>
</p>
</Box>
</Box>
</Box>
<Box width={isMobile ? '100%' : '10%'} mt={0}>
<Button
className='farmCardButton'
disabled={!farm.pool}
onClick={() => {
if (farm.pool) {
redirectWithPool(farm.pool);
}
}}
>
{t('view')}
</Button>
</Box>
</Box>
</Box>
)}
</>
);
};

Expand Down
10 changes: 9 additions & 1 deletion src/pages/PerpsPage/ClosePositionButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const ClosePositionButton: React.FC<{
};
const [loading, setLoading] = useState(false);
const { onSubmit, helper } = useOrderEntry(order, { watchOrderbook: true });
const [error, setError] = useState('');

const { data: orderValidation } = useQuery({
queryKey: ['orderly-order-validation', order],
Expand Down Expand Up @@ -143,20 +144,27 @@ export const ClosePositionButton: React.FC<{
</Box>
</Box>
)}
{error && (
<Box mt={2}>
<p className='text-error'>{error}</p>
</Box>
)}
<Box mt={2} className='flex' gridGap={12}>
<Button
className='perpsConfirmButton'
disabled={loading}
onClick={async () => {
try {
setLoading(true);
setError('');
await onSubmit(order);
setLoading(false);
handleClose();
if (afterClose) {
afterClose();
}
} catch {
} catch (e) {
setError(JSON.stringify(e));
setLoading(false);
}
}}
Expand Down
Loading