add lastCommaToDot for european decimal seperator

terra-classic-money · Apr 4, 2022 · a6f6cc2 · a6f6cc2
1 parent 2751117
commit a6f6cc2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/components/UseStationFormField.tsx b/src/components/UseStationFormField.tsx
@@ -88,6 +88,9 @@ const FormInput = ({ field }: { field: Field }): ReactElement => {
   const onChangeText = (text: string): void => {
     let value = text
     if (field.attrs.type === 'number') {
+      if (text.charAt(text.length - 1) === ',') {
+        text = UTIL.lastCommaToDot(text)
+      }
       const onlyNumber = UTIL.delComma(text)
       const bn = new BigNumber(onlyNumber).dp(6, BigNumber.ROUND_DOWN)
       if (bn.isNaN()) {

diff --git a/src/consts/util.ts b/src/consts/util.ts
@@ -41,6 +41,10 @@ const delComma = (str: string | number): string => {
   return _.toString(str).replace(/,/g, '')
 }
 
+const lastCommaToDot = (str: string | number): string => {
+  return _.toString(str).replace(/,\s*$/, '.')
+}
+
 const extractNumber = (str: string): string => str.replace(/\D+/g, '')
 
 const isNativeTerra = (str: string): boolean =>
@@ -179,6 +183,7 @@ export default {
   jsonTryStringify,
   setComma,
   delComma,
+  lastCommaToDot,
   extractNumber,
   isNativeTerra,
   isNativeDenom,

diff --git a/src/screens/TabSwap/SelectInputForm.tsx b/src/screens/TabSwap/SelectInputForm.tsx
@@ -10,7 +10,7 @@ import {
 import _ from 'lodash'
 import { useNavigation } from '@react-navigation/core'
 
-import { COLOR, LAYOUT } from 'consts'
+import { COLOR, LAYOUT, UTIL } from 'consts'
 
 import { Field, Option, Options } from 'lib'
 
@@ -119,6 +119,13 @@ const SelectInputForm = ({
   const error = inputError || selectError
   const isCoinSelected = _.some(selectField.attrs.value)
 
+  const handleOnChange = (value: string) => {
+    if (value.charAt(value.length - 1) === ',') {
+      value = UTIL.lastCommaToDot(value)
+    }
+    inputField.setValue?.(value)
+  }
+
   return (
     <View
       style={{
@@ -148,7 +155,7 @@ const SelectInputForm = ({
             defaultValue={inputField.attrs.defaultValue}
             editable={!disabled && !inputField.attrs.readOnly}
             placeholder={inputField.attrs.placeholder}
-            onChangeText={inputField.setValue}
+            onChangeText={handleOnChange}
             containerStyle={{
               flex: 2,
               borderWidth: 0,