From ac7bf7c510f570121023d4e030ba8eef29e769f4 Mon Sep 17 00:00:00 2001 From: lubega-deriv Date: Thu, 28 Aug 2025 13:40:11 +0800 Subject: [PATCH 1/2] feat: is eu region mf check --- packages/api-v2/src/hooks/useIsEuRegion.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/api-v2/src/hooks/useIsEuRegion.ts b/packages/api-v2/src/hooks/useIsEuRegion.ts index cca779a2856a..c8ea15fe8830 100644 --- a/packages/api-v2/src/hooks/useIsEuRegion.ts +++ b/packages/api-v2/src/hooks/useIsEuRegion.ts @@ -1,10 +1,14 @@ import { useMemo } from 'react'; + +import useActiveWalletAccount from './useActiveWalletAccount'; import useLandingCompany from './useLandingCompany'; /** * A hook to determine if region is Eu using the useLandingCompany hook */ const useIsEuRegion = () => { /** Retrieve landing company data*/ const { data: landing_company, ...rest } = useLandingCompany(); + const { data: activeWallet } = useActiveWalletAccount(); + const isMFAccount = activeWallet?.loginid?.startsWith('MF'); const isEuRegion = useMemo(() => { if (!landing_company) return false; @@ -32,18 +36,18 @@ const useIsEuRegion = () => { /** is region Eu based on residence */ const is_eu_based_on_residence = !shortcodes && is_residence_eu; - return is_financial_maltainvest || is_eu_based_on_shortcodes || is_eu_based_on_residence; - }, [landing_company]); + return isMFAccount && (is_financial_maltainvest || is_eu_based_on_shortcodes || is_eu_based_on_residence); + }, [isMFAccount, landing_company]); // New method to test, if this works will remove the legacy method above const isEUCountry = useMemo(() => { if (!landing_company) return; const { gaming_company, financial_company } = landing_company; - const isEuRegion = !gaming_company && financial_company?.shortcode === 'maltainvest'; + const isEuRegion = isMFAccount && !gaming_company && financial_company?.shortcode === 'maltainvest'; return isEuRegion; - }, [landing_company]); + }, [isMFAccount, landing_company]); return { /** A boolean flag indicating if the region is within the EU */ From 7e3a36482cc48c6ef5f7b6ff855b7978bc11ed04 Mon Sep 17 00:00:00 2001 From: lubega-deriv Date: Thu, 28 Aug 2025 14:11:21 +0800 Subject: [PATCH 2/2] feat: is eu region mf check --- packages/api-v2/src/hooks/useIsEuRegion.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/api-v2/src/hooks/useIsEuRegion.ts b/packages/api-v2/src/hooks/useIsEuRegion.ts index c8ea15fe8830..4e639e61db33 100644 --- a/packages/api-v2/src/hooks/useIsEuRegion.ts +++ b/packages/api-v2/src/hooks/useIsEuRegion.ts @@ -11,7 +11,7 @@ const useIsEuRegion = () => { const isMFAccount = activeWallet?.loginid?.startsWith('MF'); const isEuRegion = useMemo(() => { - if (!landing_company) return false; + if (!landing_company || !isMFAccount) return false; /** Regular expressions for EU shortcodes and excluded residence */ const eu_shortcode_regex = /^maltainvest$/; @@ -41,7 +41,7 @@ const useIsEuRegion = () => { // New method to test, if this works will remove the legacy method above const isEUCountry = useMemo(() => { - if (!landing_company) return; + if (!landing_company || !isMFAccount) return; const { gaming_company, financial_company } = landing_company; const isEuRegion = isMFAccount && !gaming_company && financial_company?.shortcode === 'maltainvest';