app/src/main/java/com/utsmm/kbz/MainFragment.java

@@ -4,18 +4,25 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 
 import android.os.Bundle;
+import androidx.appcompat.app.AlertDialog;
 
 import android.os.RemoteException;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.View;
+import android.view.Gravity;
 import android.widget.Toast;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import androidx.lifecycle.Observer;
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.core.content.ContextCompat;
 
 import com.denzcoskun.imageslider.ImageSlider;
 import com.denzcoskun.imageslider.constants.ScaleTypes;
@@ -58,7 +65,6 @@ import com.utsmm.kbz.ui.core_viewmodel.TMSProcessViewModel;
 import com.utsmm.kbz.util.Connectivity;
 
 
-import com.utsmm.kbz.util.CurrencySelectionHelper;
 import com.utsmm.kbz.util.dialog.AlertXDialog;
 import com.utsmm.kbz.util.enums.SettlementType;
 import com.utsmm.kbz.util.ecr.CoreUtils;
@@ -71,6 +77,7 @@ import java.nio.charset.StandardCharsets;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.LinkedHashSet;
 
 import java.util.List;
 import java.util.Objects;
@@ -100,7 +107,13 @@ public class MainFragment extends DataBindingFragment {
     private final ArrayList<SlideModel> imgList = new ArrayList<>();
     private Observer<PayDetail> observeLastTrans;
     private PayDetail lastPay;
-    private CurrencySelectionHelper currencySelectionHelper;
+    private boolean cardPrimaryHostCached = false;
+    private String cardPrimaryHostName = "";
+    private String cardPrimaryTid = "";
+    private String cardPrimaryMid = "";
+    private String cardPrimaryIp = "";
+    private String cardPrimarySecIp = "";
+    private CurrencyType cardPrimaryCurrency = CurrencyType.MMK;
 
     @Inject
     EmvParamOperation emvParamOperation;
@@ -125,7 +138,6 @@ public class MainFragment extends DataBindingFragment {
         sharedViewModel = getFragmentScopeViewModel(SharedViewModel.class);
         mainViewModel = getFragmentScopeViewModel(MainViewModel.class);
         tmsProcessViewModel = getFragmentScopeViewModel(TMSProcessViewModel.class);
-        currencySelectionHelper = new CurrencySelectionHelper(this, sharedViewModel);
         
         // Initialize ModernECRManager
 //        ModernECRFactory factory = new ModernECRFactory(requireContext(), sharedViewModel);
@@ -434,16 +446,195 @@ public class MainFragment extends DataBindingFragment {
     }
 
     private void showCurrencyChooserForCardSale() {
-        currencySelectionHelper.showCardCurrencyChooser(this::startCardSaleFlow);
+        List<String> currencies = getAvailableCardSaleCurrencies();
+        if (currencies.isEmpty()) {
+            applyCardCurrencyAndHost("MMK");
+            startCardSaleFlow();
+            return;
         }
 
-    private void showCurrencyChooserForSignOn() {
-        currencySelectionHelper.showCardCurrencyChooser(this::navigateToSignOn);
+        if (currencies.size() == 1) {
+            applyCardCurrencyAndHost(currencies.get(0));
+            startCardSaleFlow();
+            return;
         }
 
-    private void navigateToSignOn() {
-        routeId = R.id.action_nav_main_to_nav_sign_on;
-        safeNavigateToRouteId();
+        showCurrencyPickerDialog("Choose Currency", currencies, currency -> {
+            applyCardCurrencyAndHost(currency);
+            startCardSaleFlow();
+        });
+    }
+
+    private List<String> getAvailableCardSaleCurrencies() {
+        cachePrimaryCardHostIfNeeded();
+        LinkedHashSet<String> values = new LinkedHashSet<>();
+
+        if (cardPrimaryCurrency != null && !TextUtils.isEmpty(cardPrimaryCurrency.name)) {
+            values.add(normalizeCurrency(cardPrimaryCurrency.name));
+        }
+
+        if (!SystemParamsOperation.getInstance().getDuelCurrencyStatus()) {
+            return new ArrayList<>(values);
+        }
+
+        String secondaryCurrency = normalizeCurrency(SystemParamsOperation.getInstance().getThirdHostCurrency());
+        if (!TextUtils.isEmpty(SystemParamsOperation.getInstance().getThirdHostName()) && !TextUtils.isEmpty(secondaryCurrency)) {
+            values.add(secondaryCurrency);
+        }
+
+        return new ArrayList<>(values);
+    }
+
+    private void applyCardCurrencyAndHost(String selectedCurrency) {
+        cachePrimaryCardHostIfNeeded();
+
+        String selected = normalizeCurrency(selectedCurrency);
+        String secondaryCurrency = normalizeCurrency(SystemParamsOperation.getInstance().getThirdHostCurrency());
+        boolean dualCurrencyEnabled = SystemParamsOperation.getInstance().getDuelCurrencyStatus();
+
+        boolean useSecondaryCardHost = dualCurrencyEnabled
+                && !TextUtils.isEmpty(SystemParamsOperation.getInstance().getThirdHostName())
+                && !TextUtils.isEmpty(secondaryCurrency)
+                && secondaryCurrency.equals(selected);
+
+        if (useSecondaryCardHost) {
+            SystemParamsOperation.getInstance().setHostName(SystemParamsOperation.getInstance().getThirdHostName());
+            SystemParamsOperation.getInstance().setTerminalId(SystemParamsOperation.getInstance().getThirdHostTerminalId());
+            SystemParamsOperation.getInstance().setMerchantId(SystemParamsOperation.getInstance().getThirdHostMerchantId());
+            SystemParamsOperation.getInstance().setIpAddress(SystemParamsOperation.getInstance().getThirdHostIpAddress());
+            SystemParamsOperation.getInstance().setSecIpAddress(SystemParamsOperation.getInstance().getThirdHostSecIpAddress());
+        } else {
+            SystemParamsOperation.getInstance().setHostName(cardPrimaryHostName);
+            SystemParamsOperation.getInstance().setTerminalId(cardPrimaryTid);
+            SystemParamsOperation.getInstance().setMerchantId(cardPrimaryMid);
+            SystemParamsOperation.getInstance().setIpAddress(cardPrimaryIp);
+            SystemParamsOperation.getInstance().setSecIpAddress(cardPrimarySecIp);
+        }
+
+        CurrencyType currencyType = useSecondaryCardHost ? toCurrencyType(selected) : cardPrimaryCurrency;
+        SystemParamsOperation.getInstance().setCurrencyType(currencyType);
+        sharedViewModel.set_currencyText(currencyType.name);
+    }
+
+    private void cachePrimaryCardHostIfNeeded() {
+        if (cardPrimaryHostCached) {
+            return;
+        }
+
+        cardPrimaryHostName = SystemParamsOperation.getInstance().getHostName();
+        cardPrimaryTid = SystemParamsOperation.getInstance().getTerminalId();
+        cardPrimaryMid = SystemParamsOperation.getInstance().getMerchantId();
+        cardPrimaryIp = SystemParamsOperation.getInstance().getIpAddress();
+        cardPrimarySecIp = SystemParamsOperation.getInstance().getSecIpAddress();
+        CurrencyType activeCurrency = SystemParamsOperation.getInstance().getCurrencyType();
+        cardPrimaryCurrency = activeCurrency == null ? CurrencyType.MMK : activeCurrency;
+        cardPrimaryHostCached = true;
+    }
+
+    private void showCurrencyPickerDialog(String title, List<String> currencies, CurrencySelectCallback callback) {
+        LinearLayout root = new LinearLayout(requireContext());
+        root.setOrientation(LinearLayout.VERTICAL);
+        root.setPadding(dp(20), dp(20), dp(20), dp(12));
+
+        TextView tvTitle = new TextView(requireContext());
+        tvTitle.setText(title);
+        tvTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
+        tvTitle.setTextColor(ContextCompat.getColor(requireContext(), R.color.colorTextTitle));
+        tvTitle.setPadding(0, 0, 0, dp(16));
+        root.addView(tvTitle);
+
+        final AlertDialog[] dialogHolder = new AlertDialog[1];
+        for (String currency : currencies) {
+            AppCompatButton button = new AppCompatButton(requireContext());
+            LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    dp(56)
+            );
+            lp.bottomMargin = dp(10);
+            button.setLayoutParams(lp);
+            button.setAllCaps(false);
+            button.setText(currency);
+            button.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18);
+            button.setGravity(Gravity.CENTER);
+            button.setBackgroundResource(R.drawable.bg_rounded_btn_cv);
+            button.setTextColor(ContextCompat.getColor(requireContext(), R.color.white));
+            button.setOnClickListener(v -> {
+                if (dialogHolder[0] != null) {
+                    dialogHolder[0].dismiss();
+                }
+                callback.onSelected(currency);
+            });
+            root.addView(button);
+        }
+
+        AppCompatButton cancel = new AppCompatButton(requireContext());
+        LinearLayout.LayoutParams cancelLp = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                dp(52)
+        );
+        cancel.setLayoutParams(cancelLp);
+        cancel.setAllCaps(false);
+        cancel.setText("Cancel");
+        cancel.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+        cancel.setBackgroundResource(R.drawable.bg_rounded_btn_cancel_cv);
+        cancel.setTextColor(ContextCompat.getColor(requireContext(), R.color.colorPrimary));
+        cancel.setOnClickListener(v -> {
+            if (dialogHolder[0] != null) {
+                dialogHolder[0].dismiss();
+            }
+        });
+        root.addView(cancel);
+
+        AlertDialog dialog = new AlertDialog.Builder(requireContext())
+                .setView(root)
+                .create();
+        dialogHolder[0] = dialog;
+        dialog.show();
+    }
+
+    private int dp(int value) {
+        return Math.round(value * requireContext().getResources().getDisplayMetrics().density);
+    }
+
+    private interface CurrencySelectCallback {
+        void onSelected(String currency);
+    }
+
+    private CurrencyType toCurrencyType(String value) {
+        String normalized = normalizeCurrency(value);
+        try {
+            return CurrencyType.valueOf(normalized);
+        } catch (Exception ignored) {
+            return CurrencyType.MMK;
+        }
+    }
+
+    private String normalizeCurrency(String raw) {
+        if (TextUtils.isEmpty(raw)) {
+            return "";
+        }
+
+        String value = raw.trim().toUpperCase();
+        switch (value) {
+            case "104":
+            case "MMK":
+                return "MMK";
+            case "840":
+            case "USD":
+                return "USD";
+            case "156":
+            case "CNY":
+            case "RMB":
+                return "CNY";
+            case "764":
+            case "THB":
+                return "THB";
+            case "643":
+            case "RUB":
+                return "RUB";
+            default:
+                return value;
+        }
     }
 
     private void processBatch() {
@@ -834,10 +1025,12 @@ public class MainFragment extends DataBindingFragment {
                 showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet));
             } else if (SystemParamsOperation.getInstance().isNeedSettlement()) {
                 AlertXDialog.getInstance().showDialog(requireContext(), getResourceString(R.string.title_need_settle), getResourceString(R.string.txt_do_you_want_to_continue), () -> {
-                    showCurrencyChooserForSignOn();
+                    routeId = R.id.action_nav_main_to_nav_sign_on;
+                    safeNavigateToRouteId();
                 });
             } else {
-                showCurrencyChooserForSignOn();
+                routeId = R.id.action_nav_main_to_nav_sign_on;
+                safeNavigateToRouteId();
             }
         }
 

