Merge pull request #1233 from bitholla/testnet

Testnet

.drone.yml

@@ -125,6 +125,8 @@ steps:
       from_secret: hollaex_email
     HOLLAEX_PASSWORD:
       from_secret: hollaex_password
+    HOLLAEX_LOGIN_KEY:
+      from_secret: hollaex_network_testnet_login_key
   settings:
     exchange_id: 176
     exchange_name: "Sandbox HollaEx"
@@ -172,6 +174,8 @@ steps:
       from_secret: next_email
     HOLLAEX_PASSWORD:
       from_secret: next_password
+    HOLLAEX_LOGIN_KEY:
+      from_secret: hollaex_network_testnet_login_key
   settings:
     exchange_id: 539
     exchange_name: "Next"

server/api/swagger/swagger.yaml

@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  version: "2.2.9"
+  version: "2.2.10"
   title: HollaEx Kit
 host: api.hollaex.com
 basePath: /v2

server/package.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.2.9",
+	"version": "2.2.10",
 	"private": false,
 	"description": "HollaEx Kit",
 	"keywords": [

version

@@ -1 +1 @@
-2.2.9
+2.2.10

web/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hollaex-kit",
-	"version": "2.2.9",
+	"version": "2.2.10",
 	"private": true,
 	"dependencies": {
 		"@ant-design/compatible": "1.0.5",

web/src/containers/Withdraw/form.js

@@ -17,7 +17,7 @@ import {
 	setWithdrawEmailConfirmation,
 	setWithdrawNotificationError,
 } from './notifications';
-import { BASE_CURRENCY } from 'config/constants';
+import { BASE_CURRENCY, DEFAULT_COIN_DATA } from 'config/constants';
 import { calculateBaseFee } from './utils';
 import Fiat from 'containers/Deposit/Fiat';
 import Image from 'components/Image';
@@ -31,17 +31,46 @@ const selector = formValueSelector(FORM_NAME);
 let errorTimeOut = null;
 
 const validate = (values, props) => {
+	const { currency, coins, balance } = props;
+	const { withdrawal_fees } = coins[currency] || DEFAULT_COIN_DATA;
+	const { network } = values;
+
 	const errors = {};
 	const amount = math.fraction(values.amount || 0);
 	const fee = math.fraction(values.fee || 0);
-	const balance = math.fraction(props.balanceAvailable || 0);
+	const balanceAvailable = math.fraction(props.balanceAvailable || 0);
+	let fee_coin;
 
-	const totalTransaction = math.add(fee, amount);
-	if (math.larger(totalTransaction, balance)) {
-		errors.amount = STRINGS.formatString(
-			STRINGS['WITHDRAWALS_LOWER_BALANCE'],
-			math.number(totalTransaction)
+	if (withdrawal_fees && network && withdrawal_fees[network]) {
+		fee_coin = withdrawal_fees[network].symbol;
+		const fullFeeCoinName = coins[fee_coin].fullname;
+		const availableFeeBalance = math.fraction(
+			balance[`${fee_coin}_available`] || 0
 		);
+		const totalTransaction = amount;
+		const totalFee = fee;
+
+		if (math.larger(totalTransaction, balanceAvailable)) {
+			errors.amount = STRINGS.formatString(
+				STRINGS['WITHDRAWALS_LOWER_BALANCE'],
+				math.number(totalTransaction)
+			);
+		}
+
+		if (math.larger(totalFee, availableFeeBalance)) {
+			errors.amount = STRINGS.formatString(
+				STRINGS['WITHDRAWALS_LOWER_BALANCE'],
+				`${math.number(totalFee)} ${fullFeeCoinName}`
+			);
+		}
+	} else {
+		const totalTransaction = math.add(fee, amount);
+		if (math.larger(totalTransaction, balanceAvailable)) {
+			errors.fee = STRINGS.formatString(
+				STRINGS['WITHDRAWALS_LOWER_BALANCE'],
+				math.number(totalTransaction)
+			);
+		}
 	}
 
 	return errors;
@@ -306,6 +335,7 @@ const mapStateToForm = (state) => ({
 	activeTheme: state.app.theme,
 	coins: state.app.coins,
 	targets: state.app.targets,
+	balance: state.user.balance,
 });
 
 const WithdrawFormWithValues = connect(mapStateToForm)(WithdrawForm);