diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/cardwaiting/CardWaitingScreen.kt b/app/src/main/java/com/mob/utsmyanmar/ui/cardwaiting/CardWaitingScreen.kt
index acac61a..92953d5 100644
--- a/app/src/main/java/com/mob/utsmyanmar/ui/cardwaiting/CardWaitingScreen.kt
+++ b/app/src/main/java/com/mob/utsmyanmar/ui/cardwaiting/CardWaitingScreen.kt
@@ -390,11 +390,11 @@ private fun CardLogoRow() {
             verticalAlignment = Alignment.CenterVertically
         ) {
             CardLogo(
-                icon = painterResource(R.drawable.logo_visa),
-                name = "visa",
+                icon = painterResource(R.drawable.logo_mpu),
+                name = "master",
             )
             CardLogo(
-                icon = painterResource(R.drawable.logo_jcb),
+                icon = painterResource(R.drawable.logo_visa),
                 name = "visa",
             )
             CardLogo(
@@ -402,12 +402,12 @@ private fun CardLogoRow() {
                 name = "master",
             )
             CardLogo(
-                icon = painterResource(R.drawable.logo_mpu),
-                name = "master",
+                icon = painterResource(R.drawable.logo_union_pay),
+                name = "union",
             )
             CardLogo(
-                icon = painterResource(R.drawable.logo_union_pay),
-                name = "master",
+                icon = painterResource(R.drawable.logo_jcb),
+                name = "jcb",
             )
         }
     }
diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt b/app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt
index 0d93508..5409887 100644
--- a/app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt
+++ b/app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt
@@ -34,8 +34,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.PathEffect
-import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.unit.dp
@@ -266,17 +264,18 @@ fun ReceiptPreview(
         )
         Spacer(modifier = Modifier.height(16.dp))
         ReceiptDivider()
-        ReceiptRow("Merchant", state.payDetail?.merchantName.toString() )
-        ReceiptRow("Terminal ID", state.payDetail?.terminalNo.toString() )
-        ReceiptRow("Trace No", state.payDetail?.voucherNo.toString() )
-        ReceiptRow("Transaction", state.payDetail?.let(::displayTransactionTitle).orEmpty())
+        ReceiptRow("Date", state.payDetail?.transDate.toString())
+        ReceiptRow("Time", state.payDetail?.transTime.toString())
+        ReceiptRow("Merchant Name", state.payDetail?.merchantName.toString())
+        ReceiptRow("TID", state.payDetail?.terminalNo.toString())
+        ReceiptRow("Trace No", state.payDetail?.voucherNo.toString())
+        ReceiptRow("Ref No", state.payDetail?.referNo.toString())
+        ReceiptRow("Approval Code", state.payDetail?.approvalCode.toString())
+        ReceiptRow("Transaction Type", state.payDetail?.let(::displayTransactionTitle).orEmpty())
         ReceiptRow("Amount", POSUtil.getInstance().getDecimalAmountSeparatorFormat(state.payDetail?.amount?:0))
         ReceiptRow("Card Type", state.payDetail?.accountType.toString())
         ReceiptRow("Card No", state.payDetail?.cardNo.toString())
         ReceiptRow("Status", if (isPreview) "SUCCESS" else state.payDetail?.let(::displayTransactionStatus).orEmpty())
-        ReceiptRow("Date", state.payDetail?.transDate.toString() )
-        ReceiptRow("Time", state.payDetail?.transTime.toString())
-        ReceiptRow("Ref No", state.payDetail?.referNo.toString())
         ReceiptDivider()
         Spacer(modifier = Modifier.height(8.dp))
         Text(
@@ -360,6 +359,7 @@ private fun PrintReceiptScreenPreview() {
         referNo = "123456789012"
         transType = "SALE"
         tradeAnswerCode = "00"
+        approvalCode = "123456"
     }
 
     val sampleState = TransactionResultState(