diff --git a/packages/cashier/src/stores/__tests__/account-transfer-store.spec.ts b/packages/cashier/src/stores/__tests__/account-transfer-store.spec.ts index 05af9721d1e5..ae608f691253 100644 --- a/packages/cashier/src/stores/__tests__/account-transfer-store.spec.ts +++ b/packages/cashier/src/stores/__tests__/account-transfer-store.spec.ts @@ -365,15 +365,38 @@ describe('AccountTransferStore', () => { expect(account_transfer_store.minimum_fee).toBe('0.00000001'); }); - it('should set proper transfer limit for mt5 transfer', () => { + it('should use general limits even when transferring from an mt5 account', () => { (getCurrencies as jest.Mock).mockReturnValueOnce({ - USD: { transfer_between_accounts: { limits_mt5: { min: 1, max: 10 } } }, + USD: { + transfer_between_accounts: { + limits: { min: 0.01, max: 200 }, + limits_mt5: { min: 1, max: 1000 }, + }, + }, }); account_transfer_store.setSelectedFrom({ balance: 500, currency: 'USD', is_mt: true }); + account_transfer_store.setSelectedTo({ currency: 'USD', is_mt: false }); + account_transfer_store.setTransferLimit(); + + expect(account_transfer_store.transfer_limit).toEqual({ min: '0.01', max: '200.00' }); + }); + + it('should use general limits when transferring to mt5 from a non-mt5 account', () => { + (getCurrencies as jest.Mock).mockReturnValueOnce({ + USD: { + transfer_between_accounts: { + limits: { min: 0.01, max: 200 }, + limits_mt5: { min: 1, max: 1000 }, + }, + }, + }); + + account_transfer_store.setSelectedFrom({ balance: 500, currency: 'USD', is_mt: false }); + account_transfer_store.setSelectedTo({ currency: 'USD', is_mt: true }); account_transfer_store.setTransferLimit(); - expect(account_transfer_store.transfer_limit).toEqual({ min: '1.00', max: '10.00' }); + expect(account_transfer_store.transfer_limit).toEqual({ min: '0.01', max: '200.00' }); }); it('should set proper transfer limit for dxtrade transfer', () => { diff --git a/packages/cashier/src/stores/account-transfer-store.ts b/packages/cashier/src/stores/account-transfer-store.ts index 517ffd8f8e8a..34be0d48f7e2 100644 --- a/packages/cashier/src/stores/account-transfer-store.ts +++ b/packages/cashier/src/stores/account-transfer-store.ts @@ -238,7 +238,6 @@ export default class AccountTransferStore { setTransferLimit() { const transfer_limits = [ - { limits: 'limits_mt5', is_transfer: this.selected_from.is_mt || this.selected_to.is_mt }, { limits: 'limits_dxtrade', is_transfer: this.selected_from.is_dxtrade || this.selected_to.is_dxtrade }, { limits: 'limits_ctrader', is_transfer: this.selected_from.is_ctrader || this.selected_to.is_ctrader }, ];