Merge pull request #1898 from ever-co/bug/fixing-remaining-and-operat…

…or-issues Bug/fixing remaining and operator issues
ever-co · Nov 29, 2023 · 3427eba · 3427eba
2 parents f9977e0 + 0e07380
commit 3427eba
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 21 deletions.
diff --git a/apps/mobile/app/components/Task/EstimateBlock/components/ProfileInfoWithTime.tsx b/apps/mobile/app/components/Task/EstimateBlock/components/ProfileInfoWithTime.tsx
@@ -35,7 +35,7 @@ const ProfileInfoWithTime: React.FC<IProfileInfo> = ({ profilePicSrc, names, use
 			style={{
 				flexDirection: 'row',
 				justifyContent: 'space-between',
-				paddingRight: !time && 12
+				paddingRight: !time ? 12 : undefined
 			}}
 		>
 			<TouchableOpacity onPress={userId && navigateToProfile} style={styles.container}>

diff --git a/apps/mobile/app/i18n/ar.ts b/apps/mobile/app/i18n/ar.ts
@@ -66,7 +66,9 @@ const ar: Translations = {
 		userNameFieldPlaceholder: 'أدخل أسمك',
 		tapContinue: 'يكمل',
 		tapJoin: 'ينضم',
-		createTeam: 'إنشاء فريق'
+		createTeam: 'إنشاء فريق',
+		invalidConfirmCode: 'رمز التأكيد غير صالح',
+		securityCodeSent: 'تم إرسال رمز الأمان على البريد الإلكتروني الجديد'
 	},
 	myWorkScreen: {
 		name: 'عمل',

diff --git a/apps/mobile/app/i18n/bg.ts b/apps/mobile/app/i18n/bg.ts
@@ -63,7 +63,9 @@ const bg = {
 		userNameFieldPlaceholder: 'Enter your name',
 		tapContinue: 'Continue',
 		tapJoin: 'Join',
-		createTeam: 'Create Team'
+		createTeam: 'Create Team',
+		invalidConfirmCode: 'Invalid confirm code',
+		securityCodeSent: 'Security code was sent on new email'
 	},
 	myWorkScreen: {
 		name: 'Work',

diff --git a/apps/mobile/app/i18n/en.ts b/apps/mobile/app/i18n/en.ts
@@ -63,7 +63,9 @@ const en = {
 		userNameFieldPlaceholder: 'Enter your name',
 		tapContinue: 'Continue',
 		tapJoin: 'Join',
-		createTeam: 'Create Team'
+		createTeam: 'Create Team',
+		invalidConfirmCode: 'Invalid confirm code',
+		securityCodeSent: 'Security code was sent on new email'
 	},
 	myWorkScreen: {
 		name: 'Work',

diff --git a/apps/mobile/app/i18n/es.ts b/apps/mobile/app/i18n/es.ts
@@ -63,7 +63,9 @@ const es = {
 		userNameFieldPlaceholder: 'Enter your name',
 		tapContinue: 'Continue',
 		tapJoin: 'Join',
-		createTeam: 'Create Team'
+		createTeam: 'Create Team',
+		invalidConfirmCode: 'Invalid confirm code',
+		securityCodeSent: 'Security code was sent on new email'
 	},
 	myWorkScreen: {
 		name: 'Work',

diff --git a/apps/mobile/app/i18n/fr.ts b/apps/mobile/app/i18n/fr.ts
@@ -63,7 +63,9 @@ const fr = {
 		userNameFieldPlaceholder: 'Entrez votre nom',
 		tapContinue: 'Continuer',
 		tapJoin: 'Rejoindre',
-		createTeam: "Créer l'équipe"
+		createTeam: "Créer l'équipe",
+		invalidConfirmCode: 'Code de confirmation invalide',
+		securityCodeSent: 'Le code de sécurité a été envoyé sur le nouvel e-mail'
 	},
 	myWorkScreen: {
 		name: 'Travail',

diff --git a/apps/mobile/app/i18n/he.ts b/apps/mobile/app/i18n/he.ts
@@ -63,7 +63,9 @@ const he = {
 		userNameFieldPlaceholder: 'Enter your name',
 		tapContinue: 'Continue',
 		tapJoin: 'Join',
-		createTeam: 'Create Team'
+		createTeam: 'Create Team',
+		invalidConfirmCode: 'Invalid confirm code',
+		securityCodeSent: 'Security code was sent on new email'
 	},
 	myWorkScreen: {
 		name: 'Work',

diff --git a/apps/mobile/app/i18n/ko.ts b/apps/mobile/app/i18n/ko.ts
@@ -65,7 +65,9 @@ const ko: Translations = {
 		userNameFieldPlaceholder: '당신의 이름을 입력',
 		tapContinue: '계속하다',
 		tapJoin: '가입하다',
-		createTeam: 'Create Team'
+		createTeam: 'Create Team',
+		invalidConfirmCode: '잘못된 확인 코드',
+		securityCodeSent: '보안 코드가 새 이메일로 전송되었습니다'
 	},
 	myWorkScreen: {
 		name: '일하다',

diff --git a/apps/mobile/app/i18n/ru.ts b/apps/mobile/app/i18n/ru.ts
@@ -63,7 +63,9 @@ const ru = {
 		userNameFieldPlaceholder: 'Enter your name',
 		tapContinue: 'Continue',
 		tapJoin: 'Join',
-		createTeam: 'Create Team'
+		createTeam: 'Create Team',
+		invalidConfirmCode: 'Invalid confirm code',
+		securityCodeSent: 'Security code was sent on new email'
 	},
 	myWorkScreen: {
 		name: 'Work',

diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskLabelFilter.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskLabelFilter.tsx
@@ -253,9 +253,9 @@ const styles = StyleSheet.create({
 	dropdownItem: {
 		alignItems: 'center',
 		borderRadius: 10,
-		elevation: 10,
 		flexDirection: 'row',
 		height: 44,
+		overflow: 'hidden',
 		paddingHorizontal: 16,
 		width: '60%'
 	},

diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskPriorityFilter.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskPriorityFilter.tsx
@@ -256,9 +256,9 @@ const styles = StyleSheet.create({
 	dropdownItem: {
 		alignItems: 'center',
 		borderRadius: 10,
-		elevation: 10,
 		flexDirection: 'row',
 		height: 44,
+		overflow: 'hidden',
 		paddingHorizontal: 16,
 		width: '60%'
 	},

diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskSizeFilter.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskSizeFilter.tsx
@@ -253,9 +253,9 @@ const styles = StyleSheet.create({
 	dropdownItem: {
 		alignItems: 'center',
 		borderRadius: 10,
-		elevation: 10,
 		flexDirection: 'row',
 		height: 44,
+		overflow: 'hidden',
 		paddingHorizontal: 16,
 		width: '60%'
 	},

diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskStatusFilter.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskStatusFilter.tsx
@@ -249,9 +249,9 @@ const styles = StyleSheet.create({
 	dropdownItem: {
 		alignItems: 'center',
 		borderRadius: 10,
-		elevation: 10,
 		flexDirection: 'row',
 		height: 44,
+		overflow: 'hidden',
 		paddingHorizontal: 16,
 		width: '60%'
 	},

diff --git a/apps/mobile/app/screens/Authenticated/SettingScreen/components/ConfirmEmailPopup.tsx b/apps/mobile/app/screens/Authenticated/SettingScreen/components/ConfirmEmailPopup.tsx
@@ -86,10 +86,12 @@ const ConfirmEmailPopup: FC<Props> = function ConfirmEmailPopup({ visible, onDis
 	return (
 		<ModalPopUp visible={visible}>
 			<View style={{ ...styles.container, backgroundColor: colors.background }}>
-				<Text style={{ ...styles.title, color: colors.primary }}>Security Code</Text>
+				<Text style={{ ...styles.title, color: colors.primary }}>
+					{translate('loginScreen.inviteCodeFieldLabel')}
+				</Text>
 				<CodeInput onChange={setConfirmCode} editable={true} />
-				{error && <Text style={styles.errorText}>Invalid confirm code</Text>}
-				<Text style={{ ...styles.text, marginTop: 10 }}>Security code was sent on new email</Text>
+				{error && <Text style={styles.errorText}>{translate('loginScreen.invalidConfirmCode')}</Text>}
+				<Text style={{ ...styles.text, marginTop: 10 }}>{translate('loginScreen.securityCodeSent')}</Text>
 				<View style={styles.wrapResendText}>
 					<Text style={styles.text}>
 						{translate('loginScreen.codeNotReceived') + ' '}

diff --git a/apps/mobile/app/screens/LoginScreen/Components/EmailVerificationForm.tsx b/apps/mobile/app/screens/LoginScreen/Components/EmailVerificationForm.tsx
@@ -37,11 +37,11 @@ const EmailVerificationForm: FC<Props> = observer(
 				style={{
 					...styles.form,
 					backgroundColor: colors.background,
-					elevation: !dark && 10,
-					shadowColor: !dark && 'rgba(0,0,0,0.1)',
-					shadowOffset: !dark && { width: 10, height: 10 },
-					shadowOpacity: !dark && 5,
-					shadowRadius: !dark && 9
+					elevation: !dark ? 10 : undefined,
+					shadowColor: !dark ? 'rgba(0,0,0,0.1)' : undefined,
+					shadowOffset: !dark ? { width: 10, height: 10 } : undefined,
+					shadowOpacity: !dark ? 0.5 : undefined,
+					shadowRadius: !dark ? 9 : undefined
 				}}
 			>
 				<Text style={styles.text}>{translate('loginScreen.step3Title')}</Text>