Merge pull request #1806 from ever-co/develop

Release

apps/extensions/package.json

@@ -29,6 +29,32 @@
 		"postcss": "^8.4.19",
 		"prettier": "^2.8.0",
 		"typescript": "4.8.4"
+	},"prettier": {
+		"printWidth": 120,
+		"singleQuote": true,
+		"semi": true,
+		"useTabs": true,
+		"tabWidth": 4,
+		"arrowParens": "always",
+		"trailingComma": "none",
+		"quoteProps": "as-needed",
+		"trimTrailingWhitespace": true,
+		"overrides": [
+			{
+				"files": "*.scss",
+				"options": {
+					"useTabs": false,
+					"tabWidth": 2
+				}
+			},
+			{
+				"files": "*.yml",
+				"options": {
+					"useTabs": false,
+					"tabWidth": 2
+				}
+			}
+		]
 	},
 	"manifest": {
 		"host_permissions": [

apps/mobile/android/app/build.gradle

@@ -118,7 +118,7 @@ android {
         applicationId 'ever.team'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 9
+        versionCode 10
         versionName "0.1.0"
     }
 

apps/mobile/app.json

@@ -28,7 +28,17 @@
 					"isAccessMediaLocationEnabled": true
 				}
 			],
-			"sentry-expo"
+			"sentry-expo",
+			[
+				"expo-build-properties",
+				{
+					"android": {
+						"enableProguardInReleaseBuilds": true,
+						"extraProguardRules": "-keep public class com.horcrux.svg.** {*;}",
+						"allowBackup": false
+					}
+				}
+			]
 		],
 		"android": {
 			"icon": "./assets/images/app-icon-android-legacy-ever-teams.png",

apps/mobile/app/components/CodeInput.tsx

@@ -10,11 +10,10 @@ interface IInput {
 	editable: boolean;
 	length?: number;
 	defaultValue?: string;
-	loginInput?: boolean;
 }
 
 export const CodeInput: FC<IInput> = (props) => {
-	const { onChange, editable, length = 6, defaultValue, loginInput = false } = props;
+	const { onChange, editable, length = 6, defaultValue } = props;
 	const { colors } = useAppTheme();
 	const inputsRef = useRef<TextInput[] | null[]>([]);
 	const [active, setActive] = useState<number>(0);
@@ -102,19 +101,12 @@ export const CodeInput: FC<IInput> = (props) => {
 				style={[
 					styles.inputStyle,
 					{
-						backgroundColor: loginInput ? '#FFFFFF' : colors.background,
-						color: loginInput ? '#282048' : colors.primary
+						backgroundColor: colors.background,
+						color: colors.primary
 					},
 					editable
 						? {
-								borderColor:
-									active === i
-										? loginInput
-											? '#282048'
-											: colors.primary
-										: loginInput
-										? '#00000021'
-										: colors.border
+								borderColor: active === i ? colors.primary : colors.border
 						  }
 						: null
 				]}

apps/mobile/app/components/TextField.tsx

@@ -1,7 +1,7 @@
 import React, { ComponentType, forwardRef, Ref, useImperativeHandle, useRef } from 'react';
 import { StyleProp, TextInput, TextInputProps, TextStyle, TouchableOpacity, View, ViewStyle } from 'react-native';
 import { isRTL, translate } from '../i18n';
-import { colors, spacing, typography } from '../theme';
+import { colors, spacing, typography, useAppTheme } from '../theme';
 import { Text, TextProps } from './Text';
 
 export interface TextFieldAccessoryProps {
@@ -152,6 +152,8 @@ export const TextField = forwardRef(function TextField(props: TextFieldProps, re
 
 	useImperativeHandle(ref, () => input.current);
 
+	const { colors: appThemeColors, dark } = useAppTheme();
+
 	return (
 		<TouchableOpacity
 			activeOpacity={1}
@@ -188,7 +190,7 @@ export const TextField = forwardRef(function TextField(props: TextFieldProps, re
 					placeholderTextColor={colors.textDim}
 					{...TextInputProps}
 					editable={!disabled}
-					style={$inputStyles}
+					style={[$inputStyles, { color: dark ? appThemeColors.primary : colors.text }]}
 				/>
 
 				{!!RightAccessory && (
@@ -244,7 +246,8 @@ const $inputStyle: TextStyle = {
 };
 
 const $helperStyle: TextStyle = {
-	marginTop: spacing.extraSmall
+	marginTop: spacing.extraSmall,
+	fontSize: 12
 };
 
 const $rightAccessoryStyle: ViewStyle = {

apps/mobile/app/config/config.dev.ts

@@ -1,3 +1,3 @@
 export default {
-	API_URL: 'https://apistage.gauzy.co/api'
-};
+	API_URL: "https://apistage.gauzy.co/api",
+}

apps/mobile/app/config/config.prod.ts

@@ -6,8 +6,6 @@
  * https://reactnative.dev/docs/security#storing-sensitive-info
  */
 
-import { GAUZY_API_URL } from '@env';
-
 export default {
-	API_URL: `${GAUZY_API_URL}/api`
-};
+	API_URL: `${process.env.GAUZY_API_URL}/api`,
+}

apps/mobile/app/models/AuthenticationStore.ts

@@ -26,17 +26,17 @@ export const AuthenticationStoreModel = types
 		get validationErrors() {
 			return {
 				authEmail: (function () {
-					if (store.authEmail.length === 0) return "This filed can't be blank";
+					if (store.authEmail.length === 0) return "This field can't be blank";
 					if (store.authEmail.length < 6) return 'Must be at least 6 characters';
 					if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(store.authEmail)) return 'Must be a valid email address';
 					return '';
 				})(),
 				authTeamName: (function () {
-					if (store.authTeamName.length === 0) return "This filed can't be blank";
+					if (store.authTeamName.length === 0) return "This field can't be blank";
 					return '';
 				})(),
 				authUsername: (function () {
-					if (store.authUsername.length === 0) return "This filed can't be blank";
+					if (store.authUsername.length === 0) return "This field can't be blank";
 					return '';
 				})()
 			};