FIX | Add translate to terms and privacy pages| Privacy and terms files

src/i18n/locales/en/index.ts

@@ -3,9 +3,11 @@ import {settingTranslation} from './settings.translation';
 import {onBoardingTranslation} from './steps.translation';
 import {buttonsTranslation} from './onBoardingButton.translation';
 import {customPack} from './custom-pack.translation';
+import {pageTitles} from './page-title.translation';
 export const en: MainLocaleModule = {
   settingTranslation,
   stepTranslation: onBoardingTranslation,
   buttonsTranslation,
   customPack,
+  pageTitles,
 };

src/i18n/locales/en/page-title.translation.ts

@@ -0,0 +1,5 @@
+export const pageTitles = {
+    setting: 'Setting',
+    privacy: 'Privacy Policy',
+    terms: 'Terms and conditions',
+}

src/i18n/locales/hi/index.tsx

@@ -3,9 +3,12 @@ import {settingTranslation} from './settings.translation';
 import {onBoardingTranslation} from './steps.translation';
 import { buttonsTranslation } from './onBoardingButton.translation';
 import {customPack} from './custom-pack.translation';
+import {pageTitles} from './page-title.translation';
+
 export const hi: MainLocaleModule = {
   settingTranslation,
   stepTranslation: onBoardingTranslation,
   buttonsTranslation,
   customPack,
+  pageTitles,
 };

src/i18n/locales/hi/page-title.translation.ts

@@ -0,0 +1,5 @@
+export const pageTitles = {
+    setting: 'सेटिंग',
+    privacy: 'गोपनीयता नीति',
+    terms: 'नियम और शर्तें',
+}

src/i18n/locales/ua/index.ts

@@ -3,10 +3,13 @@ import {settingTranslation} from './settings.translation';
 import {onBoardingTranslationUa} from './step.translation';
 import { buttonsTranslation } from './onBoardingButton.translation';
 import {customPack} from './custom-pack.translation';
+import {pageTitles} from './page-title.translation';
+
 
 export const ua: MainLocaleModule = {
   stepTranslation: onBoardingTranslationUa,
   settingTranslation: settingTranslation,
   buttonsTranslation,
   customPack,
+  pageTitles
 };

src/i18n/locales/ua/page-title.translation.ts

@@ -0,0 +1,5 @@
+export const pageTitles = {
+    setting: 'Налаштування',
+    privacy: 'Політика \n конфіденційності',
+    terms: 'Правила та умови',
+}

src/i18n/types/index.ts

@@ -1,4 +1,5 @@
 import { CustomPack } from '../../module/shared/interfaces/custom-pack';
+import { PageTitles } from '../../module/shared/interfaces/page-titles';
 import { Buttons } from './buttons.types';
 import {OnBoardingLocale} from './on-boarding.types';
 import {SettingLocale} from './settings.types';
@@ -7,4 +8,5 @@ export interface MainLocaleModule {
   settingTranslation: SettingLocale.Core;
   buttonsTranslation: Buttons;
   customPack: CustomPack;
+  pageTitles: PageTitles;
 }

src/module/privacy-policy/screens/privacy-policy.tsx

@@ -9,7 +9,7 @@ import {
   ScreenLayout,
 } from '../../shared';
 import { MainTextContainer } from '../../shared/components/text-containers/main-text-container';
