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

bug #4590 - properly scrolling wallet send down when amount is focused and keyboard open 

Signed-off-by: Dmitry Novotochinov <dmitry.novot@gmail.com>
This commit is contained in:
Goran Jovic 2018-08-25 18:30:37 +02:00 committed by Dmitry Novotochinov
parent 8dc9af8917
commit 247bc75861
No known key found for this signature in database
GPG Key ID: 43D1DAF5AD39C927
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,9 @@
[status-im.utils.utils :as utils] [status-im.utils.utils :as utils]
[status-im.utils.ethereum.tokens :as tokens] [status-im.utils.ethereum.tokens :as tokens]
[status-im.utils.ethereum.core :as ethereum] [status-im.utils.ethereum.core :as ethereum]
[status-im.transport.utils :as transport.utils])) [status-im.transport.utils :as transport.utils]
[taoensso.timbre :as log]
[reagent.core :as reagent]))
(defn- toolbar [modal? title] (defn- toolbar [modal? title]
(let [action (if modal? act/close-white act/back-white)] (let [action (if modal? act/close-white act/back-white)]
@ -129,8 +131,7 @@
(i18n/label :t/transactions-sign-transaction) (i18n/label :t/transactions-sign-transaction)
[vector-icons/icon :icons/forward {:color (if sign-enabled? :white :gray)}]]])) [vector-icons/icon :icons/forward {:color (if sign-enabled? :white :gray)}]]]))
;; MAIN SEND TRANSACTION VIEW (defn- render-send-transaction-view [{:keys [modal? transaction scroll advanced? network amount-input]}]
(defn- send-transaction-view [{:keys [modal? transaction scroll advanced? network]}]
(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? symbol]} transaction
{:keys [decimals] :as token} (tokens/asset-for (ethereum/network->chain-keyword network) symbol)] {:keys [decimals] :as token} (tokens/asset-for (ethereum/network->chain-keyword network) symbol)]
@ -158,8 +159,8 @@
(when-not sufficient-gas? (i18n/label :t/wallet-insufficient-gas))) (when-not sufficient-gas? (i18n/label :t/wallet-insufficient-gas)))
:amount amount :amount amount
:amount-text amount-text :amount-text amount-text
:input-options {:on-focus (fn [] (when (and scroll @scroll) (utils/set-timeout #(.scrollToEnd @scroll) 100))) :input-options {:on-change-text #(re-frame/dispatch [:wallet.send/set-and-validate-amount % symbol decimals])
:on-change-text #(re-frame/dispatch [:wallet.send/set-and-validate-amount % symbol decimals])}} token] :ref (partial reset! amount-input)}} token]
[advanced-options advanced? transaction scroll]]] [advanced-options advanced? transaction scroll]]]
(if show-password-input? (if show-password-input?
[enter-password-buttons in-progress? [enter-password-buttons in-progress?
@ -171,6 +172,22 @@
[password-input-panel :t/signing-phrase-description in-progress?]) [password-input-panel :t/signing-phrase-description in-progress?])
(when in-progress? [react/view styles/processing-view])]])) (when in-progress? [react/view styles/processing-view])]]))
;; MAIN SEND TRANSACTION VIEW
(defn- send-transaction-view [{:keys [scroll] :as opts}]
(let [amount-input (atom nil)
handler (fn [_]
(when (and scroll @scroll @amount-input
(.isFocused @amount-input))
(log/debug "Amount field focused, scrolling down")
(.scrollToEnd @scroll)))]
(reagent/create-class
{:component-will-mount (fn [_]
;;NOTE(goranjovic): keyboardDidShow is for android and keyboardWillShow for ios
(.addListener react/keyboard "keyboardDidShow" handler)
(.addListener react/keyboard "keyboardWillShow" handler))
:reagent-render (fn [opts] (render-send-transaction-view
(assoc opts :amount-input amount-input)))})))
;; SEND TRANSACTION FROM WALLET (CHAT) ;; SEND TRANSACTION FROM WALLET (CHAT)
(defview send-transaction [] (defview send-transaction []
(letsubs [transaction [:wallet.send/transaction] (letsubs [transaction [:wallet.send/transaction]