status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[feature] allow internal transaction to specify asset 

- allows transaction flow started by an internal feature to show
the right asset in the overview and in transaction messages
(required for tribute to talk)

Signed-off-by: yenda <eric@status.im>
This commit is contained in:
yenda 2019-05-30 11:26:58 +02:00
parent 6a74c3a1ef
commit 131b423a0a
No known key found for this signature in database
GPG Key ID: 0095623C0069DCE6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,8 +43,8 @@
(re-frame/reg-fx (re-frame/reg-fx
::send-transaction ::send-transaction
(fn [[params all-tokens symbol chain on-completed masked-password]] (fn [[params all-tokens symbol chain on-completed masked-password]]
(case symbol (if (= symbol :ETH)
:ETH (send-ethers params on-completed masked-password) (send-ethers params on-completed masked-password)
(send-tokens all-tokens symbol chain params on-completed masked-password)))) (send-tokens all-tokens symbol chain params on-completed masked-password))))
(re-frame/reg-fx (re-frame/reg-fx
@ -121,7 +121,7 @@
:wallet.callback/transaction-completed :wallet.callback/transaction-completed
[(re-frame/inject-cofx :random-id-generator)] [(re-frame/inject-cofx :random-id-generator)]
(fn [{:keys [db now] :as cofx} [_ {:keys [result error]}]] (fn [{:keys [db now] :as cofx} [_ {:keys [result error]}]]
(let [{:keys [id method public-key to symbol amount-text on-result on-error (let [{:keys [id method public-key to symbol asset amount-text on-result on-error
send-transaction-message?]} send-transaction-message?]}
(get-in db [:wallet :send-transaction]) (get-in db [:wallet :send-transaction])
db' (assoc-in db [:wallet :send-transaction :in-progress?] false) db' (assoc-in db [:wallet :send-transaction :in-progress?] false)
@ -145,7 +145,7 @@
% %
public-key public-key
{:address to {:address to
:asset (name symbol) :asset (name (or asset symbol))
:amount amount-text :amount amount-text
:tx-hash result})) :tx-hash result}))
#(when-not on-result #(when-not on-result

4
src/status_im/ui/screens/wallet/send/views.cljs
View File

@ -152,7 +152,7 @@
(defn- render-send-transaction-view [{:keys [chain modal? transaction scroll advanced? keycard? signing-phrase all-tokens amount-input network-status]}] (defn- render-send-transaction-view [{:keys [chain modal? transaction scroll advanced? keycard? signing-phrase all-tokens amount-input network-status]}]
(let [{:keys [amount amount-text amount-error asset-error show-password-input? to to-name sufficient-funds? (let [{:keys [amount amount-text amount-error asset-error show-password-input? to to-name sufficient-funds?
sufficient-gas? in-progress? from-chat? symbol]} transaction sufficient-gas? in-progress? from-chat? asset symbol]} transaction
native-currency (tokens/native-currency chain) native-currency (tokens/native-currency chain)
{:keys [decimals] :as token} (tokens/asset-for all-tokens chain symbol) {:keys [decimals] :as token} (tokens/asset-for all-tokens chain symbol)
online? (= :online network-status)] online? (= :online network-status)]
@ -177,7 +177,7 @@
{:disabled? (or from-chat? modal? show-password-input?) {:disabled? (or from-chat? modal? show-password-input?)
:error asset-error :error asset-error
:type :send :type :send
:symbol symbol}] :symbol (or asset symbol)}]
[wallet.components/amount-selector [wallet.components/amount-selector
{:disabled? (or from-chat? modal? show-password-input?) {:disabled? (or from-chat? modal? show-password-input?)
:error (or amount-error :error (or amount-error