refactor(mosip#656): [Pooja|Vijay] refactor methods to get the locali…

…zed field Value
tw-mosip · Mar 28, 2023 · 074e77c · 074e77c
1 parent 1368e57
commit 074e77c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 46 deletions.
diff --git a/components/VcDetails.tsx b/components/VcDetails.tsx
@@ -4,13 +4,13 @@ import * as DateFnsLocale from '../lib/date-fns/locale';
 import { useTranslation } from 'react-i18next';
 import { Image, ImageBackground, View } from 'react-native';
 import { Icon } from 'react-native-elements';
-import { VC, CredentialSubject, LocalizedField } from '../types/vc';
+import { VC, CredentialSubject } from '../types/vc';
 import { Button, Column, Row, Text } from './ui';
 import { Theme } from './ui/styleUtils';
 import { TextItem } from './ui/TextItem';
 import { VcItemTags } from './VcItemTags';
 import VerifiedIcon from './VerifiedIcon';
-import i18n, { getVCDetailsForCurrentLanguage } from '../i18n';
+import { getLocalizedField } from '../i18n';
 
 export const VcDetails: React.FC<VcDetailsProps> = (props) => {
   const { t, i18n } = useTranslation('VcDetails');
@@ -346,17 +346,3 @@ function getFullAddress(credential: CredentialSubject) {
     .filter(Boolean)
     .join(', ');
 }
-
-function getLocalizedField(rawField: string | LocalizedField[]) {
-  if (typeof rawField === 'string') {
-    return rawField;
-  }
-  try {
-    const locales: LocalizedField[] = JSON.parse(JSON.stringify(rawField));
-    const currentLanguage = i18n.language;
-    if (locales.length == 1) return locales[0]?.value;
-    return getVCDetailsForCurrentLanguage(locales, currentLanguage);
-  } catch (e) {
-    return '';
-  }
-}
diff --git a/components/VcItem.tsx b/components/VcItem.tsx
@@ -23,10 +23,9 @@ import { Theme } from './ui/styleUtils';
 import { RotatingIcon } from './RotatingIcon';
 import { GlobalContext } from '../shared/GlobalContext';
 import { useTranslation } from 'react-i18next';
-import { LocalizedField } from '../types/vc';
 import { VcItemTags } from './VcItemTags';
 import VerifiedIcon from './VerifiedIcon';
-import i18n, { getVCDetailsForCurrentLanguage } from '../i18n';
+import { getLocalizedField } from '../i18n';
 
 const getDetails = (arg1, arg2, verifiableCredential) => {
   if (arg1 === 'Status') {
@@ -305,17 +304,3 @@ interface VcItemProps {
   onShow?: (vcRef?: ActorRefFrom<typeof vcItemMachine>) => void;
   activeTab?: string;
 }
-
-function getLocalizedField(rawField: string | LocalizedField) {
-  if (typeof rawField === 'string') {
-    return rawField;
-  }
-  try {
-    const locales: LocalizedField[] = JSON.parse(JSON.stringify(rawField));
-    const currentLanguage = i18n.language;
-    if (locales.length == 1) return locales[0]?.value;
-    return getVCDetailsForCurrentLanguage(locales, currentLanguage);
-  } catch (e) {
-    return '';
-  }
-}
diff --git a/components/VidItem.tsx b/components/VidItem.tsx
@@ -15,7 +15,7 @@ import { Column, Row, Text } from './ui';
 import { Theme } from './ui/styleUtils';
 import { RotatingIcon } from './RotatingIcon';
 import { GlobalContext } from '../shared/GlobalContext';
-import { LocalizedField } from '../types/vc';
+import { getLocalizedField } from '../i18n';
 
 export const VidItem: React.FC<VcItemProps> = (props) => {
   const { appService } = useContext(GlobalContext);
@@ -105,15 +105,3 @@ interface VcItemProps {
   selected?: boolean;
   onPress?: (vcRef?: ActorRefFrom<typeof vcItemMachine>) => void;
 }
-
-function getLocalizedField(rawField: string | LocalizedField) {
-  if (typeof rawField === 'string') {
-    return rawField;
-  }
-  try {
-    const locales: LocalizedField[] = JSON.parse(JSON.stringify(rawField));
-    return locales[0].value;
-  } catch (e) {
-    return '';
-  }
-}
diff --git a/i18n.ts b/i18n.ts
@@ -12,6 +12,7 @@ import AsyncStorage from '@react-native-async-storage/async-storage';
 
 const resources = { en, fil, ar, hi, kn, ta };
 import { iso6393To1, iso6393To2T } from 'iso-639-3';
+import { LocalizedField } from './types/vc';
 
 const languageCodeMap = {};
 
@@ -48,8 +49,9 @@ function getLanguageCode(code: string) {
   return language;
 }
 
-export function getVCDetailsForCurrentLanguage(locales, currentLanguage) {
+export function getVCDetailsForCurrentLanguage(locales) {
   const supportedLanguages = Object.keys(SUPPORTED_LANGUAGES);
+  const currentLanguage = i18next.language;
   for (const index in supportedLanguages) {
     const supportedLanguage = supportedLanguages[index];
     if (supportedLanguage == currentLanguage) {
@@ -85,3 +87,16 @@ function populateLanguageCodeMap() {
     ));
   });
 }
+
+export function getLocalizedField(rawField: string | LocalizedField[]) {
+  if (typeof rawField === 'string') {
+    return rawField;
+  }
+  try {
+    const locales: LocalizedField[] = JSON.parse(JSON.stringify(rawField));
+    if (locales.length == 1) return locales[0]?.value;
+    return getVCDetailsForCurrentLanguage(locales);
+  } catch (e) {
+    return '';
+  }
+}