diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java
index d2b5e45..c3a47ab 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java
@@ -2,6 +2,7 @@ package com.utsmm.kbz.ui.core_viewmodel;
 
 import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
+import android.os.Looper;
 import android.util.Log;
 import android.widget.ListView;
 
@@ -231,7 +232,15 @@ public class SharedViewModel extends ViewModel {
 
     public void setPrintReceiptMsg(String msg) { this.printReceiptMsg.setValue(msg);}
     public void postPrintReceiptMsg(String msg) { this.printReceiptMsg.postValue(msg);}
-    public void setPrintStatus(PrintStatus printStatus) { this.printStatus.postValue(printStatus); }
+    public void setPrintStatus(PrintStatus printStatus) { 
+//        this.printStatus.postValue(printStatus);
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            this.printStatus.setValue(printStatus);
+        } else {
+            this.printStatus.postValue(printStatus);
+        }
+
+    }
     public void postPrintStatus(PrintStatus printStatus) { this.printStatus.postValue(printStatus); }
 
     public SingleLiveEvent<PrintStatus> getPrintStatus() { return this.printStatus; }
diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/db/dao/PayDetailDao.java b/baselib/src/main/java/com/utsmyanmar/baselib/db/dao/PayDetailDao.java
index fcd0116..a351fb1 100644
--- a/baselib/src/main/java/com/utsmyanmar/baselib/db/dao/PayDetailDao.java
+++ b/baselib/src/main/java/com/utsmyanmar/baselib/db/dao/PayDetailDao.java
@@ -186,7 +186,7 @@ public interface PayDetailDao {
     @Query("SELECT * FROM paydetail ORDER BY PID DESC")
     LiveData<List<PayDetail>> getAllTrans();
 
-    @Query("SELECT * FROM paydetail WHERE transactionType = 20 ORDER BY PID DESC")
+    @Query("SELECT * FROM paydetail WHERE transactionType = 20 AND qrTransStatus = 1 ORDER BY PID DESC")
     LiveData<List<PayDetail>> getAllQRHistory();
 
     @Query("SELECT * FROM paydetail WHERE transactionType = 20 AND qrTransStatus = 1 AND isCanceled = 0 ORDER BY PID DESC")
diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java b/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java
index 426b8a0..b1da0ea 100644
--- a/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java
+++ b/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java
@@ -254,8 +254,8 @@ public class NetworkModule {
         }
 
         if (baseUrl.isEmpty()) {
-//            baseUrl = "http://api-uat.kbzpay.com/payment/gateway/uat/"; //UAT
-            baseUrl = "https://api.kbzpay.com/payment/gateway/"; //Prod
+            baseUrl = "http://api-uat.kbzpay.com/payment/gateway/uat/"; //UAT
+//            baseUrl = "https://api.kbzpay.com/payment/gateway/"; //Prod
         }
         return new Retrofit.Builder()
                 .baseUrl(baseUrl)
@@ -311,8 +311,8 @@ public Retrofit provideKPayRefundRetrofit(@ApplicationContext Context context) {
 
 //    char[] password = "test123".toCharArray();
 
-    String refundBaseUrl = "https://api.kbzpay.com:8008/payment/gateway/";
-//    String refundBaseUrl = "https://api-uat.kbzpay.com:18008/payment/gateway/uat/";
+//    String refundBaseUrl = "https://api.kbzpay.com:8008/payment/gateway/";
+    String refundBaseUrl = "https://api-uat.kbzpay.com:18008/payment/gateway/uat/";
 //    String IpAddress = SystemParamsOperation.getInstance().getSecHostIpAddress();