Merge branch 'master' of github.com:deriv-com/p2p into optimise-some-bundles

Author: adrienne-deriv

src/components/ProfileContent/ProfileBalance/ProfileBalance.tsx

@@ -2,10 +2,10 @@ import { useMemo, useState } from 'react';
 import { DeepPartial, TAdvertiserStats } from 'types';
 import { AvailableP2PBalanceModal } from '@/components/Modals';
 import { api } from '@/hooks';
-import { numberToCurrencyText } from '@/utils';
 import { LabelPairedCircleInfoMdRegularIcon } from '@deriv/quill-icons';
 import { Localize } from '@deriv-com/translations';
 import { Text, useDevice } from '@deriv-com/ui';
+import { FormatUtils } from '@deriv-com/utils';
 import { ProfileDailyLimit } from '../ProfileDailyLimit';
 import './ProfileBalance.scss';
 
@@ -18,13 +18,13 @@ const ProfileBalance = ({ advertiserStats }: { advertiserStats: DeepPartial<TAdv
     const dailyLimits = useMemo(
         () => [
             {
-                available: `${numberToCurrencyText(advertiserStats?.dailyAvailableBuyLimit || 0)} ${currency}`,
-                dailyLimit: `${advertiserStats?.daily_buy_limit || numberToCurrencyText(0)} ${currency}`,
+                available: `${FormatUtils.formatMoney(advertiserStats?.dailyAvailableBuyLimit || 0)} ${currency}`,
+                dailyLimit: `${advertiserStats?.daily_buy_limit || FormatUtils.formatMoney(0)} ${currency}`,
                 type: 'Buy',
             },
             {
-                available: `${numberToCurrencyText(advertiserStats?.dailyAvailableSellLimit || 0)} ${currency}`,
-                dailyLimit: `${advertiserStats?.daily_sell_limit || numberToCurrencyText(0)} ${currency}`,
+                available: `${FormatUtils.formatMoney(advertiserStats?.dailyAvailableSellLimit || 0)} ${currency}`,
+                dailyLimit: `${advertiserStats?.daily_sell_limit || FormatUtils.formatMoney(0)} ${currency}`,
                 type: 'Sell',
             },
         ],
@@ -58,7 +58,7 @@ const ProfileBalance = ({ advertiserStats }: { advertiserStats: DeepPartial<TAdv
                         />
                     </div>
                     <Text size={isMobile ? '2xl' : 'xl'} weight='bold'>
-                        {numberToCurrencyText(advertiserStats?.balance_available || 0)} USD
+                        {FormatUtils.formatMoney(advertiserStats?.balance_available || 0)} USD
                     </Text>
                 </div>
                 <div className='flex flex-col gap-[1.6rem]'>

src/pages/my-profile/screens/MyProfileStats/MyProfileStats.tsx

@@ -1,9 +1,9 @@
 import { useState } from 'react';
 import { api } from '@/hooks';
 import { useAdvertiserStats } from '@/hooks/custom-hooks';
-import { numberToCurrencyText } from '@/utils';
 import { useTranslations } from '@deriv-com/translations';
 import { Loader } from '@deriv-com/ui';
+import { FormatUtils } from '@deriv-com/utils';
 import MyProfileStatsItem from './MyProfileStatsItem';
 import './MyProfileStats.scss';
 
@@ -66,8 +66,8 @@ const MyProfileStats = ({ advertiserId }: TMyProfileStatsProps) => {
                 testId='dt_profile_stats_trade_volume'
                 value={
                     shouldShowTradeVolumeLifetime
-                        ? numberToCurrencyText(tradeVolumeLifetime)
-                        : numberToCurrencyText(tradeVolume)
+                        ? FormatUtils.formatMoney(tradeVolumeLifetime)
+                        : FormatUtils.formatMoney(tradeVolume)
                 }
             />
             <MyProfileStatsItem

src/utils/__tests__/payment-methods.spec.ts

@@ -0,0 +1,59 @@
+import { THooks, TPaymentMethod } from 'types';
+import {
+    getPaymentMethodObjects,
+    sortPaymentMethods,
+    sortPaymentMethodsWithAvailability,
+    TGetPaymentMethodObjects,
+} from '../payment-methods';
+
+type TSortPaymentMethodsList = (TPaymentMethod & { isAvailable?: boolean })[];
+
+describe('payment-methods', () => {
+    describe('getPaymentMethodObjects', () => {
+        it('should return an object with payment methods as keys', () => {
+            const paymentMethods = [
+                { display_name: 'Bank Transfer', id: '1' },
+                { display_name: 'Alipay', id: '2' },
+            ];
+            const result = getPaymentMethodObjects(paymentMethods as TGetPaymentMethodObjects);
+            expect(result).toEqual({
+                Alipay: { display_name: 'Alipay', id: '2' },
+                'Bank Transfer': { display_name: 'Bank Transfer', id: '1' },
+            });
+        });
+
+        it('should return an empty object if the paymentMethodsList is empty', () => {
+            const paymentMethods: TGetPaymentMethodObjects = [];
+            const result = getPaymentMethodObjects(paymentMethods);
+            expect(result).toEqual({});
+        });
+
+        it('should return an empty object if paymentMethodsList is undefined', () => {
+            // @ts-expect-error - Testing for undefined
+            const result = getPaymentMethodObjects(undefined);
+            expect(result).toEqual({});
+        });
+    });
+
+    describe('sortPaymentMethods', () => {
+        it('should sort the payment methods based on their order', () => {
+            const paymentMethods = [{ method: 'bank_transfer' }, { method: 'other' }, { method: 'alipay' }];
+            const result = sortPaymentMethods(paymentMethods as THooks.AdvertiserPaymentMethods.Get);
+            expect(result).toEqual([{ method: 'bank_transfer' }, { method: 'alipay' }, { method: 'other' }]);
+        });
+    });
+
+    describe('sortPaymentMethodsWithAvailability', () => {
+        it('should sort the payment methods based on their availability', () => {
+            const paymentMethods = [
+                { isAvailable: false, method: 'bank_transfer' },
+                { isAvailable: true, method: 'alipay' },
+            ];
+            const result = sortPaymentMethodsWithAvailability(paymentMethods as unknown as TSortPaymentMethodsList);
+            expect(result).toEqual([
+                { isAvailable: true, method: 'alipay' },
+                { isAvailable: false, method: 'bank_transfer' },
+            ]);
+        });
+    });
+});

src/utils/currency.ts

@@ -1,6 +1,5 @@
 export * from './ad-utils';
 export * from './adverts';
-export * from './currency';
 export * from './date';
 export * from './file-dropzone';
 export * from './file-uploader';

src/utils/index.ts

@@ -21,7 +21,7 @@ export const sortPaymentMethods = (paymentMethodsList: THooks.AdvertiserPaymentM
     return paymentMethodsList?.sort((i, j) => getPaymentMethodOrder(i.method) - getPaymentMethodOrder(j.method));
 };
 
-type TGetPaymentMethodObjects = THooks.AdvertiserPaymentMethods.Get | THooks.PaymentMethods.Get;
+export type TGetPaymentMethodObjects = THooks.AdvertiserPaymentMethods.Get | THooks.PaymentMethods.Get;
 type TField = Extract<keyof TGetPaymentMethodObjects[0], 'display_name' | 'id'>;
 /**
  * Retrieves the payment method objects.