format fix

thesandboxgame · Sep 29, 2023 · 049625d · 049625d
1 parent 756b9f1
commit 049625d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/marketplace/contracts/exchange/ExchangeCore.sol b/packages/marketplace/contracts/exchange/ExchangeCore.sol
@@ -228,7 +228,7 @@ abstract contract ExchangeCore is Initializable, TransferExecutor, ITransferMana
             LibFeeSide.getFeeSide(makeMatch.assetClass, takeMatch.assetClass)
         );
 
-        // TODO: this force me to pass from, do we want it ? 
+        // TODO: this force me to pass from, do we want it ?
         // answer it was cut out with native orders
     }
 

diff --git a/packages/marketplace/contracts/transfer-manager/TransferManager.sol b/packages/marketplace/contracts/transfer-manager/TransferManager.sol
@@ -105,8 +105,13 @@ abstract contract TransferManager is ERC165Upgradeable, ITransferManager {
         LibDeal.DealSide memory right,
         LibFeeSide.FeeSide feeSide
     ) internal override {
+<<<<<<< HEAD
         if (feeSide == LibFeeSide.FeeSide.LEFT) {
             doTransfersWithRoyalties(left, right);
+=======
+        if (dealData.feeSide == LibFeeSide.FeeSide.LEFT) {
+            doTransfersWithFees(left, right, dealData.maxFeesBasePoint);
+>>>>>>> format fix
             transferPayouts(right.asset.assetType, right.asset.value, right.from, left.payouts);
         } else if (feeSide == LibFeeSide.FeeSide.RIGHT) {
             doTransfersWithRoyalties(right, left);