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

Don't autocorrect entered text (but still show error messages). 

Autocorrecting the text in the amount field leads to typos, like 11
instead of 1,0001, etc. We really want to avoid these types of typos for
amounts.

Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
This commit is contained in:
Igor Mandrigin 2018-05-23 10:19:37 +02:00
parent 84208aeb85
commit 502e8b9908
No known key found for this signature in database
GPG Key ID: 4A0EDDE26E66BC8B
3 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/status_im/ui/screens/wallet/components/views.cljs
View File

@ -20,6 +20,7 @@
[status-im.ui.screens.wallet.utils :as wallet.utils]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.tokens :as tokens]
[status-im.utils.money :as money]
[status-im.utils.platform :as platform]
[status-im.ui.components.tooltip.views :as tooltip]
[status-im.utils.utils :as utils]))
@ -184,18 +185,23 @@
[recipient-contact address name request?]
[recipient-address address])]])
(defn- amount-input [{:keys [input-options disabled?]}]
(defn- amount-input [{:keys [input-options amount amount-text disabled?]}]
[react/view {:style components.styles/flex
:accessibility-label :specify-amount-button}
[components/text-input
(merge
input-options
;; We only auto-correct and prettify user's input when it is valid and positive.
;; Otherwise, user might want to fix his input and autocorrection will give more harm than good.
;; Positive check is because we don't want to replace unfinished 0.000 with just plain 0, that is annoying and
;; potentially dangerous on this screen (e.g. sending 7 ETH instead of 0.0007)
{:default-value (if (empty? amount-text) (str (money/to-fixed (money/wei->ether amount))) amount-text)}
(if disabled?
{:editable false}
{:keyboard-type :numeric
:placeholder (i18n/label :t/amount-placeholder)
:style components.styles/flex
:accessibility-label :amount-input})
input-options)]])
:accessibility-label :amount-input}))]])
(defn amount-selector [{:keys [error disabled?] :as m}]
[react/view

13
src/status_im/ui/screens/wallet/request/views.cljs
View File

@ -19,7 +19,6 @@
[status-im.ui.screens.wallet.components.views :as components]
[status-im.utils.ethereum.core :as ethereum]
[status-im.utils.ethereum.eip681 :as eip681]
[status-im.utils.money :as money]
[status-im.utils.utils :as utils]))
;; Request screen
@ -42,17 +41,11 @@
[components/asset-selector {:disabled? true
:symbol :ETH}]
[components/amount-selector {:error amount-error
:amount amount
:amount-text amount-text
:input-options {:max-length 21
:on-focus (fn [] (when @scroll (utils/set-timeout #(.scrollToEnd @scroll) 100)))
:on-change-text #(re-frame/dispatch [:wallet.request/set-and-validate-amount %])
;; (similarly to status-im.ui.screens.wallet.send.views `send-transaction-panel`)
;; We only auto-correct and prettify user's input when it is valid and positive.
;; Otherwise, user might want to fix his input and autocorrection will give more harm than good.
;; Positive check is because we don't want to replace unfinished 0.000 with just plain 0, that is annoying and
;; potentially dangerous on this screen (e.g. sending 7 ETH instead of 0.0007)
:default-value (if (pos? amount)
(str (money/to-fixed (money/wei->ether amount)))
amount-text)}}]]]
:on-change-text #(re-frame/dispatch [:wallet.request/set-and-validate-amount %])}}]]]
[bottom-buttons/bottom-buttons styles/bottom-buttons
nil ;; Force a phantom button to ensure consistency with other transaction screens which define 2 buttons
[button/button {:disabled? (not (and to amount))

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

@ -192,12 +192,6 @@
(when advanced?
[advanced-cartouche transaction modal?])])
(defn update-amount-fn [timeout]
(fn [amount]
(when @timeout
(utils/clear-timeout @timeout))
(reset! timeout (utils/set-timeout #(re-frame/dispatch [:wallet.send/set-and-validate-amount amount]) 500))))
(defn- send-transaction-panel [{:keys [modal? transaction scroll advanced? symbol]}]
(let [{:keys [amount amount-text amount-error signing? to to-name sufficient-funds? in-progress? from-chat?]} transaction
timeout (atom nil)]
@ -221,17 +215,11 @@
[components/amount-selector {:disabled? (or from-chat? modal?)
:error (or amount-error
(when-not sufficient-funds? (i18n/label :t/wallet-insufficient-funds)))
:amount amount
:amount-text amount-text
:input-options {:max-length 21
:on-focus (fn [] (when (and scroll @scroll) (utils/set-timeout #(.scrollToEnd @scroll) 100)))
:on-change-text (update-amount-fn timeout)
;; (similarly to status-im.ui.screens.wallet.request.views `send-transaction-request` view)
;; We only auto-correct and prettify user's input when it is valid and positive.
;; Otherwise, user might want to fix his input and autocorrection will give more harm than good.
;; Positive check is because we don't want to replace unfinished 0.000 with just plain 0, that is annoying and
;; potentially dangerous on this screen (e.g. sending 7 ETH instead of 0.0007)
:default-value (if (pos? amount)
(str (money/to-fixed (money/wei->ether amount)))
amount-text)}}]
:on-change-text #(re-frame/dispatch [:wallet.send/set-and-validate-amount %])}}]
[advanced-options advanced? transaction modal? scroll]]]
(if signing?
[signing-buttons