From d3925a542eb45ef95085f1e34606f871e111e9f3 Mon Sep 17 00:00:00 2001 From: Rob Culliton Date: Tue, 8 May 2018 15:11:33 -0400 Subject: [PATCH] if in the middle of a pending revocation, remove the banner on metamask payment rejction --- src/cljs/commiteth/handlers.cljs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs index c105b53..a0fcc4b 100644 --- a/src/cljs/commiteth/handlers.cljs +++ b/src/cljs/commiteth/handlers.cljs @@ -475,11 +475,13 @@ (send-transaction-callback issue-id)) {:db (assoc-in db [:owner-bounties issue-id :confirming?] true)} (catch js/Error e - {:db (assoc-in db [:owner-bounties issue-id :confirm-failed?] true) - :dispatch-n [[:payout-confirm-failed issue-id e] - [:set-flash-message - :error - (str "Failed to send transaction" e)]]}))))) + (if (empty? (::db/pending-revocations db)) + {:db (assoc-in db [:owner-bounties issue-id :confirm-failed?] true) + :dispatch-n [[:payout-confirm-failed issue-id e] + [:set-flash-message + :error + (str "Failed to send transaction" e)]]} + {:dispatch [:remove-pending-revocation issue-id]})))))) (reg-event-fx :payout-confirmed