Merge pull request #247 from internxt/bugfix/fix-numeric-pad

[_] bugfix/Fix android numerical pad issue
internxt · Dec 24, 2024 · 91f872b · 91f872b
2 parents b1fe992 + f81751d
commit 91f872b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -88,8 +88,8 @@ android {
         applicationId 'com.internxt.cloud'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 99
-        versionName "1.6.0"
+        versionCode 100
+        versionName "1.6.1"
 
         buildConfigField("boolean", "REACT_NATIVE_UNSTABLE_USE_RUNTIME_SCHEDULER_ALWAYS", (findProperty("reactNative.unstable_useRuntimeSchedulerAlways") ?: true).toString())
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "drive-mobile",
-  "version": "v1.6.0",
+  "version": "v1.6.1",
   "private": true,
   "license": "GNU",
   "scripts": {

diff --git a/src/components/AppTextInput/index.tsx b/src/components/AppTextInput/index.tsx
@@ -22,6 +22,7 @@ export interface AppTextInputProps extends TextInputProps {
   label?: string;
   renderAppend?: ({ isFocused }: { isFocused: boolean }) => JSX.Element | undefined;
   inputRef?: React.LegacyRef<TextInput>;
+  disableCustomAndroidCursor?: boolean;
 }
 
 const AppTextInput = (props: AppTextInputProps): JSX.Element => {
@@ -110,7 +111,7 @@ const AppTextInput = (props: AppTextInputProps): JSX.Element => {
   const inputProps = {
     ...props,
     ref: props.inputRef || localInputRef,
-    onChangeText: isAndroid ? handleChangeText : props.onChangeText,
+    onChangeText: isAndroid && !props.disableCustomAndroidCursor ? handleChangeText : props.onChangeText,
     onSelectionChange: isAndroid ? handleSelectionChange : props.onSelectionChange,
     selection: isAndroid ? selection : props.selection,
   };

diff --git a/src/components/CodeInput/index.tsx b/src/components/CodeInput/index.tsx
@@ -52,6 +52,7 @@ const CodeInput = (props: CodeInputProps) => {
           onChangeText={onDigitChangeText}
           onKeyPress={onDigitKeyPressed}
           keyboardType="numeric"
+          disableCustomAndroidCursor
         />
       );
     });

diff --git a/src/screens/SignInScreen/index.tsx b/src/screens/SignInScreen/index.tsx
@@ -1,5 +1,5 @@
 import { Eye, EyeSlash, WarningCircle } from 'phosphor-react-native';
-import React, { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { Animated, TextInput, View } from 'react-native';
 
 import { useKeyboard } from '@internxt-mobile/hooks/useKeyboard';
@@ -212,6 +212,7 @@ function SignInScreen({ navigation }: RootStackScreenProps<'SignIn'>): JSX.Eleme
               keyboardType="decimal-pad"
               status={failed2FA ? ['error', renderErrorMessage()] : undefined}
               onChangeText={setTwoFactorCode}
+              disableCustomAndroidCursor
             />
           </Animated.View>