status-im/status-mobile
2
0
Fork 0
mirror of https://github.com/status-im/status-mobile.git synced 2025-02-11 16:17:13 +00:00
Code Issues Projects Releases Wiki Activity

fixed sign message text [#4529]

Browse Source
This commit is contained in:
Andrey Shovkoplyas 2018-05-30 14:08:55 +03:00 committed by Roman Volosovskyi
parent a2762eb19e
commit 7711dc51ad
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,11 +36,11 @@
[:wallet/sign-transaction true])))) [:wallet/sign-transaction true]))))
(defview sign-panel [message?] (defview sign-panel [message?]
(letsubs [account [:get-current-account] (letsubs [account [:get-current-account]
wrong-password? [:wallet.send/wrong-password?] wrong-password? [:wallet.send/wrong-password?]
signing-phrase (:signing-phrase @account) signing-phrase (:signing-phrase @account)
bottom-value (animation/create-value -250) bottom-value (animation/create-value -250)
opacity-value (animation/create-value 0)] opacity-value (animation/create-value 0)]
{:component-did-mount #(send.animations/animate-sign-panel opacity-value bottom-value)} {:component-did-mount #(send.animations/animate-sign-panel opacity-value bottom-value)}
[react/animated-view {:style (styles/animated-sign-panel bottom-value)} [react/animated-view {:style (styles/animated-sign-panel bottom-value)}
[react/animated-view {:style (styles/sign-panel opacity-value)} [react/animated-view {:style (styles/sign-panel opacity-value)}
@ -117,8 +117,8 @@
(defview transaction-fee [] (defview transaction-fee []
(letsubs [{:keys [amount symbol] :as transaction} [:wallet.send/transaction] (letsubs [{:keys [amount symbol] :as transaction} [:wallet.send/transaction]
network [:get-current-account-network] network [:get-current-account-network]
edit [:wallet/edit]] edit [:wallet/edit]]
(let [gas (or (:gas edit) (:gas transaction)) (let [gas (or (:gas edit) (:gas transaction))
gas-price (or (:gas-price edit) (:gas-price transaction)) gas-price (or (:gas-price edit) (:gas-price transaction))
{:keys [decimals]} (tokens/asset-for (ethereum/network->chain-keyword network) symbol)] {:keys [decimals]} (tokens/asset-for (ethereum/network->chain-keyword network) symbol)]
[wallet.components/simple-screen {:status-toolbar-type :modal-wallet} [wallet.components/simple-screen {:status-toolbar-type :modal-wallet}
@ -208,9 +208,9 @@
[react/view components.styles/flex [react/view components.styles/flex
[common/network-info {:text-color :white}] [common/network-info {:text-color :white}]
[react/scroll-view {:keyboard-should-persist-taps :always [react/scroll-view {:keyboard-should-persist-taps :always
:ref #(reset! scroll %) :ref #(reset! scroll %)
:on-content-size-change #(when (and (not modal?) scroll @scroll) :on-content-size-change #(when (and (not modal?) scroll @scroll)
(.scrollToEnd @scroll))} (.scrollToEnd @scroll))}
[react/view styles/send-transaction-form [react/view styles/send-transaction-form
[components/recipient-selector {:disabled? (or from-chat? modal?) [components/recipient-selector {:disabled? (or from-chat? modal?)
:address to :address to
@ -222,8 +222,8 @@
[components/amount-selector {:disabled? (or from-chat? modal?) [components/amount-selector {:disabled? (or from-chat? modal?)
:error (or amount-error :error (or amount-error
(when-not sufficient-funds? (i18n/label :t/wallet-insufficient-funds))) (when-not sufficient-funds? (i18n/label :t/wallet-insufficient-funds)))
:amount amount :amount amount
:amount-text amount-text :amount-text amount-text
:input-options {:max-length 21 :input-options {:max-length 21
:on-focus (fn [] (when (and scroll @scroll) (utils/set-timeout #(.scrollToEnd @scroll) 100))) :on-focus (fn [] (when (and scroll @scroll) (utils/set-timeout #(.scrollToEnd @scroll) 100)))
:on-change-text #(re-frame/dispatch [:wallet.send/set-and-validate-amount % symbol decimals])}} token] :on-change-text #(re-frame/dispatch [:wallet.send/set-and-validate-amount % symbol decimals])}} token]
@ -249,22 +249,22 @@
(defview send-transaction [] (defview send-transaction []
(letsubs [transaction [:wallet.send/transaction] (letsubs [transaction [:wallet.send/transaction]
symbol [:wallet.send/symbol] symbol [:wallet.send/symbol]
advanced? [:wallet.send/advanced?] advanced? [:wallet.send/advanced?]
network [:get-current-account-network] network [:get-current-account-network]
scroll (atom nil)] scroll (atom nil)]
[send-transaction-panel {:modal? false :transaction transaction :scroll scroll :advanced? advanced? [send-transaction-panel {:modal? false :transaction transaction :scroll scroll :advanced? advanced?
:symbol symbol :network network}])) :symbol symbol :network network}]))
(defview send-transaction-modal [] (defview send-transaction-modal []
(letsubs [transaction [:wallet.send/unsigned-transaction] (letsubs [transaction [:wallet.send/unsigned-transaction]
symbol [:wallet.send/symbol] symbol [:wallet.send/symbol]
advanced? [:wallet.send/advanced?] advanced? [:wallet.send/advanced?]
network [:get-current-account-network] network [:get-current-account-network]
scroll (atom nil)] scroll (atom nil)]
(if transaction (if transaction
[send-transaction-panel {:modal? true :transaction transaction :scroll scroll :advanced? advanced? [send-transaction-panel {:modal? true :transaction transaction :scroll scroll :advanced? advanced?
symbol symbol :network network}] symbol symbol :network network}]
[react/view wallet.styles/wallet-modal-container [react/view wallet.styles/wallet-modal-container
[react/view components.styles/flex [react/view components.styles/flex
[status-bar/status-bar {:type :modal-wallet}] [status-bar/status-bar {:type :modal-wallet}]
@ -282,9 +282,11 @@
[react/view styles/send-transaction-form [react/view styles/send-transaction-form
[wallet.components/cartouche {:disabled? true} [wallet.components/cartouche {:disabled? true}
(i18n/label :t/message) (i18n/label :t/message)
[components/amount-input {:disabled? true [components/amount-input
:input-options {:multiline true {:disabled? true
:default-value data}} nil]]]] :input-options {:multiline true}
:amount-text data}
nil]]]]
[signing-buttons [signing-buttons
#(re-frame/dispatch [:wallet/discard-transaction-navigate-back]) #(re-frame/dispatch [:wallet/discard-transaction-navigate-back])
#(re-frame/dispatch [:wallet/sign-transaction-modal]) #(re-frame/dispatch [:wallet/sign-transaction-modal])