From 0d0770ecc7ee313a9d9ac4a4a6b6b967272bb12a Mon Sep 17 00:00:00 2001
From: Samyak Jain <34437877+KaymasJain@users.noreply.github.com>
Date: Wed, 14 Apr 2021 04:00:38 +0530
Subject: [PATCH] Flash ethAmt update

---
 contracts/senders/aave-v2-migrator/main.sol | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/contracts/senders/aave-v2-migrator/main.sol b/contracts/senders/aave-v2-migrator/main.sol
index 22315a4..3d56f07 100644
--- a/contracts/senders/aave-v2-migrator/main.sol
+++ b/contracts/senders/aave-v2-migrator/main.sol
@@ -191,10 +191,6 @@ contract MigrateResolver is LiquidityResolver {
             "invalid-length"
         );
 
-        if (ethAmt > 0) {
-            aave.deposit(wethAddr, ethAmt, address(this), 3288);
-        }
-
         (uint[] memory stableBorrows, uint[] memory variableBorrows, uint[] memory totalBorrows) = _PaybackCalculate(aave, _data, sourceDsa);
 
         _PaybackStable(_data.borrowTokens.length, aave, _data.borrowTokens, stableBorrows, sourceDsa);
@@ -215,10 +211,6 @@ contract MigrateResolver is LiquidityResolver {
         // Checks the amount that user is trying to migrate is 20% below the Liquidation
         _checkRatio(data);
 
-        if (ethAmt > 0) {
-            aave.withdraw(wethAddr, ethAmt, address(this));
-        }
-
         isPositionSafe();
 
         stateSender.syncState(polygonReceiver, abi.encode(data));
@@ -245,7 +237,9 @@ contract MigrateResolver is LiquidityResolver {
 
         TokenInterface wethContract = TokenInterface(wethAddr);
         wethContract.approve(address(aave), ethAmt);
+        aave.deposit(wethAddr, ethAmt, address(this), 3288);
         _migrate(aave, _data, dsa, ethAmt);
+        aave.withdraw(wethAddr, ethAmt, address(this));
         wethContract.transfer(address(flashloanContract), ethAmt);
     }