From e146d1d862b1ccebfab23abfac32685cbe4a2172 Mon Sep 17 00:00:00 2001
From: Shriya Tyagi <shriya243@gmail.com>
Date: Thu, 23 May 2024 20:03:34 +0530
Subject: [PATCH 1/2] feat: fix approve

---
 contracts/mainnet/connectors/fluid/main.sol | 35 ++++++++++++---------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/contracts/mainnet/connectors/fluid/main.sol b/contracts/mainnet/connectors/fluid/main.sol
index f518c91..c9321c6 100644
--- a/contracts/mainnet/connectors/fluid/main.sol
+++ b/contracts/mainnet/connectors/fluid/main.sol
@@ -6,12 +6,13 @@ pragma solidity ^0.8.2;
  * @dev Lending & Borrowing.
  */
 
-import {Stores} from "../../common/stores.sol";
+import {Basic} from "../../common/basic.sol";
 import {TokenInterface} from "../../common/interfaces.sol";
+
 import {Events} from "./events.sol";
 import {IVault} from "./interface.sol";
 
-abstract contract FluidConnector is Events, Stores {
+abstract contract FluidConnector is Events, Basic {
     /**
      * @dev Returns Eth address
      */
@@ -103,8 +104,9 @@ abstract contract FluidConnector is Events, Stores {
                     );
                 }
 
-                TokenInterface(vaultDetails_.supplyToken).approve(
-                    vaultAddress_,
+                approve(
+                    TokenInterface(vaultDetails_.supplyToken), 
+                    vaultAddress_, 
                     uint256(newCol_)
                 );
             }
@@ -121,12 +123,14 @@ abstract contract FluidConnector is Events, Stores {
                     : uint256(-newDebt_);
             } else {
                 isPaybackMin_
-                    ? TokenInterface(vaultDetails_.borrowToken).approve(
-                        vaultAddress_,
+                    ? approve(
+                        TokenInterface(vaultDetails_.borrowToken), 
+                        vaultAddress_, 
                         repayApproveAmt_
                     )
-                    : TokenInterface(vaultDetails_.borrowToken).approve(
-                        vaultAddress_,
+                    : approve(
+                        TokenInterface(vaultDetails_.borrowToken), 
+                        vaultAddress_, 
                         uint256(-newDebt_)
                     );
             }
@@ -208,8 +212,9 @@ abstract contract FluidConnector is Events, Stores {
                     );
                 }
 
-                TokenInterface(vaultDetails_.supplyToken).approve(
-                    vaultAddress_,
+                approve(
+                    TokenInterface(vaultDetails_.supplyToken), 
+                    vaultAddress_, 
                     uint256(newCol_)
                 );
             }
@@ -226,12 +231,14 @@ abstract contract FluidConnector is Events, Stores {
                     : uint256(-newDebt_);
             } else {
                 isPaybackMin_
-                    ? TokenInterface(vaultDetails_.borrowToken).approve(
-                        vaultAddress_,
+                    ? approve(
+                        TokenInterface(vaultDetails_.borrowToken), 
+                        vaultAddress_, 
                         repayApproveAmt_
                     )
-                    : TokenInterface(vaultDetails_.borrowToken).approve(
-                        vaultAddress_,
+                    : approve(
+                        TokenInterface(vaultDetails_.borrowToken), 
+                        vaultAddress_, 
                         uint256(-newDebt_)
                     );
             }

From 1148d4753dea9a187a98336f3932cc2b0b445590 Mon Sep 17 00:00:00 2001
From: Shriya Tyagi <shriya243@gmail.com>
Date: Thu, 23 May 2024 20:05:36 +0530
Subject: [PATCH 2/2] wip

---
 contracts/mainnet/connectors/fluid/main.sol | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contracts/mainnet/connectors/fluid/main.sol b/contracts/mainnet/connectors/fluid/main.sol
index c9321c6..918649f 100644
--- a/contracts/mainnet/connectors/fluid/main.sol
+++ b/contracts/mainnet/connectors/fluid/main.sol
@@ -263,5 +263,5 @@ abstract contract FluidConnector is Events, Basic {
 }
 
 contract ConnectV2Fluid is FluidConnector {
-    string public constant name = "Fluid-v1.1";
+    string public constant name = "Fluid-v1.2";
 }