status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

bug #4832 - not showing erc721 in transaction history as if it was erc20 

Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
This commit is contained in:
Goran Jovic 2018-06-21 14:59:53 +02:00 committed by Igor Mandrigin
parent 3030c10c5f
commit 63da0ffb50
No known key found for this signature in database
GPG Key ID: 4A0EDDE26E66BC8B
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/status_im/utils/ethereum/erc20.cljs
View File

@ -87,36 +87,37 @@
(keep identity (keep identity
(for [transfer transfers] (for [transfer transfers]
(if-let [token (->> transfer :address (tokens/address->token chain))] (if-let [token (->> transfer :address (tokens/address->token chain))]
[(:transactionHash transfer) (when-not (:nft? token)
{:block (-> block-info :number str) [(:transactionHash transfer)
:hash (:transactionHash transfer) {:block (-> block-info :number str)
:symbol (:symbol token) :hash (:transactionHash transfer)
:from (-> transfer :topics second remove-padding) :symbol (:symbol token)
:to (-> transfer :topics last remove-padding) :from (-> transfer :topics second remove-padding)
:value (-> transfer :data ethereum/hex->bignumber) :to (-> transfer :topics last remove-padding)
:type direction :value (-> transfer :data ethereum/hex->bignumber)
:type direction
:confirmations (str (- current-block-number (-> transfer :blockNumber ethereum/hex->int))) :confirmations (str (- current-block-number (-> transfer :blockNumber ethereum/hex->int)))
:gas-price nil :gas-price nil
:nonce nil :nonce nil
:data nil :data nil
:gas-limit nil :gas-limit nil
:timestamp (-> block-info :timestamp (* 1000) str) :timestamp (-> block-info :timestamp (* 1000) str)
:gas-used nil :gas-used nil
;; NOTE(goranjovic) - metadata on the type of token: contains name, symbol, decimas, address. ;; NOTE(goranjovic) - metadata on the type of token: contains name, symbol, decimas, address.
:token token :token token
;; NOTE(goranjovic) - if an event has been emitted, we can say there was no error ;; NOTE(goranjovic) - if an event has been emitted, we can say there was no error
:error? false :error? false
;; NOTE(goranjovic) - just a flag we need when we merge this entry with the existing entry in ;; NOTE(goranjovic) - just a flag we need when we merge this entry with the existing entry in
;; the app, e.g. transaction info with gas details, or a previous transfer entry with old ;; the app, e.g. transaction info with gas details, or a previous transfer entry with old
;; confirmations count. ;; confirmations count.
:transfer true}]))))) :transfer true}]))))))
(defn add-block-info [web3 current-block-number chain direction result success-fn] (defn add-block-info [web3 current-block-number chain direction result success-fn]
(let [transfers-by-block (group-by :blockNumber result)] (let [transfers-by-block (group-by :blockNumber result)]