diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultScreen.kt b/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultScreen.kt
index 9198b0b..5c27ca7 100644
--- a/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultScreen.kt
+++ b/app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultScreen.kt
@@ -24,6 +24,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.mob.utsmyanmar.ui.preview.P2Preview
 import com.mob.utsmyanmar.ui.theme.Color
+import com.mob.utsmyanmar.utils.toFormattedDate
+import com.mob.utsmyanmar.utils.toFormattedTime
 import com.utsmyanmar.paylibs.model.PayDetail
 import com.utsmyanmar.paylibs.print.PrintReceipt
 import com.utsmyanmar.paylibs.utils.POSUtil
@@ -82,8 +84,8 @@ fun TransactionResultScreen(
             Spacer(modifier = Modifier.height(16.dp))
 
             InfoCard(
-                date = "26 May 2026",
-                time = "12:06 PM",
+                date = "${state.payDetail?.transDate?.toFormattedDate()}",
+                time = "${state.payDetail?.transTime?.toFormattedTime()}",
                 transactionId = state.payDetail?.referNo.toString()
             )
             
diff --git a/app/src/main/java/com/mob/utsmyanmar/utils/Extensions.kt b/app/src/main/java/com/mob/utsmyanmar/utils/Extensions.kt
new file mode 100644
index 0000000..c1e7b00
--- /dev/null
+++ b/app/src/main/java/com/mob/utsmyanmar/utils/Extensions.kt
@@ -0,0 +1,18 @@
+package com.mob.utsmyanmar.utils
+
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+fun String.toFormattedDate(): String {
+    val inputFormat = SimpleDateFormat("dd/MM/yy", Locale.ENGLISH)
+    val outputFormat = SimpleDateFormat("dd MMM yyyy", Locale.ENGLISH)
+    val date = inputFormat.parse(this)
+    return outputFormat.format(date!!)
+}
+
+fun String.toFormattedTime(): String {
+    val inputFormat = SimpleDateFormat("HH:mm:ss", Locale.ENGLISH)
+    val outputFormat = SimpleDateFormat("hh:mm a", Locale.ENGLISH)
+    val time = inputFormat.parse(this)
+    return outputFormat.format(time!!)
+}
\ No newline at end of file
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/network/ISOSocket.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/network/ISOSocket.java
index 879082c..f606cbc 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/network/ISOSocket.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/network/ISOSocket.java
@@ -503,7 +503,7 @@ public class ISOSocket {
 
                         LogUtil.e(Constant.TAG, "E:" + e.toString());
 
-                        closeSocket();
+//                        closeSocket();
                         if (isReversal) {
                             listener.onError(Constant.REVERSAL);
 //                            listener.onError(new ReversalException());
@@ -519,7 +519,7 @@ public class ISOSocket {
                     @Override
                     public void onComplete() {
                         LogUtil.d(Constant.TAG, "onComplete");
-                        closeSocket();
+//                        closeSocket();
                         isReversal = false;
                         listener.onComplete();
                     }
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/transactions/TransactionsOperation.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/transactions/TransactionsOperation.java
index 2bb3bf4..905550a 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/transactions/TransactionsOperation.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/transactions/TransactionsOperation.java
@@ -368,7 +368,7 @@ public class TransactionsOperation {
                 }
             }
         } else if (transactionsType == TransactionsType.PRE_AUTH_VOID) {
-            newPay.setCardType(oldPay.getCardType());
+//            newPay.setCardType(oldPay.getCardType());
             newPay.setCustomOrderNo(oldPay.getVoucherNo());
             newPay.setReferNo(oldPay.getReferNo());
             newPay.setCardInfo(oldPay.getCardInfo());
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/host_utils/HostUtils.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/host_utils/HostUtils.java
index f903392..b9f3620 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/host_utils/HostUtils.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/host_utils/HostUtils.java
@@ -118,6 +118,7 @@ public class HostUtils {
                 }
 
                 break;
+            case PRE_AUTH_VOID:
             case PRE_AUTH_COMPLETE:
                 if (hostName == HostName.BPC) {
                     msgType = MessageType.FINANCIAL;
@@ -142,11 +143,11 @@ public class HostUtils {
 
                 break;
             case VOID:
-            case PRE_AUTH_VOID:
                 if(isVisaMaster) {
                     msgType = MessageType.REVERSAL;
                     break;
                 }
+
             default:
                 msgType = MessageType.FINANCIAL;
                 break;
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/BitmapConfig.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/BitmapConfig.java
index 6930af4..b80308b 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/BitmapConfig.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/BitmapConfig.java
@@ -198,7 +198,8 @@ public class BitmapConfig {
     public static final String CZ_REVERSAL="7020078000C08000";
     public static final String CZ_BATCH_UPLOAD="703805800CC00010";
     public static final String CZ_PRE_AUTH="7020058020C09000";
-    public static final String CZ_PRE_AUTH_VOID="7038058028C08000";
+//    public static final String CZ_PRE_AUTH_VOID="7038058028C08000";
+    public static final String CZ_PRE_AUTH_VOID="703C058008C08000";
     public static final String CZ_PRE_AUTH_COMP="703805802CC08000";
     public static final String CZ_PRE_AUTH_COMP_VOID="7038058008C00000";