From b685e026d74049bf6c997af2fccfd29b2ddaba6b Mon Sep 17 00:00:00 2001
From: kizzy <waiyan@utsmyanmar.com>
Date: Mon, 23 Feb 2026 12:28:42 +0700
Subject: [PATCH] 2nd fix for 1049

---
 .../java/com/utsmyanmar/baselib/emv/EmvParamHelper.java    | 3 ++-
 .../com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java | 7 +++++++
 .../paylibs/transactions/TransactionsOperation.java        | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/emv/EmvParamHelper.java b/baselib/src/main/java/com/utsmyanmar/baselib/emv/EmvParamHelper.java
index 32b096a..02ad555 100644
--- a/baselib/src/main/java/com/utsmyanmar/baselib/emv/EmvParamHelper.java
+++ b/baselib/src/main/java/com/utsmyanmar/baselib/emv/EmvParamHelper.java
@@ -351,7 +351,8 @@ public class EmvParamHelper {
 
         aidV2.setTransType("FF");
         aidV2.setOnlinePinCap(1);
-        aidV2.setAsi(1);
+        aidV2.setAsi(0);
+        aidV2.setThreshold(0);
 
         if (!(contactlessAid.getCvmLimit() < 0)) {
             aidV2.setContactlessCvmLimit(contactlessAid.getCvmLimit());
diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java b/baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java
index 644321a..9f4cbcc 100644
--- a/baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java
+++ b/baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java
@@ -34,6 +34,7 @@ import com.nexgo.oaf.apiv3.emv.EmvProcessFlowEnum;
 import com.nexgo.oaf.apiv3.emv.EmvProcessResultEntity;
 import com.nexgo.oaf.apiv3.emv.EmvTransConfigurationEntity;
 import com.nexgo.oaf.apiv3.emv.OnEmvProcessListener2;
+import com.nexgo.oaf.apiv3.emv.PayWaveResultEntity;
 import com.nexgo.oaf.apiv3.emv.PromptEnum;
 import com.nexgo.oaf.apiv3.emv.UnionPayTransDataEntity;
 import com.nexgo.oaf.apiv3.emv.VisaTransDataEntity;
@@ -777,6 +778,12 @@ public abstract class EmvBaseViewModel extends BaseViewModel {
             //get card number, track 2 data...etc
             LogUtil.d(TAG, "getEmvCardDataInfo:" + new Gson().toJson(emvHandler.getEmvCardDataInfo()));
 
+            PayWaveResultEntity payWaveResultEntity = emvHandler.getPayWaveResult();
+
+            LogUtil.d(TAG,"Paywave result TSI :"+payWaveResultEntity.getTsi());
+            LogUtil.d(TAG,"Paywave result TVR :"+payWaveResultEntity.getTvr());
+
+
 
             byte[] tlv_5A = emvHandler.getTlv(new byte[]{(byte) 0x5A}, EmvDataSourceEnum.FROM_KERNEL);
             LogUtil.d(TAG, "tlv_5A--" + ByteUtils.byteArray2HexString(tlv_5A));
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 f5ba6c7..976a13e 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/transactions/TransactionsOperation.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/transactions/TransactionsOperation.java
@@ -454,6 +454,7 @@ public class TransactionsOperation {
                     emvOnlineResult.setRecvField55(null);
                 }
 
+
             }
             if(equals) {
                 importOnlineProcessStatus(SdkResult.Success,emvOnlineResult);