diff --git a/app/src/main/res/layout/fragment_config_settings_modern.xml b/app/src/main/res/layout/fragment_config_settings_modern.xml
index 902c34c..a96e3ce 100644
--- a/app/src/main/res/layout/fragment_config_settings_modern.xml
+++ b/app/src/main/res/layout/fragment_config_settings_modern.xml
@@ -65,6 +65,7 @@
                         tools:fontFamily="sans-serif-medium" />
 
                     <!-- System PIN Card -->
+<!--                    android:onClick="@{()->click.onSystemPinClick()}"-->
                     <androidx.cardview.widget.CardView
                         android:id="@+id/systemPinCard"
                         android:layout_width="match_parent"
@@ -72,7 +73,6 @@
                         android:layout_marginBottom="12dp"
                         android:clickable="true"
                         android:foreground="?android:attr/selectableItemBackground"
-                        android:onClick="@{()->click.onSystemPinClick()}"
                         app:cardBackgroundColor="@color/white"
                         app:cardCornerRadius="16dp"
                         app:cardElevation="2dp">
@@ -141,6 +141,7 @@
                     </androidx.cardview.widget.CardView>
 
                     <!-- Settings PIN Card -->
+<!--                    android:onClick="@{()->click.onSettingPinClick()}"-->
                     <androidx.cardview.widget.CardView
                         android:id="@+id/settingPinCard"
                         android:layout_width="match_parent"
@@ -148,7 +149,6 @@
                         android:layout_marginBottom="12dp"
                         android:clickable="true"
                         android:foreground="?android:attr/selectableItemBackground"
-                        android:onClick="@{()->click.onSettingPinClick()}"
                         app:cardBackgroundColor="@color/white"
                         app:cardCornerRadius="16dp"
                         app:cardElevation="2dp">
@@ -237,6 +237,7 @@
                         tools:fontFamily="sans-serif-medium" />
 
                     <!-- Primary Host IP Card -->
+<!--                    android:onClick="@{()->click.onHostIpClick()}"-->
                     <androidx.cardview.widget.CardView
                         android:id="@+id/hostIpCard"
                         android:layout_width="match_parent"
@@ -244,7 +245,6 @@
                         android:layout_marginBottom="12dp"
                         android:clickable="true"
                         android:foreground="?android:attr/selectableItemBackground"
-                        android:onClick="@{()->click.onHostIpClick()}"
                         app:cardBackgroundColor="@color/white"
                         app:cardCornerRadius="16dp"
                         app:cardElevation="2dp">
@@ -313,6 +313,7 @@
                     </androidx.cardview.widget.CardView>
 
                     <!-- Secondary Host IP Card -->
+<!--                    android:onClick="@{()->click.onSecHostIpClick()}"-->
                     <androidx.cardview.widget.CardView
                         android:id="@+id/secHostIpCard"
                         android:layout_width="match_parent"
@@ -320,7 +321,6 @@
                         android:layout_marginBottom="12dp"
                         android:clickable="true"
                         android:foreground="?android:attr/selectableItemBackground"
-                        android:onClick="@{()->click.onSecHostIpClick()}"
                         app:cardBackgroundColor="@color/white"
                         app:cardCornerRadius="16dp"
                         app:cardElevation="2dp">
@@ -389,6 +389,7 @@
                     </androidx.cardview.widget.CardView>
 
                     <!-- Host Port Card -->
+<!--                    android:onClick="@{()->click.onHostPortClick()}"-->
                     <androidx.cardview.widget.CardView
                         android:id="@+id/hostPortCard"
                         android:layout_width="match_parent"
@@ -396,7 +397,6 @@
                         android:layout_marginBottom="12dp"
                         android:clickable="true"
                         android:foreground="?android:attr/selectableItemBackground"
-                        android:onClick="@{()->click.onHostPortClick()}"
                         app:cardBackgroundColor="@color/white"
                         app:cardCornerRadius="16dp"
                         app:cardElevation="2dp">
