From 8d168bf3cd8c6af10adf9a1d5d8dbdd3172a7e3f Mon Sep 17 00:00:00 2001 From: Goran Jovic Date: Wed, 31 Oct 2018 11:29:45 +0100 Subject: [PATCH] bug #5899 - restored missing transaction error messages Signed-off-by: Goran Jovic --- src/status_im/models/wallet.cljs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/status_im/models/wallet.cljs b/src/status_im/models/wallet.cljs index ecd65ced8d..c1214ce1b6 100644 --- a/src/status_im/models/wallet.cljs +++ b/src/status_im/models/wallet.cljs @@ -167,16 +167,13 @@ {:db (-> db (assoc-in [:wallet :send-transaction :wrong-password?] true))} - (merge (let [cofx {:db - (-> db - (assoc-in [:wallet :transactions-queue] nil) - (assoc-in [:wallet :send-transaction] {})) - :wallet/show-transaction-error - message}] - (navigation/navigate-back cofx)) - - (when on-error - {:dispatch (conj on-error message)}))))) + (fx/merge {:db (-> db + (assoc-in [:wallet :transactions-queue] nil) + (assoc-in [:wallet :send-transaction] {}))} + {:wallet/show-transaction-error message} + (navigation/navigate-back) + (when on-error + {:dispatch (conj on-error message)}))))) (defn transform-data-for-message [{:keys [method] :as transaction}] (cond-> transaction