Aswathy/CRO 493/add affiliate id with new analytics version (binary-c…

…om#7590) * chore: update types and aprroach with new verion of analytics and add new field * chore: cleanup * chore: return custom slgify back --------- Co-authored-by: deriv <[email protected]>
yaswanth-deriv · Apr 16, 2024 · 6bdd753 · 6bdd753
1 parent 8005584
commit 6bdd753
Show file tree

Hide file tree

Showing 4 changed files with 4,658 additions and 4,654 deletions.
diff --git a/themes/gatsby-theme-deriv/src/pages/signup-affiliates/components/_account-plan.tsx b/themes/gatsby-theme-deriv/src/pages/signup-affiliates/components/_account-plan.tsx
@@ -4,12 +4,12 @@ import { StyledHeader } from '../utils/_affiliate-header'
 import AccountCard, { AccountCardProps, MainWrapper } from '../utils/_account-card'
 import { Localize } from 'components/localization'
 import { useIsRtl } from 'components/hooks/use-isrtl'
+import { cpa_plan_countries, eu_countries } from 'common/country-base'
 import Revenue from 'images/svg/signup-affiliates/revenue.svg'
 import Turnover from 'images/svg/signup-affiliates/turnover.svg'
 import CPA from 'images/svg/signup-affiliates/cpa.svg'
-import useBuildVariant from 'features/hooks/use-build-variant'
 
-const getPlans = (is_cpa_plan_aff: boolean): AccountCardProps[] => {
+const getPlans = (country: string): AccountCardProps[] => {
     const plans: AccountCardProps[] = [
         {
             value: 2,
@@ -26,7 +26,7 @@ const getPlans = (is_cpa_plan_aff: boolean): AccountCardProps[] => {
                 "_t_Earn based on each contract's payout probability or client's trade. <0>Learn more</>_t_",
         },
     ]
-    if (is_cpa_plan_aff) {
+    if (cpa_plan_countries.includes(country) || eu_countries.includes(country)) {
         plans.push({
             value: 6,
             icon: CPA,
@@ -46,11 +46,11 @@ const AccountPlan = ({
     affiliate_account,
     updateData,
     onValidate,
-    is_cpa_plan_aff,
-}: AccountPlanProps) => {
+}: WizardStepProps<'account_plan'>) => {
     const [account_plan, setAccountPlan] = useState(affiliate_account.account_plan)
     const is_rtl = useIsRtl()
-    const plans = getPlans(is_cpa_plan_aff)
+    const plans = getPlans(affiliate_account.account_address.country.symbol)
+
     useEffect(() => {
         updateData(account_plan)
         onValidate(!!account_plan)

diff --git a/themes/gatsby-theme-deriv/src/pages/signup-affiliates/index.tsx b/themes/gatsby-theme-deriv/src/pages/signup-affiliates/index.tsx
@@ -1,4 +1,5 @@
 import React, { useEffect, useState } from 'react'
+import { Analytics } from '@deriv-com/analytics'
 import styled from 'styled-components'
 import { Submit, trackEvent } from './utils/_utils'
 import { AffiliateAccountTypes, SignUpStatusTypes } from './_types'
@@ -111,6 +112,7 @@ const AffiliateSignup = ({ pageContext }: TGatsbyHead) => {
                     JSON.stringify(affiliate_api_error?.echo_req) ||
                     'success, but without echo_req',
                 success_source: partner_signup_error_message ? 'failed_popup' : 'last_step',
+                affiliate_id: affiliate_api_data?.affiliate_user_id,
             })
             setSignupStatus('success')
         } else if (partner_signup_error_message == 'Username not available') {
@@ -147,7 +149,7 @@ const AffiliateSignup = ({ pageContext }: TGatsbyHead) => {
 
     return (
         <Layout type="affiliates" padding_top="7" show_footer={false} region={region}>
-            <ParentWrapper pop_up_opened={!!signup_status}>
+            <ParentWrapper isPopupOpen={!!signup_status}>
                 <AtomicContainer.Fluid dir="row">
                     <StyledContainer>
                         {show_wizard ? (

diff --git a/themes/gatsby-theme-deriv/src/pages/signup-affiliates/utils/_utils.tsx b/themes/gatsby-theme-deriv/src/pages/signup-affiliates/utils/_utils.tsx
@@ -1,6 +1,25 @@
 import { Analytics, TEvents } from '@deriv-com/analytics'
 import { SubmitTypes } from '../_types'
 
+const customSlugify = (text: string): string => {
+    const charMap: { [key: string]: string } = {
+        ə: 'e',
+        '(': ' ',
+        ')': ' ',
+        // Add other special characters and their mappings here if needed
+    }
+    return text
+        .toString()
+        .split('')
+        .map((char) => charMap[char] || char)
+        .join('')
+        .normalize('NFD')
+        .replace(/[\u0300-\u036f]/g, '')
+        .trim()
+        .replace(/'/g, '')
+        .replace(/--+/g, '-')
+}
+
 export const Submit = ({
     is_online,
     affiliate_account,
@@ -22,7 +41,7 @@ export const Submit = ({
             country: affiliate_account.account_address.country.symbol,
             address_city: affiliate_account.account_address.city.trim(),
             address_postcode: affiliate_account.account_address.postal_code.trim(),
-            address_state: affiliate_account.account_address.state.symbol,
+            address_state: customSlugify(affiliate_account.account_address.state.name),
             address_street: affiliate_account.account_address.street.trim(),
             first_name: affiliate_account.account_details.first_name.trim(),
             last_name: affiliate_account.account_details.last_name.trim(),
@@ -56,23 +75,6 @@ export const Submit = ({
         })
 }
 
-export const trackEvent = ({
-    action,
-    email,
-    partner_signup_error_message,
-    user_choice,
-    success_source,
-    step_num,
-    step_codename,
-}: TEvents['ce_partner_account_signup_form']) => {
-    Analytics?.trackEvent('ce_partner_account_signup_form', {
-        action,
-        form_name: 'ce_partner_account_signup_form',
-        ...(email && { email }),
-        ...(user_choice && { user_choice }),
-        ...(success_source && { success_source }),
-        ...(step_num && { step_num }),
-        ...(step_codename && { step_codename }),
-        ...(partner_signup_error_message && { partner_signup_error_message }),
-    })
+export const trackEvent = (eventData: TEvents['ce_partner_account_signup_form']) => {
+    Analytics?.trackEvent('ce_partner_account_signup_form', eventData)
 }