@@ -485,6 +485,7 @@
                         tools:fontFamily="sans-serif-medium" />
 
                     <!-- Terminal ID Card -->
+<!--                    android:onClick="@{()->click.onTidClick()}"-->
                     <androidx.cardview.widget.CardView
                         android:id="@+id/tidCard"
                         android:layout_width="match_parent"
@@ -492,7 +493,6 @@
                         android:layout_marginBottom="12dp"
                         android:clickable="true"
                         android:foreground="?android:attr/selectableItemBackground"
-                        android:onClick="@{()->click.onTidClick()}"
                         app:cardBackgroundColor="@color/white"
                         app:cardCornerRadius="16dp"
                         app:cardElevation="2dp">
@@ -561,6 +561,7 @@
                     </androidx.cardview.widget.CardView>
 
                     <!-- Merchant ID Card -->
+<!--                    android:onClick="@{()->click.onMidClick()}"-->
                     <androidx.cardview.widget.CardView
                         android:id="@+id/midCard"
                         android:layout_width="match_parent"
@@ -568,7 +569,6 @@
                         android:layout_marginBottom="12dp"
                         android:clickable="true"
                         android:foreground="?android:attr/selectableItemBackground"
-                        android:onClick="@{()->click.onMidClick()}"
                         app:cardBackgroundColor="@color/white"
                         app:cardCornerRadius="16dp"
                         app:cardElevation="2dp">
@@ -657,6 +657,7 @@
                         tools:fontFamily="sans-serif-medium" />
 
                     <!-- Save Configuration Card -->
+<!--                    android:onClick="@{()->click.onSaveConfigClick()}"-->
                     <androidx.cardview.widget.CardView
                         android:id="@+id/saveConfigCard"
                         android:layout_width="match_parent"
@@ -664,7 +665,6 @@
                         android:layout_marginBottom="12dp"
                         android:clickable="true"
                         android:foreground="?android:attr/selectableItemBackground"
-                        android:onClick="@{()->click.onSaveConfigClick()}"
                         app:cardBackgroundColor="@color/white"
                         app:cardCornerRadius="16dp"
                         app:cardElevation="2dp">
diff --git a/app/src/main/res/layout/fragment_settings_modern.xml b/app/src/main/res/layout/fragment_settings_modern.xml
index cae72d5..afd3c8e 100644
--- a/app/src/main/res/layout/fragment_settings_modern.xml
+++ b/app/src/main/res/layout/fragment_settings_modern.xml
@@ -820,6 +820,7 @@
                         tools:fontFamily="sans-serif-medium" />
 
                     <!-- TMS Server URL Card -->
+<!--                    android:onClick="@{()->click.onTmsAddressClick()}"-->
                     <androidx.cardview.widget.CardView
                         android:id="@+id/tmsAddressCard"
                         android:layout_width="match_parent"
@@ -827,7 +828,6 @@
                         android:layout_marginBottom="12dp"
                         android:clickable="true"
                         android:foreground="?android:attr/selectableItemBackground"
-                        android:onClick="@{()->click.onTmsAddressClick()}"
                         app:cardBackgroundColor="@color/white"
                         app:cardCornerRadius="16dp"
                         app:cardElevation="2dp">
diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java b/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java
index 45f23b4..8bda331 100644
--- a/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java
+++ b/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java
@@ -107,8 +107,7 @@ public class Repository {
         return siriusApiService.getParams(siriusRequest);
     }
     public Observable<EReceiptResponse> sendReceipt(Object body){
-//        String apiSecret = BuildConfig.ERECEIPT_SECRET;
-        String apiSecret = "8f4df38d1001bcc4620b5c736c66a03eef4653eb3ba31105faa2f2ee294c4a46";
+        String apiSecret = BuildConfig.ERECEIPT_SECRET;
         String timestamp = String.valueOf(System.currentTimeMillis());
         String bodyString = new Gson().toJson(body);
         String dataToHash = bodyString + apiSecret + timestamp;