app/src/main/java/com/utsmm/kbz/ui/dashboard/DashboardPreAuthBottomSheet.java

@@ -9,14 +9,12 @@ import com.utsmm.kbz.MainViewModel;
 import com.utsmm.kbz.R;
 import com.utsmm.kbz.config.Constants;
 import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel;
-import com.utsmm.kbz.util.CurrencySelectionHelper;
 
 public class DashboardPreAuthBottomSheet extends DataBindingBottomSheetFragment {
 
 
     private MainViewModel mainViewModel;
     private SharedViewModel sharedViewModel;
-    private CurrencySelectionHelper currencySelectionHelper;
 
     private static final int hostId = Constants.NAV_HOST_ID;
     private int routeId;
@@ -26,7 +24,6 @@ public class DashboardPreAuthBottomSheet extends DataBindingBottomSheetFragment
     protected void initViewModel() {
         mainViewModel = getFragmentScopeViewModel(MainViewModel.class);
         sharedViewModel = getFragmentScopeViewModel(SharedViewModel.class);
-        currencySelectionHelper = new CurrencySelectionHelper(this, sharedViewModel);
     }
 
     @Override
@@ -55,11 +52,10 @@ public class DashboardPreAuthBottomSheet extends DataBindingBottomSheetFragment
             } else if (checkTid()) {
                 showDeclineDialog("Please Download Config!");
             } else {
-                showCurrencyChooserForCardFlow(() -> {
                 sharedViewModel.transactionsType.setValue(TransactionsType.PRE_AUTH_SALE);
+
                 routeId = R.id.action_dashboardPreAuthBottomSheet_to_inputAmountFragment;
-                    safeRouteTo(currentId, routeId, hostId);
-                });
+                safeRouteTo(currentId,routeId,hostId);
             }
         }
 
