diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen2.kt b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen2.kt
index 2a687f5..d635937 100644
--- a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen2.kt
+++ b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen2.kt
@@ -94,6 +94,7 @@ fun DashboardScreen2(
     LaunchedEffect(Unit) {
         deviceInfoViewModel.loadDeviceInfo();
     }
+    
     val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
     val scope = rememberCoroutineScope()
     val mainHandler = remember { Handler(Looper.getMainLooper()) }
@@ -150,10 +151,10 @@ fun DashboardScreen2(
                         dialogMessage = processingMessage(activeHostAction)
 
                         val signOnProcess = EchoTestProcess.getInstance()
-                        val request = if (activeHostAction == "Log-Off") {
-                            signOnProcess.enqueueLogOff()
-                        } else {
-                            signOnProcess.enqueueLogOn()
+                        val request = when (activeHostAction) {
+                            "Echo Test" -> signOnProcess.enqueue(false)
+                            "Log-Off" -> signOnProcess.enqueueLogOff()
+                            else -> signOnProcess.enqueueLogOn()
                         }
 
                         request
@@ -274,6 +275,10 @@ fun DashboardScreen2(
                     scope.launch { drawerState.close() }
                     openHostActionDialog("Log-On")
                 }
+                DrawerItem("Echo Test", Icons.Default.Sync) {
+                    scope.launch { drawerState.close() }
+                    openHostActionDialog("Echo Test")
+                }
                 DrawerItem("Log-Off", Icons.Default.Dashboard) {
                     scope.launch { drawerState.close() }
                     openHostActionDialog("Log-Off")
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/sign_on/EchoTestProcess.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/sign_on/EchoTestProcess.java
index 9ffc50d..a3730e8 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/sign_on/EchoTestProcess.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/sign_on/EchoTestProcess.java
@@ -25,7 +25,7 @@ import sunmi.sunmiui.utils.LogUtil;
 public class EchoTestProcess {
 
     private static final String TAG = EchoTestProcess.class.getSimpleName();
-
+    
     private TradeData tradeData;
     private PayDetail payDetail;
     private static EchoTestProcess INSTANCE;
@@ -47,7 +47,7 @@ public class EchoTestProcess {
     private EchoTestProcess() {
         tradeData = Params.newTrade(true);
         payDetail = tradeData.getPayDetail();
-        isoMsgX = new ISOMsgX.ISOMsgXBuilder(ISOVersion.VERSION_1993, ISOMode.BOTH_HEADER_TPDU,HostName.BPC).build();
+        isoMsgX = new ISOMsgX.ISOMsgXBuilder(ISOVersion.VERSION_1993, ISOMode.ONLY_HEADER,HostName.FINEXUS).build();
     }
 
     public StartSignOn enqueue(boolean isSecondary) {
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/FieldConfig.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/FieldConfig.java
index 4751232..992c28d 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/FieldConfig.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/FieldConfig.java
@@ -28,7 +28,7 @@ public class FieldConfig {
     public static int[][] FieldTypeConfig128 =
             {
 //                    /* FLD  00 */ {0, SDK_8583_LEN_BCD, 4, SDK_8583_DATA_BCD, SDK_8583_ALIGN_L, '0'},
-                    /* FLD  00 */ {0, SDK_8583_LEN_BCD, 4, SDK_8583_DATA_ASC, SDK_8583_ALIGN_L, '0'},
+                    /* FLD  00 */ {0, SDK_8583_LEN_BCD, 4, SDK_8583_DATA_BCD, SDK_8583_ALIGN_L, '0'},
                     /* FLD  01 */ {0, SDK_8583_LEN_BCD, 8, SDK_8583_DATA_BIT, SDK_8583_ALIGN_L, 0},
 
                     /* FLD  02 */ {2, SDK_8583_LEN_ASC, 19, SDK_8583_DATA_ASC, SDK_8583_ALIGN_L, '0'},