Merge pull request #366 from monkvision/fix/final-adjustements-corrections

Fix/final adjustements corrections

Author: natsukiai

app.config.js

@@ -45,7 +45,7 @@ const options = [
       'T24v9XS8', // Front Door Left
       'UHZkpCuK', // Rocker panel left
       'ClEZSucK', // Rear Lateral Left
-      'PuIw17h0', // Front wheel right (Wheels analysis)
+      '8_W2PO8L', // Rear wheel left (Wheels analysis)
       'j8YHvnDP', // Rear Bumper Side Left
       'XyeyZlaU', // Rear
       'LDRoAPnk', // Rear Bumper Side Right
@@ -54,7 +54,7 @@ const options = [
       'B5s1CWT-', // Rocker panel right
       '2wVqenwP', // Front Door Right
       '0U14gFyk', // Front Lateral Right
-      '8_W2PO8L', // Rear wheel left (Wheels analysis)
+      'PuIw17h0', // Front wheel right (Wheels analysis)
       'CELBsvYD', // Front Bumper Side Right
     ],
     taskName: 'damage_detection',
@@ -197,6 +197,6 @@ export default {
       palette,
     },
     ...app,
-    ...eas.build.staging.env,
+    ...eas.build.development.env,
   },
 };

src/components/Modal/styles.js

@@ -14,10 +14,11 @@ export default StyleSheet.create({
   container: {
     position: 'relative',
     display: 'flex',
-    justifyContent: 'center',
+    justifyContent: 'start',
     alignItems: 'center',
     width: '100%',
     height: '100%',
+    paddingTop: 100,
   },
   playground: {
     alignSelf: 'center',

src/i18n/index.js

@@ -12,6 +12,8 @@ i18n.use(initReactI18next).init({
     escapeValue: false,
   },
   resources,
+  supportedLngs: ['en', 'fr'],
+  nonExplicitSupportedLngs: true,
 });
 
 i18n.on(

src/screens/Landing/LanguageSwitch/index.js

@@ -39,14 +39,14 @@ export default function LanguageSwitch() {
       setLanguage('en');
       return en;
     }
-    return i18n.language === 'fr' ? fr : en;
+    return i18n.language.startsWith('fr') ? fr : en;
   }, [isLoading, i18n.language]);
 
   return (
     <Menu
       visible={visible}
       onDismiss={closeMenu}
-      anchor={<Button onPress={openMenu} disabled={isLoading}>{getButtonContent()}</Button>}
+      anchor={<Button color="white" onPress={openMenu} disabled={isLoading}>{getButtonContent()}</Button>}
     >
       <Menu.Item onPress={() => setLanguage('en')} title="🇬🇧 English" />
       <Menu.Item onPress={() => setLanguage('fr')} title="🇫🇷 Français" />

src/screens/Landing/index.js

@@ -1,32 +1,32 @@
-import { useSentry, useInterval, utils } from '@monkvision/toolkit';
+import monk from '@monkvision/corejs';
+import { useInterval, useSentry, utils } from '@monkvision/toolkit';
 import { SentryConstants } from '@monkvision/toolkit/src/hooks/useSentry';
+import { Container } from '@monkvision/ui';
+import { useFocusEffect, useNavigation, useRoute } from '@react-navigation/native';
+import Inspection from 'components/Inspection';
+import Modal from 'components/Modal';
 import ExpoConstants from 'expo-constants';
+import { LinearGradient } from 'expo-linear-gradient';
 import useAuth from 'hooks/useAuth';
 import useSnackbar from 'hooks/useSnackbar';
 import isEmpty from 'lodash.isempty';
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
-import { LinearGradient } from 'expo-linear-gradient';
-import { useFocusEffect, useNavigation, useRoute } from '@react-navigation/native';
 import { useTranslation } from 'react-i18next';
-import { View, useWindowDimensions, FlatList } from 'react-native';
-import { Container } from '@monkvision/ui';
-import monk from '@monkvision/corejs';
+import { FlatList, useWindowDimensions, View } from 'react-native';
+import { ActivityIndicator, Button, Card, List, Surface, useTheme } from 'react-native-paper';
 import { useMediaQuery } from 'react-responsive';
-import { ActivityIndicator, Button, Card, Colors, List, Surface, useTheme } from 'react-native-paper';
-import Inspection from 'components/Inspection';
 import Artwork from 'screens/Landing/Artwork';
 import LanguageSwitch from 'screens/Landing/LanguageSwitch';
 import SignOut from 'screens/Landing/SignOut';
 import useGetInspection from 'screens/Landing/useGetInspection';
 
 import * as names from 'screens/names';
-import Modal from 'components/Modal';
-import styles from './styles';
 import Sentry from '../../config/sentry';
-import useVinModal from './useVinModal';
 import { setTag } from '../../config/sentryPlatform';
+import styles from './styles';
 import useGetPdfReport from './useGetPdfReport';
 import useUpdateOneTask from './useUpdateOneTask';
+import useVinModal from './useVinModal';
 
 const ICON_BY_STATUS = {
   NOT_STARTED: 'chevron-right',

src/screens/Landing/useGetPdfReport/index.js

@@ -33,7 +33,7 @@ export default function useGetPdfReport(inspectionId, onError) {
     pricing: false,
     customer: ExpoConstants.manifest.extra.PDF_REPORT_CUSTOMER,
     clientName: ExpoConstants.manifest.extra.PDF_REPORT_CLIENT_NAME,
-    language: i18n.language,
+    language: i18n.language?.substring(0, 2) ?? 'en',
   }), [i18n.language]);
 
   const timeout = useCallback((ms) => new Promise((resolve) => {