From c34b22b4300d8957a675036bd1b7b47c443561da Mon Sep 17 00:00:00 2001 From: yashmantri Date: Mon, 11 Nov 2024 22:54:03 +0530 Subject: [PATCH] NTP-11577 | Cybertron Integration --- .github/workflows/codePush.yml | 3 --- .github/workflows/newBuild.yml | 1 - App.tsx | 4 ++-- android/app/build.gradle | 4 ++-- package.json | 4 ++-- src/components/utlis/apiHelper.ts | 3 ++- src/components/utlis/sentry.ts | 1 - src/screens/Profile/index.tsx | 2 +- src/screens/allCases/CasesListScreen.tsx | 4 ++-- 9 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/codePush.yml b/.github/workflows/codePush.yml index 82f158ed..689a2a65 100644 --- a/.github/workflows/codePush.yml +++ b/.github/workflows/codePush.yml @@ -98,9 +98,6 @@ jobs: with: name: source-map path: index.android.bundle.map - - - upload_sourcemap_cybertron: needs: generate_source_map diff --git a/.github/workflows/newBuild.yml b/.github/workflows/newBuild.yml index 1df83f8e..272f7296 100644 --- a/.github/workflows/newBuild.yml +++ b/.github/workflows/newBuild.yml @@ -231,7 +231,6 @@ jobs: name: source-map path: index.android.bundle.map - upload_sourcemap_cybertron: needs: generate_source_map runs-on: [default] diff --git a/App.tsx b/App.tsx index beff05e5..30ce2879 100644 --- a/App.tsx +++ b/App.tsx @@ -21,10 +21,10 @@ import { PersistGate } from 'redux-persist/integration/react'; import store, { persistor } from './src/store/store'; import FullScreenLoader from './RN-UI-LIB/src/components/FullScreenLoader'; -import { toast, toastConfigs, ToastContainer } from './RN-UI-LIB/src/components/toast'; +import { toastConfigs, ToastContainer } from './RN-UI-LIB/src/components/toast'; import { navigationRef } from './src/components/utlis/navigationUtlis'; -import { getAppVersion, sendDeviceDetailsToClickstream } from '@components/utlis/commonFunctions'; +import { sendDeviceDetailsToClickstream } from '@components/utlis/commonFunctions'; import { linkingConf } from '@components/utlis/deeplinkingUtils'; import { getBuildFlavour } from '@components/utlis/DeviceUtils'; import { setGlobalBuildFlavour } from '@constants/Global'; diff --git a/android/app/build.gradle b/android/app/build.gradle index c7702aae..55bdff23 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -134,8 +134,8 @@ def reactNativeArchitectures() { return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] } -def VERSION_CODE = 214 -def VERSION_NAME = "2.14.14" +def VERSION_CODE = 213 +def VERSION_NAME = "2.14.13" android { ndkVersion rootProject.ext.ndkVersion diff --git a/package.json b/package.json index 795fade0..2867af09 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "AV_APP", - "version": "2.14.14", - "buildNumber": "214", + "version": "2.14.13", + "buildNumber": "213", "private": true, "scripts": { "android:dev": "yarn move:dev && react-native run-android", diff --git a/src/components/utlis/apiHelper.ts b/src/components/utlis/apiHelper.ts index 081c0d7c..d9c43d37 100644 --- a/src/components/utlis/apiHelper.ts +++ b/src/components/utlis/apiHelper.ts @@ -359,7 +359,7 @@ axiosInstance.interceptors.response.use( if ([API_STATUS_CODE.UNAUTHORIZED, API_STATUS_CODE.FORBIDDEN].includes(response.status)) { // Reset user info - dispatch(handleLogout()); + dispatch(handleLogout()); } // Blocking cosmos after operative hours @@ -368,6 +368,7 @@ axiosInstance.interceptors.response.use( dispatch(setWithinOperativeHours(false)); } } + return Promise.reject(error); } config.retry -= 1; diff --git a/src/components/utlis/sentry.ts b/src/components/utlis/sentry.ts index c722d993..73c815ef 100644 --- a/src/components/utlis/sentry.ts +++ b/src/components/utlis/sentry.ts @@ -4,7 +4,6 @@ import { addClickstreamEvent } from '../../services/clickstreamEventService'; import { CLICKSTREAM_EVENT_NAMES } from '../../common/Constants'; import { getAppVersion } from './commonFunctions'; import { createTransport } from '@sentry/core'; -import { toast } from '@rn-ui-lib/components/toast'; function makeFetchTransport(options: any): any { function makeRequest(request: any) { diff --git a/src/screens/Profile/index.tsx b/src/screens/Profile/index.tsx index f5ff270f..124ac8f6 100644 --- a/src/screens/Profile/index.tsx +++ b/src/screens/Profile/index.tsx @@ -121,7 +121,7 @@ const Profile: React.FC = () => { ]} > {hideUploadImageBtn ? null : } - {getNavigationLinks().do.dp.map((link, index) => { + {getNavigationLinks()?.map((link, index) => { if (!link.isVisible) return null; return ( diff --git a/src/screens/allCases/CasesListScreen.tsx b/src/screens/allCases/CasesListScreen.tsx index 4d9c3154..788ec0f3 100644 --- a/src/screens/allCases/CasesListScreen.tsx +++ b/src/screens/allCases/CasesListScreen.tsx @@ -4,7 +4,7 @@ import { setCommitmentOpenBottomSheet } from '@reducers/commitmentTrackerSlice'; import { COLORS } from '@rn-ui-lib/colors'; import DailyCommitmentIcon from '@rn-ui-lib/icons/DailyCommitmentIcon'; import React, { useEffect } from 'react'; -import {Button, StyleSheet} from 'react-native'; +import { StyleSheet } from 'react-native'; import CasesList from './CasesList'; import { setSelectedFilters } from '@reducers/filtersSlice'; import { parseJsonWithFallback } from '@utils/commonFunctions'; @@ -76,9 +76,9 @@ const styles = StyleSheet.create({ }, titleText: { color: COLORS.TEXT.TEAL, - fontFamily: 'Inter-Bold', marginLeft: 2, marginRight: 8, + fontFamily: 'Inter-Bold', }, });