Merge pull request #578 from bitholla/2.0-develop

2.0 develop

server/api/controllers/admin.js

@@ -610,7 +610,8 @@ const mintAsset = (req, res) => {
 		user_id,
 		currency,
 		amount,
-		description
+		description,
+		transaction_id
 	} = req.swagger.params.data.value;
 
 	loggerAdmin.info(
@@ -620,15 +621,17 @@ const mintAsset = (req, res) => {
 		'currency',
 		currency,
 		'amount',
-		amount
+		amount,
+		'transaction_id',
+		transaction_id
 	);
 
 	toolsLib.user.getUserByKitId(user_id)
 		.then((user) => {
 			if (!user) {
 				throw new Error(USER_NOT_FOUND);
 			}
-			return toolsLib.wallet.mintAssetByNetworkId(user.network_id, currency, amount, description);
+			return toolsLib.wallet.mintAssetByNetworkId(user.network_id, currency, amount, description, transaction_id);
 		})
 		.then(() => {
 			return res.json({ message: 'Success' });
@@ -649,7 +652,8 @@ const burnAsset = (req, res) => {
 		user_id,
 		currency,
 		amount,
-		description
+		description,
+		transaction_id
 	} = req.swagger.params.data.value;
 
 	loggerAdmin.info(
@@ -659,15 +663,17 @@ const burnAsset = (req, res) => {
 		'currency',
 		currency,
 		'amount',
-		amount
+		amount,
+		'transaction_id',
+		transaction_id
 	);
 
 	toolsLib.user.getUserByKitId(user_id)
 		.then((user) => {
 			if (!user) {
 				throw new Error(USER_NOT_FOUND);
 			}
-			return toolsLib.wallet.burnAssetByNetworkId(user.network_id, currency, amount, description);
+			return toolsLib.wallet.burnAssetByNetworkId(user.network_id, currency, amount, description, transaction_id);
 		})
 		.then(() => {
 			return res.json({ message: 'Success' });

server/api/swagger/swagger.yaml

@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  version: "2.0.7"
+  version: "2.0.8"
   title: HollaEx Kit
 host: api.hollaex.com
 basePath: /v2
@@ -4274,4 +4274,6 @@ definitions:
         type: string
       amount:
         type: number
-        format: double
+        format: double
+      transaction_id:
+        type: string

server/package.json

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

version

@@ -1 +1 @@
-2.0.7
+2.0.8

web/package.json

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

web/src/components/Form/validations.js

@@ -229,7 +229,7 @@ export const normalizeInt = (value) => {
 };
 export const normalizeFloat = (value) => {
 	if (validator.isFloat(value)) {
-		return validator.toFloat(value);
+		return math.format(validator.toFloat(value), { notation: 'fixed' });
 	} else if (value === '0' || value === 0) {
 		return 0;
 	} else {