fix(ui-ux): allow adding of dusd collateral with active dusd loan (#4131

)
BirthdayResearch · Nov 9, 2023 · 13cf063 · 13cf063
1 parent c074dcf
commit 13cf063
Showing 1 changed file with 7 additions and 18 deletions.
diff --git a/mobile-app/app/screens/AppNavigator/screens/Loans/screens/AddOrRemoveCollateralScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Loans/screens/AddOrRemoveCollateralScreen.tsx
@@ -390,25 +390,14 @@ export function AddOrRemoveCollateralScreen({ route }: Props): JSX.Element {
       };
     } else if (
       hasLoan &&
-      vault.loanAmounts.some((loan) => loan.symbol === "DUSD")
+      vault.loanAmounts.some((loan) => loan.symbol === "DUSD") &&
+      vault.collateralAmounts.every((col) => col.symbol === "DUSD") &&
+      !["DFI", "DUSD"].includes(selectedCollateralItem.token.symbol)
     ) {
-      const has100PercentDusdCol = vault.collateralAmounts.every(
-        (col) => col.symbol === "DUSD",
-      );
-      if (
-        (isFeatureAvailable("loop_dusd") &&
-          has100PercentDusdCol &&
-          !["DFI", "DUSD"].includes(selectedCollateralItem.token.symbol)) ||
-        (!has100PercentDusdCol &&
-          selectedCollateralItem.token.symbol === "DUSD") ||
-        (selectedCollateralItem.token.symbol === "DFI" &&
-          isDFILessThanHalfOfRequiredCollateral)
-      ) {
-        return {
-          testID: "full_dusd_col_affected_vault_error",
-          message: addOrRemoveCollateralErrors.DusdAffectVault,
-        };
-      }
+      return {
+        testID: "full_dusd_col_affected_vault_error",
+        message: addOrRemoveCollateralErrors.DusdAffectVault,
+      };
     }
   };
   const getRemoveCollateralErrorMessage = ():