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

[#3325]: Transaction fee field is hidden behind keyboard if Amount field had focus 

Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
This commit is contained in:
alwxndr 2018-03-12 14:31:55 +01:00 committed by Julien Eluard
parent cad3770b48
commit 1b5b6e33b4
No known key found for this signature in database
GPG Key ID: 6FD7DB5437FCBEF6
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/status_im/ui/screens/wallet/send/styles.cljs
View File

@ -60,9 +60,6 @@
:margin-top 22 :margin-top 22
:margin-horizontal 92}) :margin-horizontal 92})
(def advanced-cartouche
{:padding-bottom 50})
(def advanced-button (def advanced-button
{:flex-direction :row {:flex-direction :row
:background-color styles/color-blue6 :background-color styles/color-blue6

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

@ -149,8 +149,9 @@
(i18n/label :t/done)]]]]))) (i18n/label :t/done)]]]])))
(defn- advanced-cartouche [{:keys [gas gas-price]} modal?] (defn- advanced-cartouche [{:keys [gas gas-price]} modal?]
[react/view styles/advanced-cartouche [react/view
[wallet.components/cartouche {:disabled? modal? :on-press #(do (re-frame/dispatch [:wallet.send/clear-gas]) [wallet.components/cartouche {:disabled? modal?
:on-press #(do (re-frame/dispatch [:wallet.send/clear-gas])
(re-frame/dispatch [:navigate-to-modal :wallet-transaction-fee]))} (re-frame/dispatch [:navigate-to-modal :wallet-transaction-fee]))}
(i18n/label :t/wallet-transaction-fee) (i18n/label :t/wallet-transaction-fee)
[react/view styles/advanced-options-text-wrapper [react/view styles/advanced-options-text-wrapper
@ -178,7 +179,11 @@
(i18n/label :t/send-transaction)] (i18n/label :t/send-transaction)]
[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 (merge {:keyboardShouldPersistTaps :always} (when-not modal? {:ref #(reset! scroll %)})) [react/scroll-view (merge {:keyboard-should-persist-taps :always
:on-content-size-change #(when @scroll
(.scrollToEnd @scroll))}
(when-not modal?
{:ref #(reset! scroll %)}))
[react/view styles/send-transaction-form [react/view styles/send-transaction-form
[components/recipient-selector {:disabled? modal? [components/recipient-selector {:disabled? modal?
:address to :address to