From 4f28f7a1184864e2225c4841c32ef5273b38eba3 Mon Sep 17 00:00:00 2001
From: moon <56061215+MgKyawLay@users.noreply.github.com>
Date: Sun, 29 Mar 2026 22:43:15 +0630
Subject: [PATCH] Update InjectKeyFragment.java

---
 .../java/com/utsmm/kbz/ui/settings/InjectKeyFragment.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/utsmm/kbz/ui/settings/InjectKeyFragment.java b/app/src/main/java/com/utsmm/kbz/ui/settings/InjectKeyFragment.java
index 03b3286..e003b2c 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/settings/InjectKeyFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/settings/InjectKeyFragment.java
@@ -37,6 +37,7 @@ public class InjectKeyFragment extends DataBindingFragment {
     private DownloadFlow mDownloadFlow;
     private int keyIndexTmp = 8; // Default key index
     private final List<HostSelectionItem> hostSelectionItems = new ArrayList<>();
+    private HostSelectionItem selectedHostSelectionItem;
 
     @Override
     protected void initViewModel() {
@@ -128,6 +129,7 @@ public class InjectKeyFragment extends DataBindingFragment {
     }
 
     private void applyHostSelection(@NonNull HostSelectionItem selectionItem) {
+            selectedHostSelectionItem = selectionItem;
             binding.terminalIdValue.setText(getDisplayValue(selectionItem.terminalId));
             binding.merchantIdValue.setText(getDisplayValue(selectionItem.merchantId));
     }
@@ -156,14 +158,14 @@ public class InjectKeyFragment extends DataBindingFragment {
 
             mDownloadFlow = DownloadFlow.getInstance();
 
-            String terminalId = SystemParamsOperation.getInstance().getTerminalId();
-            String merchantId = SystemParamsOperation.getInstance().getMerchantId();
+            String terminalId = selectedHostSelectionItem != null ? selectedHostSelectionItem.terminalId : null;
+            String merchantId = selectedHostSelectionItem != null ? selectedHostSelectionItem.merchantId : null;
             String serialNo = TMSUtil.getInstance().getSerialNumber();
 
             // Validate configuration
             if (TextUtils.isEmpty(terminalId) || TextUtils.isEmpty(merchantId) || TextUtils.isEmpty(serialNo)) {
                 dismissLoadingDialog();
-                showDeclineDialog("Please configure Terminal ID, Merchant ID first in TMS Configuration");
+                showDeclineDialog("Please configure the selected Terminal ID and Merchant ID first in TMS Configuration");
                 return;
             }