diff --git a/App/common/constants/AnalyticsEventsConstant.ts b/App/common/constants/AnalyticsEventsConstant.ts index 651cc40e36..b108517a51 100644 --- a/App/common/constants/AnalyticsEventsConstant.ts +++ b/App/common/constants/AnalyticsEventsConstant.ts @@ -50,6 +50,7 @@ export const EVENT_PROPERTY_KEYS = { BUNDLE_VERSION: "bundleVersion", SCREEN_NAME: "screenName", LOAD_TIME: "loadTime", + SCREEN_STATE: "screenState", }; export const EVENT_PROPERTY_VALUES = { diff --git a/App/common/hooks/useScreenLoadTime.ts b/App/common/hooks/useScreenLoadTime.ts index 76ff0723f0..ad8e264c22 100644 --- a/App/common/hooks/useScreenLoadTime.ts +++ b/App/common/hooks/useScreenLoadTime.ts @@ -27,6 +27,7 @@ const useScreenLoadTime = ( properties: { [EVENT_PROPERTY_KEYS.SCREEN_NAME]: screenName, [EVENT_PROPERTY_KEYS.LOAD_TIME]: loadTime, + [EVENT_PROPERTY_KEYS.SCREEN_STATE]: ScreenState[screenState], }, }; diff --git a/network/NetworkService.ts b/network/NetworkService.ts index 119652d4f7..ddf3a3cbff 100644 --- a/network/NetworkService.ts +++ b/network/NetworkService.ts @@ -5,6 +5,12 @@ import axios from "axios"; import { getBuildConfigDetails } from "../App/common/utilities/CacheUtils"; import { addBundleVersionToHeader } from "./NetworkUtils"; +function newAbortSignal(timeoutMs: number): AbortSignal { + const abortController = new AbortController(); + setTimeout(() => abortController.abort(), timeoutMs || 10000); + return abortController.signal; +} + export const get = async ( url: string, config?: AxiosRequestConfig, @@ -19,6 +25,7 @@ export const get = async ( baseURL: baseUrl ? baseUrl : BASE_URL, timeout: 10000, headers: requestConfig.headers, + signal: newAbortSignal(11000) }); addBundleVersionToHeader(axiosInstance); @@ -45,6 +52,7 @@ export const post = async ( baseURL: baseUrl ? baseUrl : BASE_URL, timeout: 10000, headers: requestConfig.headers, + signal: newAbortSignal(11000) }); addBundleVersionToHeader(axiosInstance); @@ -75,6 +83,7 @@ export const patch = async ( baseURL: baseUrl ? baseUrl : BASE_URL, timeout: 10000, headers: requestConfig.headers, + signal: newAbortSignal(11000) }); addBundleVersionToHeader(axiosInstance);