From 10a548a3b0c65656497a2b234a0a6da2c07f915d Mon Sep 17 00:00:00 2001
From: Julian Compagni Portis <jcompagni@gmail.com>
Date: Tue, 24 Sep 2024 11:56:48 -0400
Subject: [PATCH] fix merge

---
 x/dex/keeper/cancel_limit_order.go          | 4 ++--
 x/dex/keeper/withdraw_filled_limit_order.go | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x/dex/keeper/cancel_limit_order.go b/x/dex/keeper/cancel_limit_order.go
index 24142db0e..967ff5602 100644
--- a/x/dex/keeper/cancel_limit_order.go
+++ b/x/dex/keeper/cancel_limit_order.go
@@ -42,8 +42,8 @@ func (k Keeper) CancelLimitOrderCore(
 		callerAddr,
 		pairID.Token0,
 		pairID.Token1,
-		tradePairID.MakerDenom,
-		tradePairID.TakerDenom,
+		makerDenom,
+		takerDenom,
 		takerCoinOut.Amount,
 		makerCoinOut.Amount,
 		trancheKey,
diff --git a/x/dex/keeper/withdraw_filled_limit_order.go b/x/dex/keeper/withdraw_filled_limit_order.go
index 536c7d38f..40ff3c6ec 100644
--- a/x/dex/keeper/withdraw_filled_limit_order.go
+++ b/x/dex/keeper/withdraw_filled_limit_order.go
@@ -39,10 +39,10 @@ func (k Keeper) WithdrawFilledLimitOrderCore(
 		callerAddr,
 		pairID.Token0,
 		pairID.Token1,
-		tradePairID.MakerDenom,
-		tradePairID.TakerDenom,
-		amountOutTokenOut,
-		remainingTokenIn,
+		makerDenom,
+		takerDenom,
+		takerCoinOut.Amount,
+		makerCoinOut.Amount,
 		trancheKey,
 	))