status-im/open-bounty
2
0
Fork 0
mirror of https://github.com/status-im/open-bounty.git synced 2025-01-12 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity

clear modal on actual revoke dispatch. include a hint about needing to sign via metamask

Browse Source
This commit is contained in:
Rob Culliton 2018-05-11 17:25:19 -04:00
parent d0a4ff7179
commit d98c07ef34
No known key found for this signature in database
GPG Key ID: 6FDEF60B3DC84D94
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cljs/commiteth/handlers.cljs
View File

@ -453,12 +453,13 @@
(reg-event-fx (reg-event-fx
:revoke-bounty :revoke-bounty
interceptors interceptors
(fn [{:keys [db]} [_ {:keys [issue-id]}]] (fn [{:keys [db]} [_ issue-id]]
{:http {:method POST {:http {:method POST
:url "/api/user/revoke" :url "/api/user/revoke"
:on-success #(dispatch [:revoke-bounty-success %]) :on-success #(dispatch [:revoke-bounty-success %])
:on-error #(dispatch [:revoke-bounty-error %]) :on-error #(dispatch [:revoke-bounty-error %])
:params {:issue-id issue-id}}})) :params {:issue-id issue-id}}
:dispatch [:clear-revoke-modal]}))
(reg-event-fx (reg-event-fx
:confirm-payout :confirm-payout

14
src/cljs/commiteth/manage_payouts.cljs
View File

@ -283,11 +283,11 @@
[ui-balances/token-balances (bnt/crypto-balances bounty) :label] [ui-balances/token-balances (bnt/crypto-balances bounty) :label]
[:p [ui-balances/usd-value-label (:value-usd bounty)]] [:p [ui-balances/usd-value-label (:value-usd bounty)]]
[:p.silver "To be refunded to: " owner-address]] [:p.silver "To be refunded to: " owner-address]]
[:div.pv3 [:div.pt3
[primary-button-button [primary-button-button
{:on-click #(rf/dispatch [:clear-revoke-modal])} {:on-click #(rf/dispatch [:revoke-bounty (:issue-id bounty)])}
"REQUEST REFUND"] "REQUEST REFUND"]
[:span.dark-gray.pointer.fw4.f7.ml4 [:span.dark-gray.pointer.fw4.f7.ml3
{:role "button" {:role "button"
:on-click #(rf/dispatch [:clear-revoke-modal])} :on-click #(rf/dispatch [:clear-revoke-modal])}
"CANCEL"]]]]))))) "CANCEL"]]]])))))
@ -301,8 +301,7 @@
[three-dots (:issue-id bounty)]) [three-dots (:issue-id bounty)])
(into menu [[:div (into menu [[:div
[:a.pa2 [:a.pa2
;; {:on-click #(rf/dispatch [:set-flash-message :error "These are the principles"])}
;; {:on-click #(rf/dispatch [:revoke-bounty {:issue-id (:issue-id bounty)}])}
{:on-click #(rf/dispatch [:set-revoke-modal bounty])} {:on-click #(rf/dispatch [:set-revoke-modal bounty])}
"Revoke"]]])])) "Revoke"]]])]))
@ -354,8 +353,9 @@
[:div.relative.pa3.pr4.bg-sob-green.br3.nt1 [:div.relative.pa3.pr4.bg-sob-green.br3.nt1
[:div [:div
[:p.v-mid [check-box "ic-check-circle-black-24dp-2x.png"] [:p.v-mid [check-box "ic-check-circle-black-24dp-2x.png"]
[:span.pg-med "Transaction sent."] " Refund is pending until the transaction is completed. Check its status" [:span.pg-med "Transaction sent."] " Your refund requires two confirmations. After the first one "
[:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " here."]]]])))))) [:a.sob-blue.pg-med {:href (etherscan-address-url (:contract_address revoking-bounty)) :target "_blank"} " completes "]
"you'll be prompted to sign the second via metamask."]]]))))))
(defn salute [] (defn salute []
(let [msg-info (rf/subscribe [:dashboard/banner-msg])] (let [msg-info (rf/subscribe [:dashboard/banner-msg])]