refactor: code refactor

Author: sakksham7

src/PaymentElement.res

@@ -37,7 +37,6 @@ let make = (~cardProps, ~expiryProps, ~cvcProps, ~paymentType: CardThemeType.mod
   let (paymentMethodListValue, setPaymentMethodListValue) = Recoil.useRecoilState(
     paymentMethodListValue,
   )
-  let paymentMethodsListV2 = Recoil.useRecoilValueFromAtom(RecoilAtomsV2.paymentsListValue)
 
   let (sessions, setSessions) = React.useState(_ => Dict.make()->JSON.Encode.object)
   let (paymentOptions, setPaymentOptions) = React.useState(_ => [])
@@ -189,11 +188,7 @@ let make = (~cardProps, ~expiryProps, ~cvcProps, ~paymentType: CardThemeType.mod
     paypalToken,
     isPaypalSDKFlow,
     isPaypalRedirectFlow,
-  } = PayPalHelpers.usePaymentMethodExperience(
-    ~paymentMethodListValue,
-    ~paymentMethodsListV2,
-    ~sessionObj,
-  )
+  } = PayPalHelpers.usePaymentMethodExperience(~paymentMethodListValue, ~sessionObj)
 
   React.useEffect(() => {
     switch paymentMethodList {

src/Payments/PayPalHelpers.res

@@ -7,38 +7,45 @@ type paypalExperienceData = {
   isPaypalRedirectFlow: bool,
 }
 
-let usePaymentMethodExperience = (
-  ~paymentMethodListValue,
-  ~paymentMethodsListV2: UnifiedPaymentsTypesV2.paymentMethodsManagement,
-  ~sessionObj: sessions,
-) => {
-  let paypalPaymentMethodExperience = React.useMemo(() => {
-    switch GlobalVars.sdkVersion {
-    | V1 =>
-      getPaymentExperienceTypeFromPML(
-        ~paymentMethodList=paymentMethodListValue,
-        ~paymentMethodName="wallet",
-        ~paymentMethodType="paypal",
-      )
-    | V2 =>
-      V2Helpers.getPaymentExperienceTypeFromPML(
-        ~paymentMethodList=paymentMethodsListV2,
-        ~paymentMethodName="wallet",
-        ~paymentMethodType="paypal",
-      )
-    }
-  }, (paymentMethodListValue, paymentMethodsListV2))
-
+let usePaypalTokenAndFlowFromExperience = (~paypalExperience, ~sessionObj: sessions) => {
   let paypalToken = React.useMemo(
     () => getPaymentSessionObj(sessionObj.sessionsToken, Paypal),
     [sessionObj],
   )
-  let isPaypalSDKFlow = paypalPaymentMethodExperience->Array.includes(InvokeSDK)
-  let isPaypalRedirectFlow = paypalPaymentMethodExperience->Array.includes(RedirectToURL)
+
+  let isPaypalSDKFlow = paypalExperience->Array.includes(InvokeSDK)
+  let isPaypalRedirectFlow = paypalExperience->Array.includes(RedirectToURL)
 
   {
     paypalToken,
     isPaypalSDKFlow,
     isPaypalRedirectFlow,
   }
 }
+
+let usePaymentMethodExperience = (~paymentMethodListValue, ~sessionObj: sessions) => {
+  let paypalPaymentMethodExperience = React.useMemo(() => {
+    getPaymentExperienceTypeFromPML(
+      ~paymentMethodList=paymentMethodListValue,
+      ~paymentMethodName="wallet",
+      ~paymentMethodType="paypal",
+    )
+  }, [paymentMethodListValue])
+
+  usePaypalTokenAndFlowFromExperience(~paypalExperience=paypalPaymentMethodExperience, ~sessionObj)
+}
+
+let usePaymentMethodExperienceV2 = (
+  ~paymentMethodsListV2: UnifiedPaymentsTypesV2.paymentMethodsManagement,
+  ~sessionObj: sessions,
+) => {
+  let paypalPaymentMethodExperience = React.useMemo(() => {
+    V2Helpers.getPaymentExperienceTypeFromPML(
+      ~paymentMethodList=paymentMethodsListV2,
+      ~paymentMethodName="wallet",
+      ~paymentMethodType="paypal",
+    )
+  }, [paymentMethodsListV2])
+
+  usePaypalTokenAndFlowFromExperience(~paypalExperience=paypalPaymentMethodExperience, ~sessionObj)
+}

src/Payments/PaymentRequestButtonElement.res

@@ -47,21 +47,20 @@ module WalletsSaveDetailsText = {
 @react.component
 let make = (~sessions, ~walletOptions) => {
   open SessionsType
+  open PayPalHelpers
   let dict = sessions->Utils.getDictFromJson
   let paymentMethodListValue = Recoil.useRecoilValueFromAtom(PaymentUtils.paymentMethodListValue)
   let paymentMethodsListV2 = Recoil.useRecoilValueFromAtom(RecoilAtomsV2.paymentsListValue)
 
   let sessionObj = React.useMemo(() => itemToObjMapper(dict, Others), [dict])
 
-  let {
-    paypalToken,
-    isPaypalSDKFlow,
-    isPaypalRedirectFlow,
-  } = PayPalHelpers.usePaymentMethodExperience(
-    ~paymentMethodListValue,
-    ~paymentMethodsListV2,
-    ~sessionObj,
-  )
+  let paypalFlowInfoV1 = usePaymentMethodExperience(~paymentMethodListValue, ~sessionObj)
+  let paypalFlowInfoV2 = usePaymentMethodExperienceV2(~paymentMethodsListV2, ~sessionObj)
+
+  let {paypalToken, isPaypalSDKFlow, isPaypalRedirectFlow} = switch GlobalVars.sdkVersion {
+  | V1 => paypalFlowInfoV1
+  | V2 => paypalFlowInfoV2
+  }
 
   let gPayToken = getPaymentSessionObj(sessionObj.sessionsToken, Gpay)
   let applePaySessionObj = itemToObjMapper(dict, ApplePayObject)

src/Utilities/PaymentUtils.res

@@ -324,11 +324,7 @@ let getIsKlarnaSDKFlow = sessions => {
   }
 }
 
-let usePaypalFlowStatus = (
-  ~sessions,
-  ~paymentMethodListValue,
-  ~paymentMethodsListV2: UnifiedPaymentsTypesV2.paymentMethodsManagement,
-) => {
+let usePaypalFlowStatus = (~sessions, ~paymentMethodListValue) => {
   open Utils
 
   let sessionObj =
@@ -340,11 +336,7 @@ let usePaypalFlowStatus = (
     paypalToken,
     isPaypalSDKFlow,
     isPaypalRedirectFlow,
-  } = PayPalHelpers.usePaymentMethodExperience(
-    ~paymentMethodListValue,
-    ~paymentMethodsListV2,
-    ~sessionObj,
-  )
+  } = PayPalHelpers.usePaymentMethodExperience(~paymentMethodListValue, ~sessionObj)
 
   let isPaypalTokenExist = switch paypalToken {
   | OtherTokenOptional(optToken) =>
@@ -371,7 +363,6 @@ let useGetPaymentMethodList = (~paymentOptions, ~paymentType, ~sessions) => {
   let isKlarnaSDKFlow = getIsKlarnaSDKFlow(sessions)
 
   let paymentMethodListValue = Recoil.useRecoilValueFromAtom(paymentMethodListValue)
-  let paymentMethodsListV2 = Recoil.useRecoilValueFromAtom(RecoilAtomsV2.paymentsListValue)
 
   let areAllApplePayRequiredFieldsPrefilled = useAreAllRequiredFieldsPrefilled(
     ~paymentMethodListValue,
@@ -397,7 +388,6 @@ let useGetPaymentMethodList = (~paymentOptions, ~paymentType, ~sessions) => {
   let (isPaypalSDKFlow, isPaypalRedirectFlow, isPaypalTokenExist) = usePaypalFlowStatus(
     ~sessions,
     ~paymentMethodListValue,
-    ~paymentMethodsListV2,
   )
 
   React.useMemo(() => {