Merge pull request #1884 from hollaex/hotfix

Changes for the 'Third party plugin file upgrade' notion task.

server/api/swagger/swagger.yaml

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

server/config/middleware.js

@@ -60,7 +60,7 @@ const rateLimitMiddleware = (app) => {
 			return next();
 		},
 		onRateLimited: function (req, res, next) {
-			logger.verbose('config/middleware/rateLimitMiddleware', 'ALERT', 'request-withdrawal');
+			logger.verbose('config/middleware/rateLimitMiddleware', 'abuse', 'request-withdrawal');
 			return res.status(429).json({ message: 'Too many requests. Your account is blocked for 2 minutes' });
 		}
 	});
@@ -71,7 +71,7 @@ const rateLimitMiddleware = (app) => {
 		expire: 1000 * 60 * 2,
 		lookup: 'headers.x-forwarded-for',
 		onRateLimited: function (req, res, next) {
-			logger.verbose('config/middleware/rateLimitMiddleware', 'ALERT', 'signup');
+			logger.verbose('config/middleware/rateLimitMiddleware', 'abuse', 'signup');
 			return res.status(429).json({ message: 'Too many requests. Your account is blocked for 2 minutes' });
 		}
 	});
@@ -82,7 +82,7 @@ const rateLimitMiddleware = (app) => {
 		expire: 1000 * 60 * 2,
 		lookup: 'headers.x-forwarded-for',
 		onRateLimited: function (req, res, next) {
-			logger.verbose('config/middleware/rateLimitMiddleware', 'ALERT', 'login');
+			logger.verbose('config/middleware/rateLimitMiddleware', 'abuse', 'login');
 			return res.status(429).json({ message: 'Too many requests. Your account is blocked for 2 minutes' });
 		}
 	});
@@ -93,7 +93,7 @@ const rateLimitMiddleware = (app) => {
 		expire: 1000 * 60 * 2,
 		lookup: 'headers.x-forwarded-for',
 		onRateLimited: function (req, res, next) {
-			logger.verbose('config/middleware/rateLimitMiddleware', 'ALERT', 'get verify');
+			logger.verbose('config/middleware/rateLimitMiddleware', 'abuse', 'get verify');
 			return res.status(429).json({ message: 'Too many requests. Your account is blocked for 2 minutes' });
 		}
 	});
@@ -104,7 +104,7 @@ const rateLimitMiddleware = (app) => {
 		expire: 1000 * 60 * 2,
 		lookup: 'headers.x-forwarded-for',
 		onRateLimited: function (req, res, next) {
-			logger.verbose('config/middleware/rateLimitMiddleware', 'ALERT', 'post verify');
+			logger.verbose('config/middleware/rateLimitMiddleware', 'abuse', 'post verify');
 			return res.status(429).json({ message: 'Too many requests. Your account is blocked for 2 minutes' });
 		}
 	});
@@ -116,7 +116,7 @@ const rateLimitMiddleware = (app) => {
 		expire: 1000 * 60 * 2,
 		lookup: 'headers.x-forwarded-for',
 		onRateLimited: function (req, res, next) {
-			logger.verbose('config/middleware/rateLimitMiddleware', 'ALERT', 'get eset-password');
+			logger.verbose('config/middleware/rateLimitMiddleware', 'abuse', 'get eset-password');
 			return res.status(429).json({ message: 'Too many requests. Your account is blocked for 2 minutes' });
 		}
 	});
@@ -128,7 +128,7 @@ const rateLimitMiddleware = (app) => {
 		expire: 1000 * 60 * 2,
 		lookup: 'headers.x-forwarded-for',
 		onRateLimited: function (req, res, next) {
-			logger.verbose('config/middleware/rateLimitMiddleware', 'ALERT', 'post reset-password');
+			logger.verbose('config/middleware/rateLimitMiddleware', 'abuse', 'post reset-password');
 			return res.status(429).json({ message: 'Too many requests. Your account is blocked for 2 minutes' });
 		}
 	});
@@ -147,7 +147,7 @@ const rateLimitMiddleware = (app) => {
 			return next();
 		},
 		onRateLimited: function (req, res, next) {
-			logger.verbose('config/middleware/rateLimitMiddleware', 'ALERT', 'change-password');
+			logger.verbose('config/middleware/rateLimitMiddleware', 'abuse', 'change-password');
 			return res.status(429).json({ message: 'Too many requests. Your account is blocked for 2 minutes' });
 		}
 	});

server/package.json

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

server/plugins/controllers.js

