fix: withdraw issue (#383)

Synthetixio · Jul 31, 2024 · e985021 · e985021
1 parent 40e1c1a
commit e985021
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/liquidity/components/WithdrawModal/WithdrawModal.tsx b/liquidity/components/WithdrawModal/WithdrawModal.tsx
@@ -184,6 +184,16 @@ export function WithdrawModal({
  queryClient.invalidateQueries({
  queryKey: [`${network?.id}-${network?.preset}`, 'LiquidityPositions', { accountId }],
  });
+ queryClient.invalidateQueries({
+ queryKey: [
+ `${network?.id}-${network?.preset}`,
+ 'AccountCollateralUnlockDate',
+ { accountId },
+ ],
+ });
+ queryClient.invalidateQueries({
+ queryKey: [`${network?.id}-${network?.preset}`, 'TokenBalance'],
+ });
 
  setWithdrawAmount(ZEROWEI);
  } else {

diff --git a/liquidity/lib/useWithdraw/useWithdraw.tsx b/liquidity/lib/useWithdraw/useWithdraw.tsx
@@ -35,8 +35,13 @@ export const useWithdraw = ({
  mutationFn: async () => {
  if (!signer || !network || !provider) throw new Error('No signer or network');
 
- if (!(CoreProxy && collateralTypeAddress && amount && collateralPriceIds)) return;
- if (amount?.eq(0)) return;
+ if (!(CoreProxy && collateralTypeAddress && amount && collateralPriceIds)) {
+ throw new Error('Not ready');
+ }
+ if (amount?.eq(0)) {
+ throw new Error('Amount less than 0');
+ }
+
  const walletAddress = await signer.getAddress();
 
  try {

diff --git a/liquidity/lib/useWithdrawBaseAndromeda/useWithdrawBaseAndromeda.tsx b/liquidity/lib/useWithdrawBaseAndromeda/useWithdrawBaseAndromeda.tsx
@@ -43,12 +43,14 @@ export const useWithdrawBaseAndromeda = ({
  const mutation = useMutation({
  mutationFn: async () => {
  if (!signer || !network || !provider) throw new Error('No signer or network');
- if (!(CoreProxy && SpotProxy && accountId && usdTokens?.sUSD && usdTokens.snxUSD)) return;
+ if (!(CoreProxy && SpotProxy && accountId && usdTokens?.sUSD && usdTokens.snxUSD)) {
+ throw new Error('Not ready');
+ }
 
  const total = snxUSDCollateral.add(sUSDCCollateral);
 
  if (total.lt(amountToWithdraw)) {
- return;
+ throw new Error('Exceeds balance');
  }
 
  const sUSDCAmount = amountToWithdraw.gt(sUSDCCollateral) ? sUSDCCollateral : amountToWithdraw;

diff --git a/liquidity/lib/validatePosition/validatePosition.ts b/liquidity/lib/validatePosition/validatePosition.ts
@@ -31,8 +31,9 @@ export const validatePosition = ({
  const maxDebt = maybeMaxDebt.gte(0) ? maybeMaxDebt : wei(0);
 
  const isValid =
- (newCRatio.gte(targetCRatio) || newCRatio.lte(0)) &&
- (newDebt.lte(0) || newCollateralAmount.gt(0));
+ (debtChange.eq(0) && collateralChange.eq(0)) ||
+ ((newCRatio.gte(targetCRatio) || newCRatio.lte(0)) &&
+ (newDebt.lte(0) || newCollateralAmount.gt(0)));
 
  return {
  isValid,