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

bug #5265 - transaction history populated only with own transactions 

Signed-off-by: Goran Jovic <goranjovic@gmail.com>
This commit is contained in:
Goran Jovic 2018-07-26 14:21:15 +02:00
parent d834b6e37d
commit 9bac5a223c
No known key found for this signature in database
GPG Key ID: D429D1A9B2EB8A8E
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/status_im/ui/screens/wallet/events.cljs
View File

@ -73,7 +73,7 @@
(fn [{:keys [web3 chain account-id token-addresses success-event error-event]}] (fn [{:keys [web3 chain account-id token-addresses success-event error-event]}]
(transactions/get-transactions chain (transactions/get-transactions chain
account-id account-id
#(re-frame/dispatch [success-event %]) #(re-frame/dispatch [success-event % account-id])
#(re-frame/dispatch [error-event %])) #(re-frame/dispatch [error-event %]))
(doseq [direction [:inbound :outbound]] (doseq [direction [:inbound :outbound]]
(erc20/get-token-transactions web3 (erc20/get-token-transactions web3
@ -81,7 +81,7 @@
token-addresses token-addresses
direction direction
account-id account-id
#(re-frame/dispatch [success-event %]))))) #(re-frame/dispatch [success-event % account-id])))))
;; TODO(oskarth): At some point we want to get list of relevant assets to get prices for ;; TODO(oskarth): At some point we want to get list of relevant assets to get prices for
(reg-fx (reg-fx
@ -167,12 +167,22 @@
(both-transfer? tx1 tx2) (update-confirmations tx1 tx2) (both-transfer? tx1 tx2) (update-confirmations tx1 tx2)
:else tx2)) :else tx2))
(defn own-transaction? [address [_ {:keys [type to from]}]]
(let [normalized (ethereum/normalized-address address)]
(or (and (= :inbound type) (= normalized (ethereum/normalized-address to)))
(and (= :outbound type) (= normalized (ethereum/normalized-address from)))
(and (= :failed type) (= normalized (ethereum/normalized-address from))))))
(handlers/register-handler-db (handlers/register-handler-db
:update-transactions-success :update-transactions-success
(fn [db [_ transactions]] (fn [db [_ transactions address]]
(-> db ;; NOTE(goranjovic): we want to only show transactions that belong to the current account
(update-in [:wallet :transactions] #(merge-with dedupe-transactions % transactions)) ;; this filter is to prevent any late transaction updates initated from another account on the same
(assoc-in [:wallet :transactions-loading?] false)))) ;; device from being applied in the current account.
(let [own-transactions (into {} (filter #(own-transaction? address %) transactions))]
(-> db
(update-in [:wallet :transactions] #(merge-with dedupe-transactions % own-transactions))
(assoc-in [:wallet :transactions-loading?] false)))))
(handlers/register-handler-db (handlers/register-handler-db
:update-transactions-fail :update-transactions-fail