From 12b0d168a012220dd475884546910485bc1edffb Mon Sep 17 00:00:00 2001
From: Riddhiagrawal001 <50551695+Riddhiagrawal001@users.noreply.github.com>
Date: Fri, 6 Sep 2024 17:25:29 +0530
Subject: [PATCH] fix: merchant id from user-info (#1324)

---
 src/screens/Analytics/GlobalSearch/GlobalSearchBar.res    | 5 +++--
 .../GlobalSearchTables/ResultsTableUtils.res              | 4 ++--
 .../Analytics/GlobalSearchResults/SearchResultsPage.res   | 8 +++-----
 .../ConnectorMetaData/ApplePay/ApplePaySimplifiedFlow.res | 3 +--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/screens/Analytics/GlobalSearch/GlobalSearchBar.res b/src/screens/Analytics/GlobalSearch/GlobalSearchBar.res
index 1a9dc0aef..b99f8d302 100644
--- a/src/screens/Analytics/GlobalSearch/GlobalSearchBar.res
+++ b/src/screens/Analytics/GlobalSearch/GlobalSearchBar.res
@@ -218,7 +218,8 @@ let make = () => {
   let permissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
   let isShowRemoteResults = globalSearch && permissionJson.operationsView === Access
   let mixpanelEvent = MixpanelHook.useSendEvent()
-  let merchantDetailsValue = HSwitchUtils.useMerchantDetailsValue()
+  let {userInfo: {merchantId}} = React.useContext(UserInfoProvider.defaultContext)
+
   let redirectOnSelect = element => {
     mixpanelEvent(~eventName="global_search_redirect")
     let redirectLink = element.redirect_link->JSON.Decode.string->Option.getOr("/search")
@@ -232,7 +233,7 @@ let make = () => {
     try {
       let url = getURL(~entityName=GLOBAL_SEARCH, ~methodType=Post)
 
-      let body = generateSearchBody(~searchText, ~merchant_id={merchantDetailsValue.merchant_id})
+      let body = generateSearchBody(~searchText, ~merchant_id={merchantId})
 
       let response = await fetchDetails(url, body, Post)
 
diff --git a/src/screens/Analytics/GlobalSearchResults/GlobalSearchTables/ResultsTableUtils.res b/src/screens/Analytics/GlobalSearchResults/GlobalSearchTables/ResultsTableUtils.res
index 06d4f3437..f0271bdaf 100644
--- a/src/screens/Analytics/GlobalSearchResults/GlobalSearchTables/ResultsTableUtils.res
+++ b/src/screens/Analytics/GlobalSearchResults/GlobalSearchTables/ResultsTableUtils.res
@@ -3,7 +3,7 @@ let tableBorderClass = "border-collapse border border-jp-gray-940 border-solid b
 let useGetData = () => {
   open LogicUtils
   let body = Dict.make()
-  let merchantDetailsValue = HSwitchUtils.useMerchantDetailsValue()
+  let {userInfo: {merchantId}} = React.useContext(UserInfoProvider.defaultContext)
   let getURL = APIUtils.useGetURL()
   async (
     ~updateDetails: (
@@ -25,7 +25,7 @@ let useGetData = () => {
     if !(query->CommonAuthUtils.isValidEmail) {
       let filters = [("customer_email", [query->JSON.Encode.string]->JSON.Encode.array)]
       body->Dict.set("filters", filters->getJsonFromArrayOfJson)
-      body->Dict.set("query", merchantDetailsValue.merchant_id->JSON.Encode.string)
+      body->Dict.set("query", merchantId->JSON.Encode.string)
     } else {
       body->Dict.set("query", query->JSON.Encode.string)
     }
diff --git a/src/screens/Analytics/GlobalSearchResults/SearchResultsPage.res b/src/screens/Analytics/GlobalSearchResults/SearchResultsPage.res
index d6315ec92..010c6e07a 100644
--- a/src/screens/Analytics/GlobalSearchResults/SearchResultsPage.res
+++ b/src/screens/Analytics/GlobalSearchResults/SearchResultsPage.res
@@ -92,16 +92,14 @@ let make = () => {
   let query = UrlUtils.useGetFilterDictFromUrl("")->getString("query", "")
   let {globalSearch} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
   let permissionJson = Recoil.useRecoilValueFromAtom(HyperswitchAtom.userPermissionAtom)
-  let merchantDetailsValue = HSwitchUtils.useMerchantDetailsValue()
+  let {userInfo: {merchantId}} = React.useContext(UserInfoProvider.defaultContext)
+
   let isShowRemoteResults = globalSearch && permissionJson.operationsView === Access
 
   let getSearchResults = async results => {
     try {
       let url = getURL(~entityName=GLOBAL_SEARCH, ~methodType=Post)
-      let body = generateSearchBody(
-        ~searchText={query},
-        ~merchant_id={merchantDetailsValue.merchant_id},
-      )
+      let body = generateSearchBody(~searchText={query}, ~merchant_id={merchantId})
       let response = await fetchDetails(url, body, Post)
 
       let local_results = []
diff --git a/src/screens/Connectors/ConnectorMetaData/ApplePay/ApplePaySimplifiedFlow.res b/src/screens/Connectors/ConnectorMetaData/ApplePay/ApplePaySimplifiedFlow.res
index 7c96a3180..e282da87d 100644
--- a/src/screens/Connectors/ConnectorMetaData/ApplePay/ApplePaySimplifiedFlow.res
+++ b/src/screens/Connectors/ConnectorMetaData/ApplePay/ApplePaySimplifiedFlow.res
@@ -19,8 +19,7 @@ let make = (
   let url = RescriptReactRouter.useUrl()
   let form = ReactFinalForm.useForm()
   let connectorID = HSwitchUtils.getConnectorIDFromUrl(url.path->List.toArray, "")
-  let merchantDetailsValue = HSwitchUtils.useMerchantDetailsValue()
-  let merchantId = merchantDetailsValue.merchant_id
+  let {userInfo: {merchantId}} = React.useContext(UserInfoProvider.defaultContext)
   let formState: ReactFinalForm.formState = ReactFinalForm.useFormState(
     ReactFinalForm.useFormSubscription(["values"])->Nullable.make,
   )