Merge branch 'main' into perf/compiler-settings

axelarnetwork · Oct 29, 2024 · d6b0a96 · d6b0a96
2 parents defa892 + 53dd414
commit d6b0a96
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/contracts/InterchainTokenService.sol b/contracts/InterchainTokenService.sol
@@ -701,14 +701,15 @@ contract InterchainTokenService is
             destinationAddress = destinationAddressBytes.toAddress();
         }
 
-        address recipient = (expressExecutor == address(0)) ? destinationAddress : expressExecutor;
-        address tokenAddress;
-        (amount, tokenAddress) = _giveToken(tokenId, recipient, amount);
         // Return token to the express executor
         if (expressExecutor != address(0)) {
+            _giveToken(tokenId, expressExecutor, amount);
             return;
         }
 
+        address tokenAddress;
+        (amount, tokenAddress) = _giveToken(tokenId, destinationAddress, amount);
+
         // slither-disable-next-line reentrancy-events
         emit InterchainTransferReceived(
             commandId,