Do not call same functons twice

thesandboxgame · Sep 6, 2024 · 88bc154 · 88bc154 · github-actions · Sep 6, 2024
1 parent fac4d77
commit 88bc154
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/packages/marketplace/contracts/TransferManager.sol b/packages/marketplace/contracts/TransferManager.sol
@@ -145,14 +145,17 @@ abstract contract TransferManager is Initializable, ITransferManager {
         DealSide memory paymentSide,
         DealSide memory nftSide
     ) internal pure returns (address paymentSideRecipient, address nftSideRecipient) {
-        if (LibAsset.decodeRecipient(paymentSide.asset.assetType) != address(0)) {
-            paymentSideRecipient = LibAsset.decodeRecipient(paymentSide.asset.assetType);
+        address decodedPaymentSideRecipient = LibAsset.decodeRecipient(paymentSide.asset.assetType);
+        address decodedNftSideRecipient = LibAsset.decodeRecipient(nftSide.asset.assetType);
+
+        if (decodedPaymentSideRecipient != address(0)) {
+            paymentSideRecipient = decodedPaymentSideRecipient;
         } else {
             paymentSideRecipient = paymentSide.account;
         }
 
-        if (LibAsset.decodeRecipient(nftSide.asset.assetType) != address(0)) {
-            nftSideRecipient = LibAsset.decodeRecipient(nftSide.asset.assetType);
+        if (decodedNftSideRecipient != address(0)) {
+            nftSideRecipient = decodedNftSideRecipient;
         } else {
             nftSideRecipient = nftSide.account;
         }