diff --git a/App.tsx b/App.tsx index 722e8627..fb0244d3 100644 --- a/App.tsx +++ b/App.tsx @@ -17,30 +17,29 @@ import store, { persistor } from './src/store/store'; import FullScreenLoader from './RN-UI-LIB/src/components/FullScreenLoader'; import { toastConfigs, ToastContainer } from './RN-UI-LIB/src/components/toast'; -import { navigationRef } from './src/components/utlis/navigationUtlis'; +import { navigationRef } from '@utils/navigationUtlis'; import { sendDeviceDetailsToClickstream } from '@components/utlis/commonFunctions'; import { linkingConf } from '@components/utlis/deeplinkingUtils'; -import { getBuildFlavour, getBuildInfo } from '@components/utlis/DeviceUtils'; -import { setGlobalBuildConfig, setGlobalBuildFlavour } from '@constants/Global'; +import { getBuildFlavour, } from '@components/utlis/DeviceUtils'; +import { setGlobalBuildFlavour } from '@constants/Global'; import analytics from '@react-native-firebase/analytics'; import dayJs from 'dayjs'; -import { COLORS } from './RN-UI-LIB/src/styles/colors'; -import { MILLISECONDS_IN_A_SECOND } from './RN-UI-LIB/src/utlis/common'; -import { hydrateGlobalImageMap } from './src/common/CachedImage'; -import { CLICKSTREAM_EVENT_NAMES, LocalStorageKeys } from './src/common/Constants'; +import { COLORS } from '@rn-ui-lib/colors'; +import { MILLISECONDS_IN_A_SECOND } from '@rn-ui-lib/utils/common'; +import { hydrateGlobalImageMap } from '@common/CachedImage'; +import { CLICKSTREAM_EVENT_NAMES, LocalStorageKeys } from '@common/Constants'; import ErrorBoundary from './src/common/ErrorBoundary'; -import { getPermissionsToRequest } from './src/components/utlis/PermissionUtils'; +import { getPermissionsToRequest } from '@utils/PermissionUtils'; import ScreenshotBlocker from './src/components/utlis/ScreenshotBlocker'; -import { initSentry } from './src/components/utlis/sentry'; -import { setItem } from './src/components/utlis/storageHelper'; -import { APM_APP_NAME, APM_BASE_URL, ENV } from './src/constants/config'; +import { initSentry } from '@utils/sentry'; +import { setItem } from '@utils/storageHelper'; import usePolling from './src/hooks/usePolling'; import AuthRouter from './src/screens/auth/AuthRouter'; -import { type TDocumentObj } from './src/screens/caseDetails/interface'; +import { type TDocumentObj } from '@screens/caseDetails/interface'; import Permissions from './src/screens/permissions/Permissions'; -import { addClickstreamEvent } from './src/services/clickstreamEventService'; -import { setJsErrorHandler } from './src/services/exception-handler.service'; +import { addClickstreamEvent } from '@services/clickstreamEventService'; +import { setJsErrorHandler } from '@services/exception-handler.service'; import fetchUpdatedRemoteConfig from './src/services/firebaseFetchAndUpdate.service'; import { StorageKeys } from './src/types/storageKeys'; import { setCurrentScreenName } from 'react-native-clarity'; @@ -136,12 +135,6 @@ function App() { GlobalDocumentMap = parsedData; } })(); - getBuildFlavour().then((flavour) => { - setGlobalBuildFlavour(flavour); - }); - getBuildInfo().then((buildInfo) => { - setGlobalBuildConfig(JSON.parse(buildInfo)); - }); checkCodePushAndSync(); setForegroundTimeStampAndClickstream(); diff --git a/config/qa/config.js b/config/qa/config.js index fa45a329..0c71639a 100644 --- a/config/qa/config.js +++ b/config/qa/config.js @@ -1,15 +1,14 @@ -import { MILLISECONDS_IN_A_MINUTE, MINUTES_IN_AN_HOUR } from '../../RN-UI-LIB/src/utlis/common'; - -export const BASE_AV_APP_URL = 'https://qa-longhorn-server.np.navi-ppl.in/field-app'; +import { MILLISECONDS_IN_A_MINUTE, MINUTES_IN_AN_HOUR } from '@rn-ui-lib/utils/common'; +export const BASE_AV_APP_URL = 'https://qa-longhorn-portal.np.navi-tech.in/field-app'; export const SENTRY_DSN = - 'https://acef93c884c1424cacc4ec899562e203@qa-longhorn-server.np.navi-ppl.in/glitchtip-events/173'; -export const JANUS_SERVICE_URL = 'https://qa-longhorn-server.np.navi-ppl.in/api/events/json'; + 'https://acef93c884c1424cacc4ec899562e203@qa-longhorn-portal.np.navi-tech.in/glitchtip-events/173'; +export const JANUS_SERVICE_URL = 'https://qa-longhorn-portal.np.navi-tech.in/api/events/json'; export const ENV = 'qa'; export const IS_SSO_ENABLED = true; export const APM_APP_NAME = 'cosmos-app'; -export const APM_BASE_URL = 'https://qa-longhorn-server.np.navi-ppl.in/apm-events'; +export const APM_BASE_URL = 'https://qa-longhorn-portal.np.navi-tech.in/apm-events'; export const IS_DATA_SYNC_REQUIRED = true; export const DATA_SYNC_TIME_INTERVAL = 2 * MINUTES_IN_AN_HOUR * MILLISECONDS_IN_A_MINUTE; // 2hr export const GOOGLE_SSO_CLIENT_ID = - '60755663443-40k0fbrbbqv4ci4hrjlbrphab5fj387b.apps.googleusercontent.com'; -export const MS_CLARITY_PROJECT_ID = ''; + '60755663443-40k0fbrbbqv4ci4hrjlbrphab5fj387b.apps.googleusercontent.com'; +export const MS_CLARITY_PROJECT_ID = ''; \ No newline at end of file diff --git a/src/common/BlockerScreen.tsx b/src/common/BlockerScreen.tsx index 545db085..8fb55ab9 100644 --- a/src/common/BlockerScreen.tsx +++ b/src/common/BlockerScreen.tsx @@ -1,19 +1,18 @@ import React, { ReactNode, useCallback, useState } from 'react'; import { AppState, Linking } from 'react-native'; import { useSelector } from 'react-redux'; -import { RootState } from '../store/store'; -import { IAppState, UninstallInformation } from '../reducer/metadataSlice'; -import { getAppVersion, getBuildVersion } from '../components/utlis/commonFunctions'; +import { RootState } from '@store'; +import { IAppState, UninstallInformation } from '@reducers/metadataSlice'; +import { getAppVersion, getBuildVersion } from '@utils/commonFunctions'; import BlockerInstructions from './BlockerInstructions'; import { BLOCKER_SCREEN_DATA, CLICKSTREAM_EVENT_NAMES } from './Constants'; -import { useAppDispatch, useAppSelector } from '../hooks'; -import { setIsDeviceLocationEnabled } from '../reducer/foregroundServiceSlice'; -import { toast } from '../../RN-UI-LIB/src/components/toast'; -import { buildFlavour, locationEnabled } from '../components/utlis/DeviceUtils'; +import { useAppDispatch, useAppSelector } from '@hooks'; +import { setIsDeviceLocationEnabled } from '@reducers/foregroundServiceSlice'; +import { toast } from '@rn-ui-lib/components/toast'; +import { locationEnabled } from '@utils/DeviceUtils'; import BlockerScreenApps from '@screens/permissions/BlockerScreenApps'; import handleBlacklistedAppsForBlockingCosmos, { Apps, - BLACKLISTED_APPS_LIST, } from '@services/blacklistedApps.service'; import { addClickstreamEvent } from '@services/clickstreamEventService'; import { setBlacklistedAppsInstalledData } from '@reducers/blacklistedAppsInstalledSlice'; @@ -173,17 +172,6 @@ const BlockerScreen = (props: IBlockerScreen) => { ); } - if (shouldUpdate) { - const { heading, instructions } = BLOCKER_SCREEN_DATA.UNINSTALL_APP; - return ( - - ); - } - if (!isTimeSynced) { const { heading, instructions } = BLOCKER_SCREEN_DATA.TIME_UNSYNC; return ( diff --git a/src/common/TrackingComponent.tsx b/src/common/TrackingComponent.tsx index 8de3d3c9..fce3b252 100644 --- a/src/common/TrackingComponent.tsx +++ b/src/common/TrackingComponent.tsx @@ -1,4 +1,4 @@ -import { type ReactNode, useEffect, useRef, useState } from 'react'; +import React,{ type ReactNode, useEffect, useRef, useState } from 'react'; import { type NativeEventSubscription, AppState, type AppStateStatus } from 'react-native'; import dayJs from 'dayjs'; import RNFS from 'react-native-fs'; @@ -73,7 +73,6 @@ import { initialize } from 'react-native-clarity'; import { getPermissionsToRequest } from '@components/utlis/PermissionUtils'; import { syncToLonghorn } from '../miniModules/callingAgents/screens/homeScreen/action'; import { updateImageUploadComponent } from '@components/form/services/formComponents'; -import React from "react"; export enum FOREGROUND_TASKS { GEOLOCATION = 'GEOLOCATION', diff --git a/src/components/utlis/DeviceUtils.ts b/src/components/utlis/DeviceUtils.ts index 9a8e0589..92428dcb 100644 --- a/src/components/utlis/DeviceUtils.ts +++ b/src/components/utlis/DeviceUtils.ts @@ -1,6 +1,4 @@ -import { buildFlavour } from '@reducers/metadataSlice'; import { NativeModules } from 'react-native'; -import { logError } from './errorUtils'; interface CrashError { message: string; @@ -15,9 +13,9 @@ export const locationEnabled = (): Promise => DeviceUtilsModule.isLocat // returns array of all the installed packages. export const getAllInstalledApp = (): Promise => DeviceUtilsModule.getAllInstalledApp(); -export type buildFlavour = 'fieldAgents' | 'callingAgents'; +export type BuildFlavour = 'fieldAgents' | 'callingAgents'; -export const getBuildFlavour = (): Promise => DeviceUtilsModule.getBuildFlavour(); +export const getBuildFlavour = (): Promise => DeviceUtilsModule.getBuildFlavour(); export type buildConfig = { versionCode: number;