Merge pull request #162 from nada-deriv/nada/FEQ-2419/country-list

Nada/FEQ-2419/fix: removed usecountrylist hook

Author: farrah-deriv

src/components/CopyAdForm/CopyAdForm.tsx

@@ -1,9 +1,10 @@
 import { Controller, FormProvider, NonUndefined, useForm } from 'react-hook-form';
 import { TCountryListItem, TCurrency, THooks } from 'types';
 import { RATE_TYPE } from '@/constants';
-import { api, useFloatingRate } from '@/hooks';
+import { useFloatingRate } from '@/hooks';
 import { AdFormInput } from '@/pages/my-ads/components/AdFormInput';
 import { formatTime, getValidationRules, restrictDecimalPlace } from '@/utils';
+import { useP2PCountryList } from '@deriv-com/api-hooks';
 import { Localize, useTranslations } from '@deriv-com/translations';
 import { InlineMessage, Text, useDevice } from '@deriv-com/ui';
 import { FloatingRate } from '../FloatingRate';
@@ -62,7 +63,9 @@ const CopyAdForm = ({ formValues, isModalOpen, onClickCancel, onFormSubmit, ...r
         mode: 'all',
     });
 
-    const { data: countryList = {} as TCountryListItem } = api.countryList.useGet();
+    const { data: countryList = {} as TCountryListItem } = useP2PCountryList({
+        refetchOnWindowFocus: false,
+    });
     const {
         control,
         formState: { isValid },

src/components/CopyAdForm/__tests__/CopyAdForm.spec.tsx

@@ -61,13 +61,11 @@ jest.mock('@/hooks/custom-hooks', () => {
     };
 });
 
-jest.mock('@/hooks', () => ({
-    ...jest.requireActual('@/hooks'),
-    api: {
-        countryList: {
-            useGet: jest.fn(() => ({ data: mockCountryList })),
-        },
-    },
+jest.mock('@deriv-com/api-hooks', () => ({
+    ...jest.requireActual('@deriv-com/api-hooks'),
+    useP2PCountryList: jest.fn(() => ({
+        data: mockCountryList,
+    })),
 }));
 
 describe('CopyAdForm', () => {

src/hooks/api/country/index.ts

@@ -3,7 +3,6 @@ export * from './advert';
 export * from './advertiser';
 export * from './chat';
 export * from './counterparty';
-export * from './country';
 export * from './order';
 export * from './order-dispute';
 export * from './order-review';

src/hooks/api/country/p2p-country-list/index.ts

@@ -6,6 +6,7 @@ import { AdCancelCreateEditModal, AdCreateEditErrorModal, AdCreateEditSuccessMod
 import { MY_ADS_URL, RATE_TYPE } from '@/constants';
 import { api } from '@/hooks';
 import { useFloatingRate, useModalManager, useQueryString } from '@/hooks/custom-hooks';
+import { useP2PCountryList } from '@deriv-com/api-hooks';
 import { Loader } from '@deriv-com/ui';
 import { LocalStorageConstants, LocalStorageUtils } from '@deriv-com/utils';
 import { AdWizard } from '../../components';
@@ -46,7 +47,9 @@ const CreateEditAd = () => {
     const { data: advertInfo, isLoading } = api.advert.useGet({ id: advertId ?? undefined }, !!advertId, false);
     const isEdit = !!advertId;
     const { hideModal, isModalOpenFor, showModal } = useModalManager({ shouldReinitializeModals: false });
-    const { data: countryList = {} as TCountryListItem } = api.countryList.useGet();
+    const { data: countryList = {} as TCountryListItem } = useP2PCountryList({
+        refetchOnWindowFocus: false,
+    });
     const { data: paymentMethodList = [] } = api.paymentMethods.useGet();
     const { floatRateOffsetLimitString, rateType } = useFloatingRate();
     const { data: activeAccount } = api.account.useActiveAccount();

src/hooks/api/country/p2p-country-list/useCountryList.ts

@@ -82,38 +82,6 @@ jest.mock('@/hooks', () => ({
                 },
             })),
         },
-        countryList: {
-            useGet: () => ({
-                data: {
-                    af: {
-                        country_name: 'Afghanistan',
-                        cross_border_ads_enabled: 1,
-                        fixed_rate_adverts: 'enabled',
-                        float_rate_adverts: 'disabled',
-                        float_rate_offset_limit: 10,
-                        local_currency: 'AFN',
-                        payment_methods: {
-                            alipay: {
-                                display_name: 'Alipay',
-                                fields: {
-                                    account: {
-                                        display_name: 'Alipay ID',
-                                        required: 1,
-                                        type: 'text',
-                                    },
-                                    instructions: {
-                                        display_name: 'Instructions',
-                                        required: 0,
-                                        type: 'memo',
-                                    },
-                                },
-                                type: 'ewallet',
-                            },
-                        },
-                    },
-                },
-            }),
-        },
         paymentMethods: {
             useGet: () => ({
                 data: [
@@ -184,6 +152,40 @@ jest.mock('@/hooks', () => ({
     },
 }));
 
+jest.mock('@deriv-com/api-hooks', () => ({
+    ...jest.requireActual('@deriv-com/api-hooks'),
+    useP2PCountryList: jest.fn(() => ({
+        data: {
+            af: {
+                country_name: 'Afghanistan',
+                cross_border_ads_enabled: 1,
+                fixed_rate_adverts: 'enabled',
+                float_rate_adverts: 'disabled',
+                float_rate_offset_limit: 10,
+                local_currency: 'AFN',
+                payment_methods: {
+                    alipay: {
+                        display_name: 'Alipay',
+                        fields: {
+                            account: {
+                                display_name: 'Alipay ID',
+                                required: 1,
+                                type: 'text',
+                            },
+                            instructions: {
+                                display_name: 'Instructions',
+                                required: 0,
+                                type: 'memo',
+                            },
+                        },
+                        type: 'ewallet',
+                    },
+                },
+            },
+        },
+    })),
+}));
+
 jest.mock('@/hooks/custom-hooks', () => {
     const modalManager = {
         hideModal: jest.fn(),

src/hooks/api/index.ts

@@ -4,7 +4,7 @@ import { AD_CONDITION_TYPES, ERROR_CODES } from '@/constants';
 import { api } from '@/hooks';
 import { useSendbirdServiceToken } from '@/hooks/api/account';
 import { useAdvertiserStats, useSendbird } from '@/hooks/custom-hooks';
-import { useExchangeRates } from '@deriv-com/api-hooks';
+import { useExchangeRates, useP2PCountryList } from '@deriv-com/api-hooks';
 import { useTranslations } from '@deriv-com/translations';
 import { Text } from '@deriv-com/ui';
 import { CurrencyConstants } from '@deriv-com/utils';
@@ -93,7 +93,7 @@ export namespace THooks {
         export type Get = NonNullable<ReturnType<typeof api.settings.useSettings>['data']>;
     }
     export namespace Country {
-        export type Get = NonNullable<ReturnType<typeof api.countryList.useGet>['data']>;
+        export type Get = NonNullable<ReturnType<typeof useP2PCountryList>['data']>;
     }
 }
 export type TOrders = NonNullable<ReturnType<typeof api.order.useGetList>['data']>;