From 5718107973bf231d3c008146573e0279bae420b9 Mon Sep 17 00:00:00 2001
From: Roman Volosovskyi <roman.wolosovskyi@gmail.com>
Date: Tue, 10 Aug 2021 12:00:06 +0300
Subject: [PATCH] fix tx sending with kk

---
 src/status_im/signing/keycard.cljs | 16 ++++++++++++----
 status-go-version.json             |  6 +++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/status_im/signing/keycard.cljs b/src/status_im/signing/keycard.cljs
index de2fd23b675..b74cc7825e4 100644
--- a/src/status_im/signing/keycard.cljs
+++ b/src/status_im/signing/keycard.cljs
@@ -26,15 +26,23 @@
 
 (defn prepare-transaction
   [{:keys [gas gasPrice data nonce tx-obj]}]
-  (let [{:keys [from to value chat-id message-id command?]} tx-obj]
+  (let [{:keys [from to value chat-id message-id command? maxPriorityFeePerGas maxFeePerGas]} tx-obj]
     (cond-> {:from       from
              :to         to
              :value      value
-             :gas        (str "0x" (abi-spec/number-to-hex gas))
-             :gasPrice   (str "0x" (abi-spec/number-to-hex gasPrice))
              :chat-id    chat-id
              :message-id message-id
              :command?   command?}
+      maxPriorityFeePerGas
+      (assoc :maxPriorityFeePerGas (str "0x" (abi-spec/number-to-hex
+                                              (js/parseInt maxPriorityFeePerGas))))
+      maxFeePerGas
+      (assoc :maxFeePerGas (str "0x" (abi-spec/number-to-hex
+                                      (js/parseInt maxFeePerGas))))
+      gas
+      (assoc :gas (str "0x" (abi-spec/number-to-hex gas)))
+      gasPrice
+      (assoc :gasPrice (str "0x" (abi-spec/number-to-hex gasPrice)))
       data
       (assoc :data data)
       nonce
@@ -93,7 +101,7 @@
 (fx/defn sign-with-keycard
   {:events [:signing.ui/sign-with-keycard-pressed]}
   [{:keys [db] :as cofx}]
-  (let [message (get-in db [:signing/tx :message])]
+  (let [{:keys [message maxPriorityFeePerGas maxFeePerGas]} (get db :signing/tx)]
     (fx/merge
      cofx
      {:db (-> db
diff --git a/status-go-version.json b/status-go-version.json
index b7130fd3d90..ef3ee69c9c8 100644
--- a/status-go-version.json
+++ b/status-go-version.json
@@ -2,7 +2,7 @@
     "_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v0.83.5",
-    "commit-sha1": "89251e841655082076ef304791b9ee3145f337c2",
-    "src-sha256": "0f0mw5bv4rwi6i9q4xa7shrjd8r4qwq5ky7lm6jjszyrqwhhf74j"
+    "version": "adjust-has-transaction",
+    "commit-sha1": "d3b9d998ab9ba12e8efa173a6425c5813d94d615",
+    "src-sha256": "1b3zf19d9jbbf96rhabcwsmf0j332x31zass8dvs1mi49wm8l1if"
 }