From a778e1f76191aea7c1a18d60a23ffbd6d3dec0eb Mon Sep 17 00:00:00 2001
From: Avinash Lingaloo <avinashlng1080@gmail.com>
Date: Tue, 30 Nov 2021 14:46:21 +0400
Subject: [PATCH] ts fixes

---
 app/components/error_text/index.tsx           |  2 +-
 .../floating_text_input_label/index.tsx       |  4 +++-
 .../edit_profile/components/email_field.tsx   |  3 ++-
 app/screens/edit_profile/components/field.tsx |  2 +-
 .../components/field_description.tsx          |  2 +-
 app/screens/edit_profile/edit_profile.tsx     |  5 ++---
 package-lock.json                             | 20 -------------------
 types/utils/index.d.ts                        |  1 +
 8 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/app/components/error_text/index.tsx b/app/components/error_text/index.tsx
index 2db198ec84..647f0a7276 100644
--- a/app/components/error_text/index.tsx
+++ b/app/components/error_text/index.tsx
@@ -8,7 +8,7 @@ import FormattedText from '@components/formatted_text';
 import {makeStyleSheetFromTheme} from '@utils/theme';
 
 type ErrorProps = {
-    error: Partial<ClientErrorProps> | string;
+    error: ErrorText;
     testID?: string;
     textStyle?: StyleProp<ViewStyle> | StyleProp<TextStyle>;
     theme: Theme;
diff --git a/app/components/floating_text_input_label/index.tsx b/app/components/floating_text_input_label/index.tsx
index 4c11bdce30..e5a0bc7117 100644
--- a/app/components/floating_text_input_label/index.tsx
+++ b/app/components/floating_text_input_label/index.tsx
@@ -240,7 +240,6 @@ const FloatingTextInput = forwardRef<FloatingTextInputRef, FloatingTextInputProp
                     </Animated.Text>
                 }
                 <TextInput
-                    {...props}
                     editable={isKeyboardInput && editable}
                     style={combinedTextInputStyle}
                     placeholder=''
@@ -251,6 +250,9 @@ const FloatingTextInput = forwardRef<FloatingTextInputRef, FloatingTextInputProp
                     onBlur={onTextInputBlur}
                     ref={inputRef}
                     underlineColorAndroid='transparent'
+                    autoCorrect={false}
+                    autoCapitalize={'none'}
+                    {...props}
                 />
                 {Boolean(error) && (
                     <View style={styles.errorContainer}>
diff --git a/app/screens/edit_profile/components/email_field.tsx b/app/screens/edit_profile/components/email_field.tsx
index 4343fcbb18..2a27a3ef85 100644
--- a/app/screens/edit_profile/components/email_field.tsx
+++ b/app/screens/edit_profile/components/email_field.tsx
@@ -64,13 +64,14 @@ const EmailField = ({authService, email, onChange}: EmailSettingsProps) => {
 
     return (
         <Field
-            fieldDescription={helpText ?? ''}
+            fieldDescription={helpText}
             id='email'
             isDisabled={true}
             label={FIELDS.email}
             onChange={onChange}
             testID='edit_profile.text_setting.email'
             value={email}
+            keyboardType='email-address'
         />
     );
 };
diff --git a/app/screens/edit_profile/components/field.tsx b/app/screens/edit_profile/components/field.tsx
index ca384d4975..a6c1331efb 100644
--- a/app/screens/edit_profile/components/field.tsx
+++ b/app/screens/edit_profile/components/field.tsx
@@ -80,7 +80,7 @@ const Field = ({
                     theme={theme}
                     value={value}
                 />
-                {isDisabled && (
+                {isDisabled && fieldDescription && (
                     <FieldDescription
                         text={fieldDescription}
                     />
diff --git a/app/screens/edit_profile/components/field_description.tsx b/app/screens/edit_profile/components/field_description.tsx
index 406a646249..4577abed08 100644
--- a/app/screens/edit_profile/components/field_description.tsx
+++ b/app/screens/edit_profile/components/field_description.tsx
@@ -9,7 +9,7 @@ import {useTheme} from '@context/theme';
 import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
 
 type HelpContentProps = {
-    text?: string;
+    text: string;
 };
 
 const Description = ({text}: HelpContentProps) => {
diff --git a/app/screens/edit_profile/edit_profile.tsx b/app/screens/edit_profile/edit_profile.tsx
index 7616d0ecbd..ca82a3dd51 100644
--- a/app/screens/edit_profile/edit_profile.tsx
+++ b/app/screens/edit_profile/edit_profile.tsx
@@ -84,7 +84,7 @@ const EditProfile = ({
         username: currentUser.username,
     });
     const [canSave, setCanSave] = useState(false);
-    const [error, setError] = useState<string | undefined>();
+    const [error, setError] = useState<ErrorText | undefined>();
 
     const [profileImage] = useState<undefined>();
 
@@ -180,7 +180,6 @@ const EditProfile = ({
         } catch (e) {
             resetScreen(e as Error);
         }
-
     };
 
     const resetScreen = (resetError: Error) => {
@@ -242,7 +241,7 @@ const EditProfile = ({
                     innerRef={setScrollViewRef}
                     testID='edit_profile.scroll_view'
                 >
-                    {Boolean(error) && <ProfileError error={error}/>}
+                    {Boolean(error) && <ProfileError error={error!}/>}
                     {renderProfilePicture()}
                     <Field
                         id='firstName'
diff --git a/package-lock.json b/package-lock.json
index 1964d14fba..65bd76f75b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -110,7 +110,6 @@
         "@types/jest": "27.0.3",
         "@types/lodash": "4.14.177",
         "@types/react": "17.0.37",
-        "@types/react-intl": "3.0.0",
         "@types/react-native": "0.66.6",
         "@types/react-native-button": "3.0.1",
         "@types/react-native-share": "3.3.3",
@@ -5585,16 +5584,6 @@
         "csstype": "^3.0.2"
       }
     },
-    "node_modules/@types/react-intl": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/react-intl/-/react-intl-3.0.0.tgz",
-      "integrity": "sha512-k8F3d05XQGEqSWIfK97bBjZe4z9RruXU9Wa7OZ2iUC5pdeIpzuQDZe/9C2J3Xir5//ZtAkhcv08Wfx3n5TBTQg==",
-      "deprecated": "This is a stub types definition. react-intl provides its own type definitions, so you do not need this installed.",
-      "dev": true,
-      "dependencies": {
-        "react-intl": "*"
-      }
-    },
     "node_modules/@types/react-native": {
       "version": "0.66.6",
       "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.66.6.tgz",
@@ -28713,15 +28702,6 @@
         "csstype": "^3.0.2"
       }
     },
-    "@types/react-intl": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/react-intl/-/react-intl-3.0.0.tgz",
-      "integrity": "sha512-k8F3d05XQGEqSWIfK97bBjZe4z9RruXU9Wa7OZ2iUC5pdeIpzuQDZe/9C2J3Xir5//ZtAkhcv08Wfx3n5TBTQg==",
-      "dev": true,
-      "requires": {
-        "react-intl": "*"
-      }
-    },
     "@types/react-native": {
       "version": "0.66.6",
       "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.66.6.tgz",
diff --git a/types/utils/index.d.ts b/types/utils/index.d.ts
index e1ec4725fe..3e7c478115 100644
--- a/types/utils/index.d.ts
+++ b/types/utils/index.d.ts
@@ -5,3 +5,4 @@ type Dictionary<T> = {
     [key: string]: T;
 };
 
+type ErrorText = Partial<ClientErrorProps> | string;