resolve conflicts

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>

components/CopilotTooltip.tsx

@@ -27,13 +27,10 @@ export const CopilotTooltip = () => {
 
   return (
     <Column>
-      <Text
-        testID={controller.currentStepTitle}
-        weight="bold"
-        margin="0 0 10 0">
+      <Text testID={controller.titleTestID} weight="bold" margin="0 0 10 0">
         {controller.currentStepTitle}
       </Text>
-      <Text testID={`${controller.currentStepTitle}Description`}>
+      <Text testID={controller.descriptionTestID}>
         {controller.currentStepDescription}
       </Text>
       <Row align="space-between" crossAlign="center" margin="25 0 0 0">

components/CopilotTooltipController.tsx

@@ -8,6 +8,7 @@ import {
   selectIsOnboarding,
 } from '../machines/auth';
 import {useSelector} from '@xstate/react';
+import {copilotTestID} from '../shared/constants';
 
 export const UseCopilotTooltip = () => {
   const {
@@ -37,6 +38,10 @@ export const UseCopilotTooltip = () => {
   const CURRENT_STEP = currentStep?.order;
   const currentStepTitle = currentStep?.name;
   const currentStepDescription = currentStep?.text;
+  const titleTestID = `${copilotTestID[CURRENT_STEP?.toString()]}Title`;
+  const descriptionTestID = `${
+    copilotTestID[CURRENT_STEP?.toString()]
+  }Description`;
 
   const stepCount =
     CURRENT_STEP === COPILOT_FINAL_STEP && isInitialDownloading
@@ -60,6 +65,8 @@ export const UseCopilotTooltip = () => {
     stepCount,
     isOnboarding,
     isInitialDownloading,
+    titleTestID,
+    descriptionTestID,
     INITIAL_DOWNLOAD_DONE,
     ONBOARDING_DONE,
     SET_TOUR_GUIDE,

components/KebabPopUpController.tsx

@@ -12,6 +12,8 @@ import {
   selectWalletBindingResponse,
   selectShowWalletBindingError,
   selectWalletBindingInProgress,
+  selectOtpError,
+  selectWalletBindingError,
 } from '../machines/VerifiableCredential/VCItemMachine/VCItemSelectors';
 import {selectActivities} from '../machines/activityLog';
 import {GlobalContext} from '../shared/GlobalContext';
@@ -20,13 +22,12 @@ import {VCMetadata} from '../shared/VCMetadata';
 import {ScanEvents} from '../machines/bleShare/scan/scanMachine';
 import {BOTTOM_TAB_ROUTES, ScanStackParamList} from '../routes/routesConstants';
 import {NavigationProp, useNavigation} from '@react-navigation/native';
-import {MainBottomTabParamList} from '../routes/main';
+import {MainBottomTabParamList} from '../routes/routeTypes';
 import {selectIsScanning} from '../machines/bleShare/scan/scanSelectors';
 import {
   VCItemEvents,
   VCItemMachine,
 } from '../machines/VerifiableCredential/VCItemMachine/VCItemMachine';
-import {selectError} from '../machines/biometrics';
 
 type ScanLayoutNavigation = NavigationProp<
   ScanStackParamList & MainBottomTabParamList
@@ -50,8 +51,8 @@ export function useKebabPopUp(props) {
     isAcceptingOtpInput: useSelector(service, selectAcceptingBindingOtp),
     isWalletBindingError: useSelector(service, selectShowWalletBindingError),
     walletBindingResponse: useSelector(service, selectWalletBindingResponse),
-    otpError: useSelector(service, selectError),
-    walletBindingError: useSelector(service, selectError),
+    otpError: useSelector(service, selectOtpError),
+    walletBindingError: useSelector(service, selectWalletBindingError),
     bindingAuthFailedError: useSelector(service, selectBindingAuthFailedError),
     isKebabPopUp: useSelector(service, selectKebabPopUp),
     isShowActivities: useSelector(service, selectShowActivities),

injitest/src/main/java/inji/pages/HomePage.java

@@ -755,7 +755,6 @@ public class HomePage extends BasePage {
     }
 
     public void clickOnNextButtonForInjiTour() {
-
         if(isElementDisplayed(firstNextButton)) {
             clickOnElement(firstNextButton);
             clickOnElement(secondNextButton);

locales/ara.json

@@ -881,7 +881,7 @@
       "allowAccess": "اسمح بالوصول إلى الكاميرا"
     },
     "errors": {
-      "genericError": "هناك شئ غير صحيح. الرجاء معاودة المحاولة في وقت لاحق!"
+      "genericError": "!آسفون! بسبب خطأ فني، نحن غير قادرين على تلبية طلبك الآن. الرجاء معاودة المحاولة في وقت لاحق"
     },
     "clipboard": {
       "copy": "ينسخ",

locales/en.json

@@ -889,7 +889,7 @@
       "allowAccess": "Allow access to the camera"
     },
     "errors": {
-      "genericError": "Something is wrong. Please try again later!"
+      "genericError": "We're sorry! Due to technical error, we are unable to serve your request now. Please try again later!"
     },
     "clipboard": {
       "copy": "Copy",

locales/fil.json

@@ -880,7 +880,7 @@
     },
     "ignore": "Huwag pansinin",
     "errors": {
-      "genericError": "May mali. Subukang muli mamaya!"
+      "genericError": "Ikinalulungkot namin! Dahil sa teknikal na error, hindi namin maibigay ang iyong kahilingan ngayon. Subukang muli mamaya!"
     },
     "clipboard": {
       "copy": "Kopya",

locales/hin.json

@@ -881,7 +881,7 @@
       "allowAccess": "कैमरे तक पहुंच की अनुमति दें"
     },
     "errors": {
-      "genericError": "कुछ गलत हो गया। कृपया कुछ समय बाद पुन: प्रयास करें!"
+      "genericError": "हम क्षमा चाहते हैं! तकनीकी त्रुटि के कारण, हम अभी आपका अनुरोध पूरा करने में असमर्थ हैं। कृपया बाद में पुन: प्रयास करें!"
     },
     "clipboard": {
       "copy": "प्रतिलिपि",

locales/kan.json

@@ -881,7 +881,7 @@
       "allowAccess": "ಕ್ಯಾಮರಾಗೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿ"
     },
     "errors": {
-      "genericError": "ಏನೋ ತಪ್ಪಾಗಿದೆ. ದಯವಿಟ್ಟು ಸ್ವಲ್ಪ ಸಮಯದ ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ!"
+      "genericError": "ನಮ್ಮನ್ನು ಕ್ಷಮಿಸಿ! ತಾಂತ್ರಿಕ ದೋಷದಿಂದಾಗಿ, ಈಗ ನಿಮ್ಮ ವಿನಂತಿಯನ್ನು ಪೂರೈಸಲು ನಮಗೆ ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ. ದಯವಿಟ್ಟು ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ!"
     },
     "clipboard": {
       "copy": "ನಕಲು ಮಾಡಿ",

locales/tam.json

@@ -881,7 +881,7 @@
       "allowAccess": "கேமராவை அணுக அனுமதிக்கவும்"
     },
     "errors": {
-      "genericError": "ஏதோ தவறு நடந்துவிட்டது. சிறிது நேரம் கழித்து மீண்டும் முயற்சிக்கவும்!"
+      "genericError": "நாங்கள் வருந்துகிறோம்! தொழில்நுட்பப் பிழை காரணமாக, உங்கள் கோரிக்கையை இப்போது எங்களால் வழங்க முடியவில்லை. பிறகு முயற்சிக்கவும்!"
     },
     "clipboard": {
       "copy": "நகலெடுக்கவும்",

machines/bleShare/scan/scanMachine.ts

@@ -306,6 +306,7 @@ export const scanMachine =
             'registerLoggers',
             'clearUri',
             'setChildRef',
+            'resetFaceCaptureBannerStatus',
           ],
           on: {
             SCAN: [

shared/commonUtil.ts

@@ -121,7 +121,7 @@ export const bytesToMB = (bytes: number): string => {
   }
 
   const megabytes = bytes / BYTES_IN_MEGABYTE;
-  return Number(megabytes).toFixed(2);
+  return Number(megabytes).toFixed(3);
 };
 
 export const getAccountType = () => (isAndroid() ? GMAIL : APPLE);

shared/constants.ts

@@ -134,9 +134,17 @@ export const APPLE = 'Apple';
 export const ICLOUD_DRIVE_NAME = 'iCloud';
 export const DEFAULT_ECL = 'M';
 export const DEFAULT_QR_HEADER = 'INJIQUICKSHARE://';
-export const MAX_QR_DATA_LENGTH=4296
+export const MAX_QR_DATA_LENGTH = 4296;
 
 export const INTRO_SLIDER_LOGO_MARGIN = Dimensions.get('screen').width * 0.45;
 
 export const COPILOT_PRE_FINAL_STEP: number = 5;
 export const COPILOT_FINAL_STEP: number = 6;
+export const copilotTestID = {
+  '1': 'help',
+  '2': 'download',
+  '3': 'scan',
+  '4': 'history',
+  '5': 'settings',
+  '6': 'cardView',
+};