From f8e93c38820881fadc5170285d0417f54a17a103 Mon Sep 17 00:00:00 2001
From: Dan Tamas <dan.tamas@gmail.com>
Date: Tue, 18 Jun 2019 20:19:21 +0200
Subject: [PATCH 1/2] Fix purchases.size

Use `size()` instead of `length` for `purchases` List
---
 android/src/main/java/com/dooboolab/RNIap/RNIapModule.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/src/main/java/com/dooboolab/RNIap/RNIapModule.java b/android/src/main/java/com/dooboolab/RNIap/RNIapModule.java
index 2a41f4484..109acd25e 100644
--- a/android/src/main/java/com/dooboolab/RNIap/RNIapModule.java
+++ b/android/src/main/java/com/dooboolab/RNIap/RNIapModule.java
@@ -179,7 +179,7 @@ public void run() {
           return;
         }
         final List<Purchase> purchases = result.getPurchasesList();
-        if (purchases == null || purchases.length == 0) {
+        if (purchases == null || purchases.size() == 0) {
           promise.reject("refreshItem", "No purchases found");
           return;
         }

From e4de26672a654094ab0f601a98fc8a322613f1f5 Mon Sep 17 00:00:00 2001
From: Dan Tamas <dan.tamas@gmail.com>
Date: Sat, 22 Jun 2019 11:44:15 +0200
Subject: [PATCH 2/2] Fix transactionId for google

Use `getOrderId` instead of `getPurchaseToken` to be identical to `onPurchasesUpdated`
---
 android/src/main/java/com/dooboolab/RNIap/RNIapModule.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/src/main/java/com/dooboolab/RNIap/RNIapModule.java b/android/src/main/java/com/dooboolab/RNIap/RNIapModule.java
index d64db1aef..644afbc01 100644
--- a/android/src/main/java/com/dooboolab/RNIap/RNIapModule.java
+++ b/android/src/main/java/com/dooboolab/RNIap/RNIapModule.java
@@ -279,7 +279,7 @@ public void run() {
         for (Purchase purchase : purchases) {
           WritableNativeMap item = new WritableNativeMap();
           item.putString("productId", purchase.getSku());
-          item.putString("transactionId", purchase.getPurchaseToken());
+          item.putString("transactionId", purchase.getOrderId());
           item.putString("transactionDate", String.valueOf(purchase.getPurchaseTime()));
           item.putString("transactionReceipt", purchase.getOriginalJson());
           item.putString("orderId", purchase.getOrderId());
@@ -319,7 +319,7 @@ public void onPurchaseHistoryResponse(BillingResult billingResult, List<Purchase
             for (PurchaseHistoryRecord purchase : purchaseHistoryRecordList) {
               WritableMap item = Arguments.createMap();
               item.putString("productId", purchase.getSku());
-              item.putString("transactionId", purchase.getPurchaseToken());
+              item.putString("transactionId", purchase.getOrderId());
               item.putString("transactionDate", String.valueOf(purchase.getPurchaseTime()));
               item.putString("transactionReceipt", purchase.getOriginalJson());
               item.putString("purchaseToken", purchase.getPurchaseToken());