@@ -410,6 +410,7 @@ const putPlugin = async (req, res) => {
 						for (const key in plugin[field]) {
 							if (
 								lodash.isPlainObject(plugin[field])
+								&& plugin[field][key]
 								&& plugin[field][key].overwrite === false
 								&& (!value[key] || value[key].overwrite === false)
 							) {

server/utils/hollaex-network-lib/index.js

@@ -2167,6 +2167,9 @@ class HollaExNetwork {
 		transactionId: null,
 		address: null,
 		status: true,
+		dismissed: false,
+		rejected: false,
+		waiting: false,
 		email: true,
 		fee: null,
 		additionalHeaders: null
@@ -2207,6 +2210,24 @@ class HollaExNetwork {
 			data.status = true;
 		}
 
+		if (isBoolean(opts.rejected)) {
+			data.rejected = opts.rejected;
+		} else {
+			data.rejected = false;
+		}
+
+		if (isBoolean(opts.dismissed)) {
+			data.dismissed = opts.dismissed;
+		} else {
+			data.dismissed = false;
+		}
+
+		if (isBoolean(opts.waiting)) {
+			data.waiting = opts.waiting;
+		} else {
+			data.waiting = false;
+		}
+
 		if (isBoolean(opts.email)) {
 			data.email = opts.email;
 		} else {
@@ -2272,9 +2293,7 @@ class HollaExNetwork {
 		const processing = isBoolean(opts.processing) ? opts.processing : false;
 		const waiting = isBoolean(opts.waiting) ? opts.waiting : false;
 
-		if (!status && !rejected && !dismissed && !processing && !waiting) {
-			return reject(new Error('Must give one parameter to update'));
-		} else if (
+		if (
 			status && (rejected || dismissed || processing || waiting)
 			|| rejected && (status || dismissed || processing || waiting)
 			|| dismissed && (status || rejected || processing || waiting)
@@ -2345,6 +2364,9 @@ class HollaExNetwork {
 		transactionId: null,
 		address: null,
 		status: true,
+		dismissed: false,
+		rejected: false,
+		waiting: false,
 		email: true,
 		fee: null,
 		additionalHeaders: null
@@ -2385,6 +2407,24 @@ class HollaExNetwork {
 			data.status = true;
 		}
 
+		if (isBoolean(opts.rejected)) {
+			data.rejected = opts.rejected;
+		} else {
+			data.rejected = false;
+		}
+
+		if (isBoolean(opts.dismissed)) {
+			data.dismissed = opts.dismissed;
+		} else {
+			data.dismissed = false;
+		}
+
+		if (isBoolean(opts.waiting)) {
+			data.waiting = opts.waiting;
+		} else {
+			data.waiting = false;
+		}
+
 		if (isBoolean(opts.email)) {
 			data.email = opts.email;
 		} else {
@@ -2450,9 +2490,7 @@ class HollaExNetwork {
 		const processing = isBoolean(opts.processing) ? opts.processing : false;
 		const waiting = isBoolean(opts.waiting) ? opts.waiting : false;
 
-		if (!status && !rejected && !dismissed && !processing && !waiting) {
-			return reject(new Error('Must give one parameter to update'));
-		} else if (
+		if (
 			status && (rejected || dismissed || processing || waiting)
 			|| rejected && (status || dismissed || processing || waiting)
 			|| dismissed && (status || rejected || processing || waiting)

server/utils/hollaex-tools-lib/tools/wallet.js

@@ -736,6 +736,7 @@ const getUserTransactionsByKitId = (
 				endDate,
 				transactionId,
 				address,
+				format,
 				opts
 			);
 		} else if (type === 'withdrawal') {
@@ -754,6 +755,7 @@ const getUserTransactionsByKitId = (
 				endDate,
 				transactionId,
 				address,
+				format,
 				opts
 			);
 		}
@@ -873,6 +875,7 @@ const getExchangeDeposits = (
 	endDate,
 	transactionId,
 	address,
+	format,
 	opts = {
 		additionalHeaders: null
 	}
@@ -893,6 +896,7 @@ const getExchangeDeposits = (
 		endDate,
 		transactionId,
 		address,
+		format: (format && (format === 'csv' || format === 'all')) ? 'all' : null, // for csv get all data
 		...opts
 	})
 		.then(async (deposits) => {
@@ -903,7 +907,7 @@ const getExchangeDeposits = (
 					const user_kit_id = idDictionary[deposit.user_id];
 					deposit.network_id = deposit.user_id;
 					deposit.user_id = user_kit_id;
-					deposit.User.id = user_kit_id;
+					if (deposit.User) deposit.User.id = user_kit_id;
 				}
 			}
 			return deposits;
@@ -925,6 +929,7 @@ const getExchangeWithdrawals = (
 	endDate,
 	transactionId,
 	address,
+	format,
 	opts = {
 		additionalHeaders: null
 	}
@@ -944,6 +949,7 @@ const getExchangeWithdrawals = (
 		endDate,
 		transactionId,
 		address,
+		format: (format && (format === 'csv' || format === 'all')) ? 'all' : null, // for csv get all data
 		...opts
 	})
 		.then(async (withdrawals) => {
@@ -954,7 +960,7 @@ const getExchangeWithdrawals = (
 					const user_kit_id = idDictionary[withdrawal.user_id];
 					withdrawal.network_id = withdrawal.user_id;
 					withdrawal.user_id = user_kit_id;
-					withdrawal.User.id = user_kit_id;
+					if (withdrawal.User) withdrawal.User.id = user_kit_id;
 				}
 			}
 			return withdrawals;

version

@@ -1 +1 @@
-2.4.6
+2.4.7

web/package.json

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

web/public/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no">
     <meta name="theme-color" content="#000000">
     <link rel="manifest" id="manifest-placeholder">
     <link rel="shortcut icon" href="/favicon.ico">

web/src/actions/walletActions.js

@@ -1,4 +1,5 @@
 import axios from 'axios';
+import moment from 'moment';
 import querystring from 'query-string';
 // import { all } from 'bluebird';
 
@@ -298,7 +299,7 @@ export const downloadUserTrades = (key, params = {}) => {
 				const url = window.URL.createObjectURL(new Blob([res.data]));
 				const link = document.createElement('a');
 				link.href = url;
-				link.setAttribute('download', `user_${key}.csv`);
+				link.setAttribute('download', `user_${key}_${moment().format('YYYY-MM-DD')}.csv`);
 				document.body.appendChild(link);
 				link.click();
 			})

web/src/config/icons/static.js

@@ -154,6 +154,7 @@ const icons = {
 	DOLLAR_GEAR: '/assets/images/single-dollar-gear.svg',
 	SWITCH_ASSET_FOR_FEES: '/assets/images/switch-asset-for-fees.svg',
 	CLOCK: '/assets/images/clock.svg',
+	MANUAL_PLUGIN_UPGRADE: '/assets/images/manual-plugin-upgrade.svg',
 };
 
 export default icons;

web/src/containers/Admin/AdminFinancials/Assets.js

@@ -168,7 +168,7 @@ const getColumns = (
 					className="coin-symbol-wrapper"
 					onClick={() => handlePreview(selectedAsset)}
 				>
-					{balance[`${symbol}_available`] || 0}
+					{balance[`${symbol}_balance`] || 0}
 				</div>
 			);
 		},

web/src/containers/Admin/Deposits/ValidateDismiss.js

@@ -46,7 +46,11 @@ const ValidateDismiss = ({
 			className="Validate-Dismiss-popup"
 		>
 			<div className="title">
-				{statusType === 'validate' ? 'Validate' : 'Dismiss'}
+				{statusType === 'validate'
+					? 'Validate'
+					: statusType === 'dismiss'
+					? 'Dismiss'
+					: 'Retry'}
 			</div>
 			<div className="my-3">Please check and confirm the details below.</div>
 			<span className="legend">Check & Confirm</span>
@@ -61,29 +65,36 @@ const ValidateDismiss = ({
 					<span className="bold">Amount:</span> {validateData.amount}
 				</div>
 			</div>
-			<div className="my-5">
-				<div>Transaction ID</div>
-				<Item name="transaction_id">
-					<Input ref={transaction_id} />
-				</Item>
-				<div className="edit-link-wrapper">
-					<div
-						className="edit-link"
-						onClick={() => handleEdit('transaction_id')}
-					>
-						Edit
+			{statusType === 'validate' || statusType === 'dismiss' ? (
+				<div className="my-5">
+					<div>Transaction ID</div>
+					<Item name="transaction_id">
+						<Input ref={transaction_id} />
+					</Item>
+					<div className="edit-link-wrapper">
+						<div
+							className="edit-link"
+							onClick={() => handleEdit('transaction_id')}
+						>
+							Edit
+						</div>
 					</div>
-				</div>
-				<div>Description</div>
-				<Item name="description">
-					<Input ref={description} />
-				</Item>
-				<div className="edit-link-wrapper">
-					<div className="edit-link" onClick={() => handleEdit('description')}>
-						Edit
+					<div>Description</div>
+					<Item name="description">
+						<Input ref={description} />
+					</Item>
+					<div className="edit-link-wrapper">
+						<div
+							className="edit-link"
+							onClick={() => handleEdit('description')}
+						>
+							Edit
+						</div>
 					</div>
 				</div>
-			</div>
+			) : (
+				''
+			)}
 			<div className="d-flex align-items-center mt-4">
 				<Button type="ghost" className="f-1" onClick={onCancel}>
 					Back

web/src/containers/Admin/Deposits/actions.js

@@ -1,6 +1,7 @@
 import querystring from 'query-string';
 import { requestAuthenticated } from '../../../utils';
 import axios from 'axios';
+import moment from 'moment';
 
 export const requestDeposits = (query = { type: 'deposit' }) => {
 	const { type, currency, ...rest } = query;
@@ -40,8 +41,8 @@ export const requestDepositDownload = (query = { type: 'deposit' }) => {
 			const link = document.createElement('a');
 			link.href = url;
 			type === 'deposit'
-				? link.setAttribute('download', 'deposit.csv')
-				: link.setAttribute('download', 'withdrawal.csv');
+				? link.setAttribute('download', `deposits_${moment().format('YYYY-MM-DD')}.csv`)
+				: link.setAttribute('download', `withdrawals_${moment().format('YYYY-MM-DD')}.csv`);
 			document.body.appendChild(link);
 			link.click();
 		})