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 #4921 - adds a workaround for the conflicting bugs #4876 and #4755 

Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
This commit is contained in:
Goran Jovic 2018-06-25 09:36:21 +02:00 committed by Igor Mandrigin
parent ad1a31073e
commit 9a348390d3
No known key found for this signature in database
GPG Key ID: 4A0EDDE26E66BC8B
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/status_im/ui/screens/wallet/send/events.cljs
View File

@ -142,6 +142,20 @@
:in-progress? false :in-progress? false
:password nil}) :password nil})
;; TODO(goranjovic) - this is a temporary workaround because in regular `clear-send-properties` we need `:from-chat?`
;; to be false to avoid the wallet onboarding crash if the user accessed transactions from dapps first.
;; On the other hand, if we reset the same flag to false every time we clear the current transaction that would also
;; happen when user clicks Cancel in chat initiated transaction and then all fields would become editable, which is
;; another bug.
;; This temporary workaround resets all fields except the flag if we are in a chat /send transaction.
;; A permanent solution would be to add onboarding check to dapp transaction and/or review the workflow.
(def ^:private partial-clear-send-properties {:id nil
:signing? false
:wrong-password? false
:waiting-signal? false
:in-progress? false
:password nil})
(defn on-transactions-completed [raw-results] (defn on-transactions-completed [raw-results]
(let [result (types/json->clj raw-results)] (let [result (types/json->clj raw-results)]
(dispatch-transaction-completed result))) (dispatch-transaction-completed result)))
@ -362,8 +376,9 @@
(defn discard-transaction (defn discard-transaction
[{:keys [db]}] [{:keys [db]}]
(let [{:keys [id]} (get-in db [:wallet :send-transaction])] (let [{:keys [id from-chat?]} (get-in db [:wallet :send-transaction])
(merge {:db (update-in db [:wallet :send-transaction] merge clear-send-properties)} clear-fields (if from-chat? partial-clear-send-properties clear-send-properties)]
(merge {:db (update-in db [:wallet :send-transaction] merge clear-fields)}
(when id (when id
{:discard-transaction id})))) {:discard-transaction id}))))