@@ -69,11 +65,10 @@ public class DashboardPreAuthBottomSheet extends DataBindingBottomSheetFragment
             } else if (checkTid()) {
                 showDeclineDialog("Please Download Config!");
             } else {
-                showCurrencyChooserForCardFlow(() -> {
                 sharedViewModel.transactionsType.setValue(TransactionsType.PRE_AUTH_COMPLETE);
+
                 routeId = R.id.action_dashboardPreAuthBottomSheet_to_inputPasswordFragment;
-                    safeRouteTo(currentId, routeId, hostId);
-                });
+                safeRouteTo(currentId,routeId,hostId);
             }
 
         }
@@ -91,8 +86,4 @@ public class DashboardPreAuthBottomSheet extends DataBindingBottomSheetFragment
             }
         }
     }
-
-    private void showCurrencyChooserForCardFlow(Runnable onSelected) {
-        currencySelectionHelper.showCardCurrencyChooser(onSelected);
-    }
 }

app/src/main/java/com/utsmm/kbz/ui/dashboard/DashboardPreAuthCancelBottomSheet.java

@@ -10,7 +10,6 @@ import com.utsmm.kbz.MainViewModel;
 import com.utsmm.kbz.R;
 import com.utsmm.kbz.config.Constants;
 import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel;
-import com.utsmm.kbz.util.CurrencySelectionHelper;
 
 public class DashboardPreAuthCancelBottomSheet extends DataBindingBottomSheetFragment {
 
@@ -18,7 +17,6 @@ public class DashboardPreAuthCancelBottomSheet extends DataBindingBottomSheetFra
 
     private MainViewModel mainViewModel;
     private SharedViewModel sharedViewModel;
-    private CurrencySelectionHelper currencySelectionHelper;
 
     private int currentId = R.id.dashboardPreAuthCancelBottomSheet;
     private int routeId;
@@ -28,7 +26,6 @@ public class DashboardPreAuthCancelBottomSheet extends DataBindingBottomSheetFra
     protected void initViewModel() {
         mainViewModel = getFragmentScopeViewModel(MainViewModel.class);
         sharedViewModel = getFragmentScopeViewModel(SharedViewModel.class);
-        currencySelectionHelper = new CurrencySelectionHelper(this, sharedViewModel);
     }
 
     @Override
@@ -64,13 +61,12 @@ public class DashboardPreAuthCancelBottomSheet extends DataBindingBottomSheetFra
             } else if (checkTid()) {
                 showDeclineDialog("Please Download Config!");
             } else {
-                showCurrencyChooserForCardFlow(() -> {
                 sharedViewModel.transactionsType.setValue(TransactionsType.PRE_AUTH_VOID);
                 sharedViewModel.setTransMenu(TransMenu.PRE_AUTH_FULL_VOID);
                 sharedViewModel.amount.postValue(null);
+
                 routeId = R.id.action_dashboardPreAuthCancelBottomSheet_to_inputPasswordFragment;
-                    safeRouteTo(currentId, routeId, hostId);
-                });
+                safeRouteTo(currentId,routeId,hostId);
             }
 
         }
@@ -86,19 +82,14 @@ public class DashboardPreAuthCancelBottomSheet extends DataBindingBottomSheetFra
             } else if (checkTid()) {
                 showDeclineDialog("Please Download Config!");
             } else {
-                showCurrencyChooserForCardFlow(() -> {
                 sharedViewModel.transactionsType.setValue(TransactionsType.PRE_AUTH_VOID);
                 sharedViewModel.setTransMenu(TransMenu.PRE_AUTH_PARTIAL_VOID);
                 sharedViewModel.amount.postValue(null);
-                    routeId = R.id.action_dashboardPreAuthCancelBottomSheet_to_inputPasswordFragment;
-                    safeRouteTo(currentId, routeId, hostId);
-                });
-            }
-        }
-    }
 
-    private void showCurrencyChooserForCardFlow(Runnable onSelected) {
-        currencySelectionHelper.showCardCurrencyChooser(onSelected);
+                routeId = R.id.action_dashboardPreAuthCancelBottomSheet_to_inputPasswordFragment;
+                safeRouteTo(currentId,routeId,hostId);
+            }
+        }
     }
 
 }

app/src/main/java/com/utsmm/kbz/ui/dashboard/DashboardTransFragment.java

@@ -2,16 +2,25 @@ package com.utsmm.kbz.ui.dashboard;
 
 
 import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.TypedValue;
 import android.view.View;
+import android.view.Gravity;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.core.content.ContextCompat;
 
 import com.utsmm.kbz.util.enums.SettlementType;
 import com.utsmyanmar.baselib.fragment.DataBindingFragment;
 import com.utsmyanmar.baselib.util.DataBindingConfig;
 import com.utsmyanmar.paylibs.utils.LogUtil;
 import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation;
+import com.utsmyanmar.paylibs.utils.enums.CurrencyType;
 import com.utsmyanmar.paylibs.utils.enums.TransMenu;
 import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType;
 import com.utsmm.kbz.BR;
@@ -21,21 +30,28 @@ import com.utsmm.kbz.config.Constants;
 import com.utsmm.kbz.config.data.model.Features;
 import com.utsmm.kbz.ui.adapters.MainAdapter;
 import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel;
