From a0a3a2b6e02479a451bf3414961e962b4dfe73c8 Mon Sep 17 00:00:00 2001 From: fetok12 Date: Wed, 26 Jun 2024 10:57:43 +0300 Subject: [PATCH 1/3] check-balance-fix-condition --- server/plugins/job.js | 2 +- server/utils/hollaex-tools-lib/tools/p2p.js | 2 +- server/utils/hollaex-tools-lib/tools/stake.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/plugins/job.js b/server/plugins/job.js index 74e24fe74f..26af538b97 100644 --- a/server/plugins/job.js +++ b/server/plugins/job.js @@ -33,7 +33,7 @@ const unstakingCheckRunner = () => { let symbols = {}; for (const key of Object.keys(balance)) { - if (key.includes('available') && balance[key]) { + if (key.includes('available') && balance[key] != null) { let symbol = key?.split('_')?.[0]; symbols[symbol] = balance[key]; } diff --git a/server/utils/hollaex-tools-lib/tools/p2p.js b/server/utils/hollaex-tools-lib/tools/p2p.js index dd13c8ec47..0be1f04f55 100644 --- a/server/utils/hollaex-tools-lib/tools/p2p.js +++ b/server/utils/hollaex-tools-lib/tools/p2p.js @@ -187,7 +187,7 @@ const getP2PAccountBalance = async (account_id, coin) => { let symbols = {}; for (const key of Object.keys(balance)) { - if (key.includes('available') && balance[key]) { + if (key.includes('available') && balance[key] != null) { let symbol = key?.split('_')?.[0]; symbols[symbol] = balance[key]; } diff --git a/server/utils/hollaex-tools-lib/tools/stake.js b/server/utils/hollaex-tools-lib/tools/stake.js index 1bce9695bc..585cd64d93 100644 --- a/server/utils/hollaex-tools-lib/tools/stake.js +++ b/server/utils/hollaex-tools-lib/tools/stake.js @@ -140,7 +140,7 @@ const getSourceAccountBalance = async (account_id, coin) => { let symbols = {}; for (const key of Object.keys(balance)) { - if (key.includes('available') && balance[key]) { + if (key.includes('available') && balance[key] != null) { let symbol = key?.split('_')?.[0]; symbols[symbol] = balance[key]; } From c0434f828deae1e19fa8e052939ef0b777ffb30e Mon Sep 17 00:00:00 2001 From: fetok12 Date: Wed, 26 Jun 2024 12:53:55 +0300 Subject: [PATCH 2/3] p2p-setting-admin-bug-fix --- web/src/containers/Admin/Trades/p2pSettings.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/src/containers/Admin/Trades/p2pSettings.js b/web/src/containers/Admin/Trades/p2pSettings.js index 2be21e534a..6d61c7f503 100644 --- a/web/src/containers/Admin/Trades/p2pSettings.js +++ b/web/src/containers/Admin/Trades/p2pSettings.js @@ -1104,7 +1104,9 @@ const P2PSettings = ({ coins, pairs, p2p_config, features }) => { } }); - setPaymentMethods([...p2p_config?.bank_payment_methods, ...methods]); + if (p2p_config?.bank_payment_methods?.length > 0) { + setPaymentMethods([...p2p_config?.bank_payment_methods, ...methods]); + } }, []); const handleEmailChange = (value) => { From dc7ee80b106bfe2c7bea6b19b86f03831fe54298 Mon Sep 17 00:00:00 2001 From: Ali Beikverdi Date: Thu, 27 Jun 2024 00:34:32 +0900 Subject: [PATCH 3/3] version update --- server/api/swagger/swagger.js | 2 +- server/package.json | 2 +- version | 2 +- web/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/api/swagger/swagger.js b/server/api/swagger/swagger.js index 1401fbcc55..ba2702b9b6 100644 --- a/server/api/swagger/swagger.js +++ b/server/api/swagger/swagger.js @@ -4,7 +4,7 @@ const definition = { swagger: '2.0', info: { title: 'HollaEx Kit', - version: '2.11.0' + version: '2.11.1' }, host: 'api.hollaex.com', basePath: '/v2', diff --git a/server/package.json b/server/package.json index 0a6ead8b66..78c7dd1ee2 100644 --- a/server/package.json +++ b/server/package.json @@ -1,5 +1,5 @@ { - "version": "2.11.0", + "version": "2.11.1", "private": false, "description": "HollaEx Kit", "keywords": [ diff --git a/version b/version index ed0edc885b..c200bec4af 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.11.0 \ No newline at end of file +2.11.1 \ No newline at end of file diff --git a/web/package.json b/web/package.json index 6845ab6aa4..8acae8f353 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "hollaex-kit", - "version": "2.11.0", + "version": "2.11.1", "private": true, "dependencies": { "@ant-design/compatible": "1.0.5",