diff --git a/app/build.gradle b/app/build.gradle
index db89730..92f77ec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "com.utsmm.kbz"
         minSdk 24
         targetSdk 33
-        versionCode 7
-        versionName "1.06"
+        versionCode 8
+        versionName "1.07"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/app/src/main/java/com/utsmm/kbz/MainActivity.java b/app/src/main/java/com/utsmm/kbz/MainActivity.java
index 09657ff..1c5f1f1 100644
--- a/app/src/main/java/com/utsmm/kbz/MainActivity.java
+++ b/app/src/main/java/com/utsmm/kbz/MainActivity.java
@@ -399,7 +399,13 @@ public class MainActivity extends AppCompatActivity implements
 
     }
 
-
+    @Override
+    public void onStop(){
+        super.onStop();
+        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
+        BaseApplication.getInstance().deviceEngine.getPlatform().enableHomeButton();
+        BaseApplication.getInstance().deviceEngine.getPlatform().enableTaskButton();
+    }
 
     @Override
     protected void onNewIntent(Intent intent) {
@@ -466,13 +472,12 @@ public class MainActivity extends AppCompatActivity implements
     @Override
     public void onDestroy() {
         super.onDestroy();
-
+        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
+        BaseApplication.getInstance().deviceEngine.getPlatform().enableHomeButton();
+        BaseApplication.getInstance().deviceEngine.getPlatform().enableTaskButton();
         // Clean up RxJava disposables
         compositeDisposable.clear();
-
         // Reset screen mode
-
-
         // Disconnect ECR
         ECRHelper.INSTANCE.disconnect();
     }
diff --git a/app/src/main/java/com/utsmm/kbz/MainFragment.java b/app/src/main/java/com/utsmm/kbz/MainFragment.java
index d8d621e..d956eb5 100644
--- a/app/src/main/java/com/utsmm/kbz/MainFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/MainFragment.java
@@ -111,7 +111,6 @@ public class MainFragment extends DataBindingFragment {
         return routeId;
     }
 
-
     @Override
     protected void initViewModel() {
         sharedViewModel = getFragmentScopeViewModel(SharedViewModel.class);
@@ -119,7 +118,6 @@ public class MainFragment extends DataBindingFragment {
         tmsProcessViewModel = getFragmentScopeViewModel(TMSProcessViewModel.class);
     }
 
-
     @Override
     public void onResume() {
         super.onResume();
@@ -212,15 +210,18 @@ public class MainFragment extends DataBindingFragment {
     @Override
     public void onDestroy() {
         super.onDestroy();
-
+//        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
+//        enableTaskButton();
+//        enableHomeButton();
     }
 
+
     @Override
     public void onPause() {
         super.onPause();
-        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
-        enableTaskButton();
-        enableHomeButton();
+//        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
+//        enableTaskButton();
+//        enableHomeButton();
     }
 
     @Override
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
index 70310af..f5a740a 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
@@ -739,13 +739,11 @@ public abstract class BaseXPrint {
         long refundTotal = 0;
 
         for (PayDetail pay : lists) {
-//            printer.appendPrnStr("DATE      :" + POSUtil.getInstance().formatDisplayDate(payDetail.getTransDate()), fontNormal, AlignEnum.LEFT, false);
-//            printer.appendPrnStr("TIME      :" + payDetail.getTransTime(), fontNormal, AlignEnum.LEFT, false);
 
             printString("Trans Id: " + pay.getQrTransId());
             printString("Status  : " + pay.getTC());
 //            printString("Date    : " + PrintUtils.getInstance().formatTimestamp(Long.parseLong(pay.getTradeDateAndTime())));
-            printString("Date    : " + POSUtil.getInstance().formatDisplayDate(pay.getTradeDate()));
+            printString("Date    : " + pay.getTransDate());
             printString("Time    : " + pay.getTransTime());
 
             printString("Amount  : " + "MMK " + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(pay.getAmount()));
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java
index f8c7880..1493049 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java
@@ -212,7 +212,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
             setHeight(0x12);
             printLogo();
             printMerchantHeader();
-            printTransHeader(payDetail);
+            printTransHeader(payDetail, HostType.QR);
             printQRSettlementTransDetail(list);
             printTransFooterSummary();