-import com.utsmm.kbz.util.CurrencySelectionHelper;
 import com.utsmm.kbz.util.tms.TMSUtil;
 
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
 
 public class DashboardTransFragment extends DataBindingFragment {
 
 
     private MainViewModel mainViewModel;
     private SharedViewModel sharedViewModel;
-    private CurrencySelectionHelper currencySelectionHelper;
 
     private ArrayList<Features> featuresList = new ArrayList<>();
 
     MainAdapter mainAdapter;
+    private boolean cardPrimaryHostCached = false;
+    private String cardPrimaryHostName = "";
+    private String cardPrimaryTid = "";
+    private String cardPrimaryMid = "";
+    private String cardPrimaryIp = "";
+    private String cardPrimarySecIp = "";
+    private CurrencyType cardPrimaryCurrency = CurrencyType.MMK;
 
     private static final int hostId = Constants.NAV_HOST_ID;
     private int routeId;
@@ -60,7 +76,6 @@ public class DashboardTransFragment extends DataBindingFragment {
     protected void initViewModel() {
         mainViewModel = getFragmentScopeViewModel(MainViewModel.class);
         sharedViewModel = getFragmentScopeViewModel(SharedViewModel.class);
-        currencySelectionHelper = new CurrencySelectionHelper(this, sharedViewModel);
     }
 
     @Override
@@ -212,11 +227,9 @@ public class DashboardTransFragment extends DataBindingFragment {
         }
 
         public void onClickRefund() {
-            showCurrencyChooserForCardFlow(() -> {
             sharedViewModel.setTransactionsType(TransactionsType.REFUND);
             routeId = R.id.action_dashboardTransFragment_to_inputPasswordFragment;
-                safeRouteTo(currentId, routeId, hostId);
-            });
+            safeRouteTo(currentId,routeId,hostId);
         }
 
         public void onClickPreAuth () {
@@ -235,23 +248,19 @@ public class DashboardTransFragment extends DataBindingFragment {
         }
 
         public void onClickPreAuthCancel () {
-            showCurrencyChooserForCardFlow(() -> {
             sharedViewModel.setTransactionsType(TransactionsType.PRE_AUTH_VOID);
             sharedViewModel.setTransMenu(TransMenu.PRE_AUTH_FULL_VOID);
             sharedViewModel.amount.postValue("0"); // null to 0
 //            sharedViewModel.amount.postValue(null);
             routeId = R.id.action_dashboardTransFragment_to_inputPasswordFragment;
-                safeRouteTo(currentId, routeId, hostId);
-            });
+            safeRouteTo(currentId,routeId,hostId);
 
         }
 
         public void onClickPreAuthComp () {
-            showCurrencyChooserForCardFlow(() -> {
             sharedViewModel.setTransactionsType(TransactionsType.PRE_AUTH_COMPLETE);
             routeId = R.id.action_dashboardTransFragment_to_inputPasswordFragment;
-                safeRouteTo(currentId, routeId, hostId);
-            });
+            safeRouteTo(currentId,routeId,hostId);
 
         }
 
@@ -279,7 +288,195 @@ public class DashboardTransFragment extends DataBindingFragment {
     }
 
     private void showCurrencyChooserForCardFlow(Runnable onSelected) {
-        currencySelectionHelper.showCardCurrencyChooser(onSelected);
+        List<String> currencies = getAvailableCardSaleCurrencies();
+        if (currencies.isEmpty()) {
+            applyCardCurrencyAndHost("MMK");
+            onSelected.run();
+            return;
+        }
+
+        if (currencies.size() == 1) {
+            applyCardCurrencyAndHost(currencies.get(0));
+            onSelected.run();
+            return;
+        }
+
+        showCurrencyPickerDialog("Choose Currency", currencies, currency -> {
+            applyCardCurrencyAndHost(currency);
+            onSelected.run();
+        });
+    }
+
+    private List<String> getAvailableCardSaleCurrencies() {
+        cachePrimaryCardHostIfNeeded();
+        LinkedHashSet<String> values = new LinkedHashSet<>();
+
+        if (cardPrimaryCurrency != null && !TextUtils.isEmpty(cardPrimaryCurrency.name)) {
+            values.add(normalizeCurrency(cardPrimaryCurrency.name));
+        }
+
+        if (!SystemParamsOperation.getInstance().getDuelCurrencyStatus()) {
+            return new ArrayList<>(values);
+        }
+
+        String secondaryCurrency = normalizeCurrency(SystemParamsOperation.getInstance().getThirdHostCurrency());
+        if (!TextUtils.isEmpty(SystemParamsOperation.getInstance().getThirdHostName()) && !TextUtils.isEmpty(secondaryCurrency)) {
+            values.add(secondaryCurrency);
+        }
+
+        return new ArrayList<>(values);
+    }
+
+    private void applyCardCurrencyAndHost(String selectedCurrency) {
+        cachePrimaryCardHostIfNeeded();
+
+        String selected = normalizeCurrency(selectedCurrency);
+        String secondaryCurrency = normalizeCurrency(SystemParamsOperation.getInstance().getThirdHostCurrency());
+        boolean dualCurrencyEnabled = SystemParamsOperation.getInstance().getDuelCurrencyStatus();
+
+        boolean useSecondaryCardHost = dualCurrencyEnabled
+                && !TextUtils.isEmpty(SystemParamsOperation.getInstance().getThirdHostName())
+                && !TextUtils.isEmpty(secondaryCurrency)
+                && secondaryCurrency.equals(selected);
+
+        if (useSecondaryCardHost) {
+            SystemParamsOperation.getInstance().setHostName(SystemParamsOperation.getInstance().getThirdHostName());
+            SystemParamsOperation.getInstance().setTerminalId(SystemParamsOperation.getInstance().getThirdHostTerminalId());
+            SystemParamsOperation.getInstance().setMerchantId(SystemParamsOperation.getInstance().getThirdHostMerchantId());
+            SystemParamsOperation.getInstance().setIpAddress(SystemParamsOperation.getInstance().getThirdHostIpAddress());
+            SystemParamsOperation.getInstance().setSecIpAddress(SystemParamsOperation.getInstance().getThirdHostSecIpAddress());
+        } else {
+            SystemParamsOperation.getInstance().setHostName(cardPrimaryHostName);
+            SystemParamsOperation.getInstance().setTerminalId(cardPrimaryTid);
+            SystemParamsOperation.getInstance().setMerchantId(cardPrimaryMid);
+            SystemParamsOperation.getInstance().setIpAddress(cardPrimaryIp);
+            SystemParamsOperation.getInstance().setSecIpAddress(cardPrimarySecIp);
+        }
+
+        CurrencyType currencyType = useSecondaryCardHost ? toCurrencyType(selected) : cardPrimaryCurrency;
+        SystemParamsOperation.getInstance().setCurrencyType(currencyType);
+        sharedViewModel.set_currencyText(currencyType.name);
+    }
+
+    private void cachePrimaryCardHostIfNeeded() {
+        if (cardPrimaryHostCached) {
+            return;
+        }
+
+        cardPrimaryHostName = SystemParamsOperation.getInstance().getHostName();
+        cardPrimaryTid = SystemParamsOperation.getInstance().getTerminalId();
+        cardPrimaryMid = SystemParamsOperation.getInstance().getMerchantId();
+        cardPrimaryIp = SystemParamsOperation.getInstance().getIpAddress();
+        cardPrimarySecIp = SystemParamsOperation.getInstance().getSecIpAddress();
+        CurrencyType activeCurrency = SystemParamsOperation.getInstance().getCurrencyType();
+        cardPrimaryCurrency = activeCurrency == null ? CurrencyType.MMK : activeCurrency;
+        cardPrimaryHostCached = true;
+    }
+
+    private CurrencyType toCurrencyType(String value) {
+        String normalized = normalizeCurrency(value);
+        try {
+            return CurrencyType.valueOf(normalized);
+        } catch (Exception ignored) {
+            return CurrencyType.MMK;
+        }
+    }
+
+    private String normalizeCurrency(String raw) {
+        if (TextUtils.isEmpty(raw)) {
+            return "";
+        }
+
+        String value = raw.trim().toUpperCase();
+        switch (value) {
+            case "104":
+            case "MMK":
+                return "MMK";
+            case "840":
+            case "USD":
+                return "USD";
+            case "156":
+            case "CNY":
+            case "RMB":
+                return "CNY";
+            case "764":
+            case "THB":
+                return "THB";
+            case "643":
+            case "RUB":
+                return "RUB";
+            default:
+                return value;
+        }
+    }
+
+    private void showCurrencyPickerDialog(String title, List<String> currencies, CurrencySelectCallback callback) {
+        LinearLayout root = new LinearLayout(requireContext());
+        root.setOrientation(LinearLayout.VERTICAL);
+        root.setPadding(dp(20), dp(20), dp(20), dp(12));
+
+        TextView tvTitle = new TextView(requireContext());
+        tvTitle.setText(title);
+        tvTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
+        tvTitle.setTextColor(ContextCompat.getColor(requireContext(), R.color.colorTextTitle));
+        tvTitle.setPadding(0, 0, 0, dp(16));
+        root.addView(tvTitle);
+
+        final AlertDialog[] dialogHolder = new AlertDialog[1];
+        for (String currency : currencies) {
+            AppCompatButton button = new AppCompatButton(requireContext());
+            LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    dp(56)
+            );
+            lp.bottomMargin = dp(10);
+            button.setLayoutParams(lp);
+            button.setAllCaps(false);
+            button.setText(currency);
+            button.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18);
+            button.setGravity(Gravity.CENTER);
+            button.setBackgroundResource(R.drawable.bg_rounded_btn_cv);
+            button.setTextColor(ContextCompat.getColor(requireContext(), R.color.white));
+            button.setOnClickListener(v -> {
+                if (dialogHolder[0] != null) {
+                    dialogHolder[0].dismiss();
+                }
+                callback.onSelected(currency);
+            });
+            root.addView(button);
+        }
+
+        AppCompatButton cancel = new AppCompatButton(requireContext());
+        LinearLayout.LayoutParams cancelLp = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                dp(52)
+        );
+        cancel.setLayoutParams(cancelLp);
+        cancel.setAllCaps(false);
+        cancel.setText("Cancel");
+        cancel.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+        cancel.setBackgroundResource(R.drawable.bg_rounded_btn_cancel_cv);
+        cancel.setTextColor(ContextCompat.getColor(requireContext(), R.color.colorPrimary));
+        cancel.setOnClickListener(v -> {
+            if (dialogHolder[0] != null) {
+                dialogHolder[0].dismiss();
+            }
+        });
+        root.addView(cancel);
+
+        AlertDialog dialog = new AlertDialog.Builder(requireContext())
+                .setView(root)
+                .create();
+        dialogHolder[0] = dialog;
+        dialog.show();
+    }
+
+    private int dp(int value) {
+        return Math.round(value * requireContext().getResources().getDisplayMetrics().density);
+    }
+
+    private interface CurrencySelectCallback {
+        void onSelected(String currency);
     }
 
 }

