From 5273f45b3f75c3a7c13391542fac3d47a203a982 Mon Sep 17 00:00:00 2001
From: kiwiidb <kwinten.debacker@hotmail.com>
Date: Mon, 2 Oct 2023 10:20:27 +0200
Subject: [PATCH] fix merge issue

---
 controllers_v2/keysend.ctrl.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers_v2/keysend.ctrl.go b/controllers_v2/keysend.ctrl.go
index 96490f04..943c9ddc 100644
--- a/controllers_v2/keysend.ctrl.go
+++ b/controllers_v2/keysend.ctrl.go
@@ -172,13 +172,13 @@ func (controller *KeySendController) SingleKeySend(ctx context.Context, reqBody
 			HttpStatusCode: 400,
 		}
 	}
-	resp, err := controller.svc.CheckPaymentAllowed(c.Request().Context(), lnPayReq, userID)
+	resp, err := controller.svc.CheckPaymentAllowed(ctx, lnPayReq, userID)
 	if err != nil {
 		controller.svc.Logger.Error(err)
 		return nil, &responses.GeneralServerError
 	}
 	if resp != nil {
-		c.Logger().Errorf("User does not have enough balance user_id:%v amount:%v", userID, lnPayReq.PayReq.NumSatoshis)
+		controller.svc.Logger.Errorf("User does not have enough balance user_id:%v amount:%v", userID, lnPayReq.PayReq.NumSatoshis)
 		return nil, resp
 	}
 	invoice, err := controller.svc.AddOutgoingInvoice(ctx, userID, "", lnPayReq)