update transactions when going back online

status-im · Jun 21, 2018 · 2c59b8b · 2c59b8b
1 parent bca1ac5
commit 2c59b8b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/status_im/chat/models/message.cljs b/src/status_im/chat/models/message.cljs
@@ -404,10 +404,10 @@
 
 ;; dispatch :update-transactions to update confirmations count
 ;; to verify tx initiated with /send command is confirmed
-(defn update-transactions [command-name tx-hash {:keys [with-delay?]} _]
+(defn update-transactions [command-name tx-hash {:keys [with-delay?]} cofx]
   (when (and tx-hash
              (= command-name constants/command-send))
-    (cond-> {:dispatch [:update-transactions]}
+    (cond-> {:update-transactions-fx cofx}
       with-delay?
       (assoc :utils/dispatch-later [{:ms       30000
                                      :dispatch [:update-transactions]}

diff --git a/src/status_im/network/events.cljs b/src/status_im/network/events.cljs
@@ -33,7 +33,8 @@
                                     {:db (assoc db :network-status (if is-connected? :online :offline))}
                                     (inbox/request-messages))
      is-connected?
-     (assoc :drain-mixpanel-events nil))))
+     (assoc :drain-mixpanel-events  nil
+            :update-transactions-fx cofx))))
 
 (handlers/register-handler-fx
  ::update-network-status

diff --git a/src/status_im/ui/screens/wallet/events.cljs b/src/status_im/ui/screens/wallet/events.cljs
@@ -138,9 +138,9 @@
                                 (assoc-in [:wallet :balance-loading?] true)
                                 (assoc :prices-loading? true))}))))
 
-(handlers/register-handler-fx
- :update-transactions
- (fn [{{:keys [network network-status web3] :as db} :db} _]
+(re-frame/reg-fx
+ :update-transactions-fx
+ (fn [{{:keys [network network-status web3] :as db} :db}]
    (when (not= network-status :offline)
      (let [network         (get-in db [:account/account :networks network])
            chain           (ethereum/network->chain-keyword network)
@@ -156,6 +156,11 @@
                               (clear-error-message :transactions-update)
                               (assoc-in [:wallet :transactions-loading?] true))}))))
 
+(handlers/register-handler-fx
+ :update-transactions
+ (fn [cofx _]
+   {:update-transactions-fx cofx}))
+
 (defn combine-entries [transaction token-transfer]
   (merge transaction (select-keys token-transfer
                                   (if (= :ETH (:symbol transaction))