app/src/main/java/com/utsmm/kbz/ui/settings/InjectKeyFragment.java

@@ -3,6 +3,7 @@ package com.utsmm.kbz.ui.settings;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.ArrayAdapter;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -15,12 +16,16 @@ import com.nexgo.downloadkey.downloadflow.DownloadFlowResultEntity;
 import com.nexgo.downloadkey.downloadflow.DownloadResult;
 import com.utsmyanmar.baselib.fragment.DataBindingFragment;
 import com.utsmyanmar.baselib.util.DataBindingConfig;
+import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation;
 import com.utsmm.kbz.BR;
 import com.utsmm.kbz.R;
 import com.utsmm.kbz.databinding.FragmentInjectKeyBinding;
 import com.utsmyanmar.paylibs.utils.LogUtil;
 import com.utsmm.kbz.util.tms.TMSUtil;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class InjectKeyFragment extends DataBindingFragment {
 
     private static final String TAG = InjectKeyFragment.class.getSimpleName();
@@ -31,6 +36,8 @@ public class InjectKeyFragment extends DataBindingFragment {
     // Key injection variables
     private DownloadFlow mDownloadFlow;
     private int keyIndexTmp = 8; // Default key index
+    private final List<HostSelectionItem> hostSelectionItems = new ArrayList<>();
+    private HostSelectionItem selectedHostSelectionItem;
 
     @Override
     protected void initViewModel() {
@@ -83,9 +90,50 @@ public class InjectKeyFragment extends DataBindingFragment {
     }
 
     private void updateConfigurationInfo() {
+            setupHostSelection();
             binding.serialNumberValue.setText(getDisplayValue(TMSUtil.getInstance().getSerialNumber()));
     }
 
+    private void setupHostSelection() {
+            hostSelectionItems.clear();
+
+            String primaryTerminalId = SystemParamsOperation.getInstance().getTerminalId();
+            String primaryMerchantId = SystemParamsOperation.getInstance().getMerchantId();
+            String secondaryTerminalId = SystemParamsOperation.getInstance().getThirdHostTerminalId();
+            String secondaryMerchantId = SystemParamsOperation.getInstance().getThirdHostMerchantId();
+
+            hostSelectionItems.add(new HostSelectionItem("Primary Host", primaryTerminalId, primaryMerchantId));
+
+            if (!TextUtils.isEmpty(secondaryTerminalId) || !TextUtils.isEmpty(secondaryMerchantId)) {
+                hostSelectionItems.add(new HostSelectionItem("Secondary Host", secondaryTerminalId, secondaryMerchantId));
+            }
+
+            ArrayAdapter<HostSelectionItem> hostAdapter = new ArrayAdapter<>(
+                    requireContext(),
+                    android.R.layout.simple_list_item_1,
+                    hostSelectionItems
+            );
+            binding.actvHostSelection.setAdapter(hostAdapter);
+
+            if (!hostSelectionItems.isEmpty()) {
+                HostSelectionItem defaultSelection = hostSelectionItems.get(0);
+                binding.actvHostSelection.setText(defaultSelection.toString(), false);
+                applyHostSelection(defaultSelection);
+            }
+
+            binding.actvHostSelection.setOnItemClickListener((parent, view, position, id) -> {
+                if (position >= 0 && position < hostSelectionItems.size()) {
+                    applyHostSelection(hostSelectionItems.get(position));
+                }
+            });
+    }
+
+    private void applyHostSelection(@NonNull HostSelectionItem selectionItem) {
+            selectedHostSelectionItem = selectionItem;
+            binding.terminalIdValue.setText(getDisplayValue(selectionItem.terminalId));
+            binding.merchantIdValue.setText(getDisplayValue(selectionItem.merchantId));
+    }
+
     private String getDisplayValue(String value) {
             return !TextUtils.isEmpty(value) ? value : "Not configured";
     }
@@ -110,18 +158,21 @@ public class InjectKeyFragment extends DataBindingFragment {
 
             mDownloadFlow = DownloadFlow.getInstance();
 
+            String terminalId = selectedHostSelectionItem != null ? selectedHostSelectionItem.terminalId : null;
+            String merchantId = selectedHostSelectionItem != null ? selectedHostSelectionItem.merchantId : null;
             String serialNo = TMSUtil.getInstance().getSerialNumber();
 
-            if (TextUtils.isEmpty(serialNo)) {
+            // Validate configuration
+            if (TextUtils.isEmpty(terminalId) || TextUtils.isEmpty(merchantId) || TextUtils.isEmpty(serialNo)) {
                 dismissLoadingDialog();
-                showDeclineDialog("Serial number is not configured");
+                showDeclineDialog("Please configure the selected Terminal ID and Merchant ID first in TMS Configuration");
                 return;
             }
 
             final DownloadFEntity downloadFEntity = new DownloadFEntity();
             downloadFEntity.setSn(serialNo.getBytes());
-            downloadFEntity.setMid(null);
-            downloadFEntity.setTid(null);
+            downloadFEntity.setMid(merchantId.getBytes());
+            downloadFEntity.setTid(terminalId.getBytes());
             downloadFEntity.setTmkIndex(keyIndexTmp);
             downloadFEntity.setPort(0);
             downloadFEntity.setTimeOut(10);
@@ -162,6 +213,28 @@ public class InjectKeyFragment extends DataBindingFragment {
         }
     };
 
+    private static class HostSelectionItem {
+        private final String label;
+        private final String terminalId;
+        private final String merchantId;
+
+        private HostSelectionItem(String label, String terminalId, String merchantId) {
+            this.label = label;
+            this.terminalId = terminalId;
+            this.merchantId = merchantId;
+        }
+
+        @NonNull
+        @Override
+        public String toString() {
+            return label;
+        }
+
+        private static String getSummaryValue(String value) {
+            return TextUtils.isEmpty(value) ? "Not configured" : value;
+        }
+    }
+
     // ClickEvent class for data binding - this is the proper pattern
     public class ClickEvent {
 

app/src/main/java/com/utsmm/kbz/ui/sign_on/SignOnFragment.java

@@ -13,6 +13,7 @@ import com.utsmm.kbz.BR;
 import com.utsmm.kbz.R;
 import com.utsmm.kbz.config.Constants;
 import com.utsmm.kbz.util.enums.ResponseStatus;
+import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation;
 
 /*
 * This file is not using in this project cuz IPEK is used instead of TMK.
@@ -55,6 +56,7 @@ public class SignOnFragment extends DataBindingFragment {
         super.onViewCreated(view, savedInstanceState);
 
         signOnViewModel.startSignOnProcess();
+
         observeData();
     }
 

app/src/main/java/com/utsmm/kbz/util/CurrencySelectionHelper.java

@@ -1,269 +0,0 @@
-package com.utsmm.kbz.util;
-
-import android.text.TextUtils;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.AppCompatButton;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
-
-import com.utsmm.kbz.R;
-import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel;
-import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation;
-import com.utsmyanmar.paylibs.utils.enums.CurrencyType;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-
-public class CurrencySelectionHelper {
-
-    private static boolean globalPrimaryHostCached = false;
-    private static String globalPrimaryHostName = "";
-    private static String globalPrimaryTid = "";
-    private static String globalPrimaryMid = "";
-    private static String globalPrimaryIp = "";
-    private static String globalPrimarySecIp = "";
-    private static CurrencyType globalPrimaryCurrency = CurrencyType.MMK;
-
-    private final Fragment fragment;
-    private final SharedViewModel sharedViewModel;
-    private String primaryHostName = "";
-    private String primaryTid = "";
-    private String primaryMid = "";
-    private String primaryIp = "";
-    private String primarySecIp = "";
-    private CurrencyType primaryCurrency = CurrencyType.MMK;
-
-    public CurrencySelectionHelper(Fragment fragment, SharedViewModel sharedViewModel) {
-        this.fragment = fragment;
-        this.sharedViewModel = sharedViewModel;
-    }
-
-    public void showCardCurrencyChooser(Runnable onSelected) {
-        showCardCurrencyChooser(onSelected, null);
-    }
-
-    public void showCardCurrencyChooser(Runnable onSelected, Runnable onCancelled) {
-        List<String> currencies = getAvailableCardCurrencies();
-        if (currencies.isEmpty()) {
-            applyCardCurrencyAndHost("MMK");
-            onSelected.run();
-            return;
-        }
-
-        if (currencies.size() == 1) {
-            applyCardCurrencyAndHost(currencies.get(0));
-            onSelected.run();
-            return;
-        }
-
-        showCurrencyPickerDialog("Choose Currency", currencies, currency -> {
-            applyCardCurrencyAndHost(currency);
-            onSelected.run();
-        }, onCancelled);
-    }
-
-    private List<String> getAvailableCardCurrencies() {
-        cachePrimaryCardHostIfNeeded();
-        LinkedHashSet<String> values = new LinkedHashSet<>();
-
-        if (primaryCurrency != null && !TextUtils.isEmpty(primaryCurrency.name)) {
-            values.add(normalizeCurrency(primaryCurrency.name));
-        }
-
-        if (!SystemParamsOperation.getInstance().getDuelCurrencyStatus()) {
-            return new ArrayList<>(values);
-        }
-
-        String secondaryCurrency = normalizeCurrency(SystemParamsOperation.getInstance().getThirdHostCurrency());
-        if (!TextUtils.isEmpty(SystemParamsOperation.getInstance().getThirdHostName()) && !TextUtils.isEmpty(secondaryCurrency)) {
-            values.add(secondaryCurrency);
-        }
-
-        return new ArrayList<>(values);
-    }
-
-    private void applyCardCurrencyAndHost(String selectedCurrency) {
-        cachePrimaryCardHostIfNeeded();
-
-        String selected = normalizeCurrency(selectedCurrency);
-        String secondaryCurrency = normalizeCurrency(SystemParamsOperation.getInstance().getThirdHostCurrency());
-        boolean dualCurrencyEnabled = SystemParamsOperation.getInstance().getDuelCurrencyStatus();
-
-        boolean useSecondaryCardHost = dualCurrencyEnabled
-                && !TextUtils.isEmpty(SystemParamsOperation.getInstance().getThirdHostName())
-                && !TextUtils.isEmpty(secondaryCurrency)
-                && secondaryCurrency.equals(selected);
-
-        if (useSecondaryCardHost) {
-            SystemParamsOperation.getInstance().setHostName(SystemParamsOperation.getInstance().getThirdHostName());
-            SystemParamsOperation.getInstance().setTerminalId(SystemParamsOperation.getInstance().getThirdHostTerminalId());
-            SystemParamsOperation.getInstance().setMerchantId(SystemParamsOperation.getInstance().getThirdHostMerchantId());
-            SystemParamsOperation.getInstance().setIpAddress(SystemParamsOperation.getInstance().getThirdHostIpAddress());
-            SystemParamsOperation.getInstance().setSecIpAddress(SystemParamsOperation.getInstance().getThirdHostSecIpAddress());
-        } else {
-            SystemParamsOperation.getInstance().setHostName(primaryHostName);
-            SystemParamsOperation.getInstance().setTerminalId(primaryTid);
-            SystemParamsOperation.getInstance().setMerchantId(primaryMid);
-            SystemParamsOperation.getInstance().setIpAddress(primaryIp);
-            SystemParamsOperation.getInstance().setSecIpAddress(primarySecIp);
-        }
-
-        CurrencyType currencyType = useSecondaryCardHost ? toCurrencyType(selected) : primaryCurrency;
-        SystemParamsOperation.getInstance().setCurrencyType(currencyType);
-        if (sharedViewModel != null) {
-            sharedViewModel.set_currencyText(currencyType.name);
-        }
-    }
-
-    private void cachePrimaryCardHostIfNeeded() {
-        SystemParamsOperation sp = SystemParamsOperation.getInstance();
-        String currentHostName = sp.getHostName();
-        String secondaryHostName = sp.getThirdHostName();
-        boolean currentIsSecondary = !TextUtils.isEmpty(secondaryHostName)
-                && secondaryHostName.equals(currentHostName);
-
-        if (!currentIsSecondary) {
-            globalPrimaryHostName = currentHostName;
-            globalPrimaryTid = sp.getTerminalId();
-            globalPrimaryMid = sp.getMerchantId();
-            globalPrimaryIp = sp.getIpAddress();
-            globalPrimarySecIp = sp.getSecIpAddress();
-            CurrencyType activeCurrency = sp.getCurrencyType();
-            globalPrimaryCurrency = activeCurrency == null ? CurrencyType.MMK : activeCurrency;
-            globalPrimaryHostCached = true;
-        }
-
-        if (!globalPrimaryHostCached) {
-            CurrencyType activeCurrency = sp.getCurrencyType();
-            globalPrimaryCurrency = activeCurrency == null ? CurrencyType.MMK : activeCurrency;
-            globalPrimaryHostCached = true;
-        }
-
-        primaryHostName = globalPrimaryHostName;
-        primaryTid = globalPrimaryTid;
-        primaryMid = globalPrimaryMid;
-        primaryIp = globalPrimaryIp;
-        primarySecIp = globalPrimarySecIp;
-        primaryCurrency = globalPrimaryCurrency;
-    }
-
-    private CurrencyType toCurrencyType(String value) {
-        String normalized = normalizeCurrency(value);
-        try {
-            return CurrencyType.valueOf(normalized);
-        } catch (Exception ignored) {
-            return CurrencyType.MMK;
-        }
-    }
-
-    private String normalizeCurrency(String raw) {
-        if (TextUtils.isEmpty(raw)) {
-            return "";
-        }
-
-        String value = raw.trim().toUpperCase();
-        switch (value) {
-            case "104":
-            case "MMK":
-                return "MMK";
-            case "840":
-            case "USD":
-                return "USD";
-            case "156":
-            case "CNY":
-            case "RMB":
-                return "CNY";
-            case "764":
-            case "THB":
-                return "THB";
-            case "643":
-            case "RUB":
-                return "RUB";
-            default:
-                return value;
-        }
-    }
-
-    private void showCurrencyPickerDialog(
-            String title,
-            List<String> currencies,
-            CurrencySelectCallback callback,
-            Runnable onCancelled
-    ) {
-        LinearLayout root = new LinearLayout(fragment.requireContext());
-        root.setOrientation(LinearLayout.VERTICAL);
-        root.setPadding(dp(20), dp(20), dp(20), dp(12));
-
-        TextView tvTitle = new TextView(fragment.requireContext());
-        tvTitle.setText(title);
-        tvTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
-        tvTitle.setTextColor(ContextCompat.getColor(fragment.requireContext(), R.color.colorTextTitle));
-        tvTitle.setPadding(0, 0, 0, dp(16));
-        root.addView(tvTitle);
-
-        final AlertDialog[] dialogHolder = new AlertDialog[1];
-        for (String currency : currencies) {
-            AppCompatButton button = new AppCompatButton(fragment.requireContext());
-            LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
-                    LinearLayout.LayoutParams.MATCH_PARENT,
-                    dp(56)
-            );
-            lp.bottomMargin = dp(10);
-            button.setLayoutParams(lp);
-            button.setAllCaps(false);
-            button.setText(currency);
-            button.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18);
-            button.setGravity(Gravity.CENTER);
-            button.setBackgroundResource(R.drawable.bg_rounded_btn_cv);
-            button.setTextColor(ContextCompat.getColor(fragment.requireContext(), R.color.white));
-            button.setOnClickListener(v -> {
-                if (dialogHolder[0] != null) {
-                    dialogHolder[0].dismiss();
-                }
-                callback.onSelected(currency);
-            });
-            root.addView(button);
-        }
-
-        AppCompatButton cancel = new AppCompatButton(fragment.requireContext());
-        LinearLayout.LayoutParams cancelLp = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                dp(52)
-        );
-        cancel.setLayoutParams(cancelLp);
-        cancel.setAllCaps(false);
-        cancel.setText("Cancel");
-        cancel.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
-        cancel.setBackgroundResource(R.drawable.bg_rounded_btn_cancel_cv);
-        cancel.setTextColor(ContextCompat.getColor(fragment.requireContext(), R.color.colorPrimary));
-        cancel.setOnClickListener(v -> {
-            if (dialogHolder[0] != null) {
-                dialogHolder[0].dismiss();
-            }
-            if (onCancelled != null) {
-                onCancelled.run();
-            }
-        });
-        root.addView(cancel);
-
-        AlertDialog dialog = new AlertDialog.Builder(fragment.requireContext())
-                .setView(root)
-                .create();
-        dialogHolder[0] = dialog;
-        dialog.show();
-    }
-
-    private int dp(int value) {
-        return Math.round(value * fragment.requireContext().getResources().getDisplayMetrics().density);
-    }
-
-    private interface CurrencySelectCallback {
-        void onSelected(String currency);
-    }
-}

app/src/main/res/layout/fragment_inject_key.xml

@@ -101,7 +101,6 @@
                                 android:textSize="14sp"
                                 tools:fontFamily="sans-serif" />
 
-
                             <com.google.android.material.textfield.TextInputLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -130,6 +129,84 @@
 
                     </androidx.cardview.widget.CardView>
 
+                    <!-- Host Selection Card -->
+                    <androidx.cardview.widget.CardView
+                        android:id="@+id/hostSelectionCard"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="16dp"
+                        app:cardBackgroundColor="@color/white"
+                        app:cardCornerRadius="16dp"
+                        app:cardElevation="2dp">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:padding="20dp">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:fontFamily="@font/rubik_medium"
+                                android:text="Host Selection"
+                                android:textColor="@color/colorTextTitle"
+                                android:textSize="16sp"
+                                android:textStyle="bold"
+                                tools:fontFamily="sans-serif-medium" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="4dp"
+                                android:layout_marginBottom="12dp"
+                                android:fontFamily="@font/rubik_regular"
+                                android:text="Select Terminal Id and MerchantId to preview before key injection"
+                                android:textColor="@color/colorTextContent"
+                                android:textSize="14sp"
+                                tools:fontFamily="sans-serif" />
+
+                            <com.google.android.material.textfield.TextInputLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:hint="Select Host"
+                                app:endIconMode="dropdown_menu"
+                                app:boxBackgroundMode="outline"
+                                app:boxCornerRadiusBottomEnd="8dp"
+                                app:boxCornerRadiusBottomStart="8dp"
+                                app:boxCornerRadiusTopEnd="8dp"
+                                app:boxCornerRadiusTopStart="8dp"
+                                app:boxStrokeColor="@color/colorPrimary">
+
+                                <com.google.android.material.textfield.MaterialAutoCompleteTextView
+                                    android:id="@+id/actvHostSelection"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:fontFamily="@font/rubik_regular"
+                                    android:inputType="none"
+                                    android:focusable="false"
+                                    android:clickable="true"
+                                    android:textColor="@color/colorTextTitle"
+                                    android:textSize="16sp"
+                                    android:paddingLeft="16sp"
+                                    tools:fontFamily="sans-serif" />
+
+                            </com.google.android.material.textfield.TextInputLayout>
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="8dp"
+                                android:fontFamily="@font/rubik_regular"
+                                android:text="UI only: current key injection still uses the active TMS configuration."
+                                android:textColor="@color/colorTextContent"
+                                android:textSize="12sp"
+                                tools:fontFamily="sans-serif" />
+
+                        </LinearLayout>
+
+                    </androidx.cardview.widget.CardView>
+
                     <!-- Current Configuration Info Card -->
                     <androidx.cardview.widget.CardView
                         android:id="@+id/configInfoCard"
@@ -156,13 +233,71 @@
                                 android:textStyle="bold"
                                 tools:fontFamily="sans-serif-medium" />
 
-                            <!-- Serial Number -->
+                            <!-- Terminal ID -->
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="12dp"
                                 android:orientation="horizontal">
 
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:fontFamily="@font/rubik_regular"
+                                    android:text="Terminal ID:"
+                                    android:textColor="@color/colorTextContent"
+                                    android:textSize="14sp"
+                                    tools:fontFamily="sans-serif" />
+
+                                <TextView
+                                    android:id="@+id/terminalIdValue"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:fontFamily="@font/rubik_medium"
+                                    android:text="Not configured"
+                                    android:textColor="@color/colorTextTitle"
+                                    android:textSize="14sp"
+                                    tools:fontFamily="sans-serif-medium" />
+
+                            </LinearLayout>
+
+                            <!-- Merchant ID -->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="8dp"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_weight="1"
+                                    android:fontFamily="@font/rubik_regular"
+                                    android:text="Merchant ID:"
+                                    android:textColor="@color/colorTextContent"
+                                    android:textSize="14sp"
+                                    tools:fontFamily="sans-serif" />
+
+                                <TextView
+                                    android:id="@+id/merchantIdValue"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:fontFamily="@font/rubik_medium"
+                                    android:text="Not configured"
+                                    android:textColor="@color/colorTextTitle"
+                                    android:textSize="14sp"
+                                    tools:fontFamily="sans-serif-medium" />
+
+                            </LinearLayout>
+
+                            <!-- Serial Number -->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="8dp"
+                                android:orientation="horizontal">
+
                                 <TextView
                                     android:layout_width="0dp"
                                     android:layout_height="wrap_content"

paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsOperation.java

@@ -1851,7 +1851,7 @@ public class SystemParamsOperation {
         SystemParamsSettings paramsSettings = getSystemParamsSettings();
         return paramsSettings.getDuelCurrencyStatus();
     }
-    
+}
     public void setPreAuthVoidManualEnabled(boolean preAuthVoidManualEnabled) {
         SystemParamsSettings params = getSystemParamsSettings();
         params.setPreAuthVoidManual(preAuthVoidManualEnabled);