-import { privacy } from '../../shared/config/privacy-texts';
+import { privacy } from '../config/privacy-texts';
 
 interface IProps extends IRouteParams {}
 export const PrivacyPolicy: React.FC<IProps> = ({navigation}) => {
@@ -23,8 +23,6 @@ export const PrivacyPolicy: React.FC<IProps> = ({navigation}) => {
 
   const lang = i18n.language;
 
-  console.log('lang:', i18n.language);
-
   return (
     <ScreenLayout
       backgroundColor={colors.primaryColor}
@@ -33,8 +31,8 @@ export const PrivacyPolicy: React.FC<IProps> = ({navigation}) => {
       headerComponent={
         <Header
           leftIcon="arrow"
-          title="Privacy Policy"
-          onPressLeft={() => goBack()}
+          title={t('pageTitles.privacy')}
+          onPressLeft={() => navigation.goBack()}
           rightIcon="none"
         />
       }>

src/module/root/navigations-groups/on-boardings-group.tsx

@@ -67,7 +67,7 @@ export const OnboardingGroup: FC = () => {
       screenOptions={{
         headerShown: false,
       }}
-      initialRouteName={RouteKey.LanguageSelect}>
+      initialRouteName={RouteKey.Loading}>
       <Stack.Screen name={RouteKey.Questions} component={Questions} />
       <Stack.Screen name={RouteKey.Package} component={Game} />
       <Stack.Screen name={RouteKey.Onboarding} component={Onboarding} />

src/module/root/screens/questions.tsx

@@ -86,7 +86,7 @@ export const Questions: React.FC<IProps> = ({navigation, route}) => {
                 style={{width: 20, height: 20}}
               />
             }
-            width={101}
+            width={'30%'}
           />
           <PrimaryBtn
             onPress={() => {
@@ -98,7 +98,7 @@ export const Questions: React.FC<IProps> = ({navigation, route}) => {
                 style={{width: 20, height: 20}}
               />
             }
-            width={101}
+            width={'30%'}
           />
           <PrimaryBtn
             onPress={() => {
@@ -110,7 +110,7 @@ export const Questions: React.FC<IProps> = ({navigation, route}) => {
                 style={{width: 20, height: 20}}
               />
             }
-            width={101}
+            width={'30%'}
           />
         </View>
       </View>

src/module/root/screens/settings.screen.tsx

@@ -1,4 +1,5 @@
 import React, {FC} from 'react';
+import { useTranslation } from 'react-i18next';
 import {StyleSheet, View} from 'react-native';
 import {SettingsItem} from '../../setting/components/Settings-Item.component';
 import {SettingsData} from '../../setting/config/data-setting.config';
@@ -9,6 +10,8 @@ interface IProps extends IRouteParams {}
 export const Setting: FC<IProps> = ({route, navigation}) => {
   const {previous_screen, title} = route.params;
 
+  const {t} = useTranslation();
+
   return (
     <ScreenLayout
       backgroundColor={colors.primaryColor}
@@ -17,7 +20,7 @@ export const Setting: FC<IProps> = ({route, navigation}) => {
         <Header
           leftIcon="arrow"
           rightIcon="inst"
-          title={title}
+          title={t('pageTitles.setting')}
           onPressLeft={() => navigation.navigate(previous_screen)}
         />
       }>

src/module/shared/components/header/header.component.tsx

@@ -58,6 +58,7 @@ const styles = StyleSheet.create({
     fontSize: 24,
     color: '#99EDCC',
     fontWeight: 'bold',
+    textAlign: 'center',
   },
   gamerTitle: {
     backgroundColor: '#2C205C',

src/module/shared/components/text-containers/main-text-container.tsx

@@ -1,6 +1,7 @@
 import {StyleSheet, Text, View} from 'react-native';
 import React from 'react';
 import { colors } from '../../colors';
+import { ScrollView } from 'react-native-gesture-handler';
 
 interface IProps {
     text: string
@@ -9,9 +10,11 @@ interface IProps {
 export const MainTextContainer: React.FC<IProps> = ({text}) => {
   return (
     <View style={styles.container}>
+      <ScrollView contentContainerStyle={{paddingBottom: 0}}>
       <Text style={styles.description}>
         {text}
       </Text>
+      </ScrollView>
     </View>
   );
 };
@@ -22,11 +25,12 @@ const styles = StyleSheet.create({
     borderRadius: 20,
     paddingVertical: 32,
     paddingHorizontal: 20,
+    maxHeight: '80%'
   },
   description: {
     lineHeight: 32,
     fontSize: 22,
     color: colors.purple,
-    textAlign: 'center'
+    textAlign: 'auto'
   }
 });

src/module/shared/interfaces/page-titles.ts

@@ -0,0 +1,5 @@
+export interface PageTitles {
+    setting: string,
+    privacy: string,
+    terms: string,
+}

src/module/terms-of-use/config/use-of-terms.translations.ts

@@ -0,0 +1,6 @@
+export const terms = {
+    en: ' You agree to use our application for legitimate purposes and not for any illegal or unauthorized purpose, including without limitation, in violation of any intellectual property or privacy law. By agreeing to the Terms, you represent and warrant that you are at least the age of majority in your state or province of residence and are legally capable of entering into a binding contract',
+    ua: 'Ви погоджуєтеся використовувати нашу програму в законних цілях, а не в незаконних або несанкціонованих цілях, у тому числі, без обмежень, з порушенням будь-якого закону про інтелектуальну власність або конфіденційність. Погоджуючись із Умовами, ви заявляєте та гарантуєте, що досягли повноліття у вашому штаті чи провінції та маєте законну правоздатність укладати обов’язковий договір',
+    hi: 'आप हमारे आवेदन को वैध उद्देश्यों के लिए उपयोग करने के लिए सहमत हैं, न कि किसी भी अवैध या अनधिकृत उद्देश्य के लिए, जिसमें बिना किसी सीमा के, किसी भी बौद्धिक संपदा या गोपनीयता कानून का उल्लंघन शामिल है। शर्तों से सहमत होकर, आप प्रतिनिधित्व करते हैं और वारंटी देते हैं कि आप अपने राज्य या निवास के प्रांत में कम से कम वयस्कता की उम्र के हैं और बाध्यकारी अनुबंध में प्रवेश करने में कानूनी रूप से सक्षम हैं',
+  };
+  

src/module/terms-of-use/screens/use-of-terms.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 import {View} from 'react-native';
 import {
   colors,
@@ -9,14 +10,19 @@ import {
 } from '../../shared';
 import { MainTextContainer } from '../../shared/components/text-containers/main-text-container';
 import { TermsText } from '../config/terms-text';
+import { terms } from '../config/use-of-terms.translations';
 
 interface IProps extends IRouteParams {}
 export const UseOfTerms: React.FC<IProps> = ({navigation}) => {
-  const goBack = () => {
-    navigation.navigate(RouteKey.Setting, {
-      previous_screen: RouteKey.Game,
-    });
-  };
+  // const goBack = () => {
+  //   navigation.navigate(RouteKey.Setting, {
+  //     previous_screen: RouteKey.Game,
+  //   });
+  // };
+
+  const {t, i18n} = useTranslation();
+
+  const lang = i18n.language;
 
   return (
     <ScreenLayout
@@ -26,12 +32,12 @@ export const UseOfTerms: React.FC<IProps> = ({navigation}) => {
       headerComponent={
         <Header
           leftIcon="arrow"
-          title="Terms and conditions"
-          onPressLeft={() => goBack()}
+          title={t('pageTitles.terms')}
+          onPressLeft={() => navigation.goBack()}
           rightIcon="none"
         />
       }>
-      <MainTextContainer text={TermsText}/>
+      <MainTextContainer text={terms[lang as keyof typeof terms]}/>
     </ScreenLayout>
   );
 };