fix: UI issues and improvements (#386)

* feat: UI bug fixes * feat: update debt amount
Synthetixio · Aug 2, 2024 · 71844a4 · 71844a4
1 parent a070c78
commit 71844a4
Show file tree

Hide file tree

Showing 13 changed files with 365 additions and 215 deletions.
diff --git a/liquidity/components/BorrowModal/BorrowModal.tsx b/liquidity/components/BorrowModal/BorrowModal.tsx
@@ -139,7 +139,7 @@ export const BorrowModal: React.FC<{
   const execBorrowWithErrorParser = useCallback(async () => {
     try {
       await execBorrow();
-      await queryClient.invalidateQueries({
+      queryClient.invalidateQueries({
         queryKey: [`${network?.id}-${network?.preset}`, 'LiquidityPosition'],
         exact: false,
       });

diff --git a/liquidity/components/ClaimModal/ClaimModal.tsx b/liquidity/components/ClaimModal/ClaimModal.tsx
@@ -157,10 +157,13 @@ export const ClaimModal: React.FC<{
     try {
       await execBorrow();
 
-      await queryClient.invalidateQueries({
+      queryClient.invalidateQueries({
         queryKey: [`${network?.id}-${network?.preset}`, 'LiquidityPosition'],
         exact: false,
       });
+      queryClient.invalidateQueries({
+        queryKey: [`${network?.id}-${network?.preset}`, 'TokenBalance'],
+      });
       setDebtChange(ZEROWEI);
     } catch (error: any) {
       const contractError = errorParserCoreProxy(error);

diff --git a/liquidity/components/RepayModal/RepayModal.tsx b/liquidity/components/RepayModal/RepayModal.tsx
@@ -243,6 +243,7 @@ export const RepayModal: React.FC<{
               queryKey: [`${network?.id}-${network?.preset}`, 'LiquidityPosition'],
             }),
           ]);
+
           setDebtChange(ZEROWEI);
 
           toast.closeAll();

diff --git a/liquidity/components/UndelegateModal/UndelegateModal.tsx b/liquidity/components/UndelegateModal/UndelegateModal.tsx
@@ -176,10 +176,20 @@ export const UndelegateModal: UndelegateModalProps = ({ onClose, isOpen, liquidi
             await execUndelegate();
           }
 
-          await queryClient.invalidateQueries({
+          queryClient.invalidateQueries({
             queryKey: [`${network?.id}-${network?.preset}`, 'LiquidityPosition'],
             exact: false,
           });
+          queryClient.invalidateQueries({
+            queryKey: [`${network?.id}-${network?.preset}`, 'LiquidityPositions'],
+          });
+          queryClient.invalidateQueries({
+            queryKey: [
+              `${network?.id}-${network?.preset}`,
+              'AccountCollateralUnlockDate',
+              { accountId: params.accountId },
+            ],
+          });
 
           setCollateralChange(ZEROWEI);
         } catch (error: any) {

diff --git a/liquidity/lib/validatePosition/validatePosition.ts b/liquidity/lib/validatePosition/validatePosition.ts
@@ -31,7 +31,7 @@ export const validatePosition = ({
   const maxDebt = maybeMaxDebt.gte(0) ? maybeMaxDebt : wei(0);
 
   const isValid =
-    (debtChange.eq(0) && collateralChange.eq(0)) ||
+    (debtChange.lte(0) && collateralChange.gte(0)) ||
     ((newCRatio.gte(targetCRatio) || newCRatio.lte(0)) &&
       (newDebt.lte(0) || newCollateralAmount.gt(0)));
-Original file line number
+Diff line change
@@ Expand Up / @@ -243,6 +243,7 @@ export const RepayModal: React.FC<{ @@
                   queryKey: [`${network?.id}-${network?.preset}`, 'LiquidityPosition'],
                 }),
               ]);
               setDebtChange(ZEROWEI);
               toast.closeAll();
@@ Expand Down @@