From 5ff07386a9f3a24d74bd12eea8bb1d7266274e92 Mon Sep 17 00:00:00 2001
From: NejcZdovc <nejc.zdovc@3zsistemi.si>
Date: Thu, 21 Feb 2019 18:12:28 +0100
Subject: [PATCH] Fixes rebase problem

---
 vendor/bat-native-ledger/src/bat_helper.cc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/vendor/bat-native-ledger/src/bat_helper.cc b/vendor/bat-native-ledger/src/bat_helper.cc
index 0ec68df22e1d..78cc1a6c0cc2 100644
--- a/vendor/bat-native-ledger/src/bat_helper.cc
+++ b/vendor/bat-native-ledger/src/bat_helper.cc
@@ -1117,14 +1117,15 @@ bool GRANT_RESPONSE::loadFromJson(const std::string & json) {
 
   // On successful grant
   error = !(
-      d.HasMember("altcurrency") && d["altcurrency"].IsString() &&
-      d.HasMember("expiryTime") && d["expiryTime"].IsNumber() &&
-      d.HasMember("probi") && d["probi"].IsString());
+      d.HasMember("protocolVersion") && d["protocolVersion"].IsNumber() &&
+      d.HasMember("minimumReconcileTimestamp") &&
+      d["minimumReconcileTimestamp"].IsNumber() &&
+      d.HasMember("type") && d["type"].IsString());
 
   if (error == false) {
-    altcurrency = d["altcurrency"].GetString();
-    expiryTime = d["expiryTime"].GetUint64();
-    probi = d["probi"].GetString();
+    minimumReconcileTimestamp = d["minimumReconcileTimestamp"].GetUint64();
+    protocolVersion = d["protocolVersion"].GetUint64();
+    type = d["type"].GetString();
   }
 
   return !error;