Merge pull request #2162 from hollaex/beta

Beta

server/api/controllers/admin.js

@@ -145,7 +145,7 @@ const getUsersAdmin = (req, res) => {
 		}
 	})
 		.then((data) => {
-			if (format.value) {
+			if (format.value === 'csv') {
 				res.setHeader('Content-disposition', `attachment; filename=${toolsLib.getKitConfig().api_name}-users.csv`);
 				res.set('Content-Type', 'text/csv');
 				return res.status(202).send(data);
@@ -481,7 +481,7 @@ const getAdminUserLogins = (req, res) => {
 		format: format.value
 	})
 		.then((data) => {
-			if (format.value) {
+			if (format.value === 'csv') {
 				res.setHeader('Content-disposition', `attachment; filename=${toolsLib.getKitConfig().api_name}-users-logins.csv`);
 				res.set('Content-Type', 'text/csv');
 				return res.status(202).send(data);
@@ -546,7 +546,7 @@ const getUserAudits = (req, res) => {
 		format: format.value
 	})
 		.then((data) => {
-			if (format.value) {
+			if (format.value === 'csv') {
 				res.setHeader('Content-disposition', `attachment; filename=${toolsLib.getKitConfig().api_name}-audits.csv`);
 				res.set('Content-Type', 'text/csv');
 				return res.status(202).send(data);
@@ -2247,7 +2247,7 @@ const getWalletsByAdmin = (req, res) => {
 		}
 	)
 		.then((data) => {
-			if (format.value) {
+			if (format.value === 'csv') {
 				res.setHeader('Content-disposition', `attachment; filename=${toolsLib.getKitConfig().api_name}-users.csv`);
 				res.set('Content-Type', 'text/csv');
 				return res.status(202).send(data);

server/api/controllers/deposit.js

@@ -54,7 +54,7 @@ const getAdminDeposits = (req, res) => {
 		}
 	)
 		.then((data) => {
-			if (format.value) {
+			if (format.value === 'csv') {
 				res.setHeader('Content-disposition', `attachment; filename=${toolsLib.getKitConfig().api_name}-users-deposits.csv`);
 				res.set('Content-Type', 'text/csv');
 				return res.status(202).send(data);

server/api/controllers/user.js

@@ -672,7 +672,7 @@ const getUserLogins = (req, res) => {
 		format: format.value
 	})
 		.then((data) => {
-			if (format.value) {
+			if (format.value === 'csv') {
 				res.setHeader('Content-disposition', `attachment; filename=${toolsLib.getKitConfig().api_name}-logins.csv`);
 				res.set('Content-Type', 'text/csv');
 				return res.status(202).send(data);

server/api/controllers/withdrawal.js

@@ -295,7 +295,7 @@ const getAdminWithdrawals = (req, res) => {
 		}
 	)
 		.then((data) => {
-			if (format.value) {
+			if (format.value === 'csv') {
 				res.setHeader('Content-disposition', `attachment; filename=${toolsLib.getKitConfig().api_name}-users-deposits.csv`);
 				res.set('Content-Type', 'text/csv');
 				return res.status(202).send(data);

server/api/swagger/admin.yaml

@@ -1143,7 +1143,7 @@ paths:
           name: format
           description: Specify data format
           required: false
-          enum: ['csv']
+          enum: ['csv', 'all']
           type: string
       responses:
         200:
@@ -1652,7 +1652,7 @@ paths:
           name: format
           description: Specify data format
           required: false
-          enum: ['csv']
+          enum: ['csv', 'all']
           type: string
       tags:
         - Admin
@@ -1733,7 +1733,7 @@ paths:
           name: format
           description: Specify data format
           required: false
-          enum: ['csv']
+          enum: ['csv', 'all']
           type: string
       tags:
         - Admin
@@ -2276,7 +2276,7 @@ paths:
           name: format
           description: Specify data format
           required: false
-          enum: ['csv']
+          enum: ['csv', 'all']
           type: string
       responses:
         200:
@@ -2402,7 +2402,7 @@ paths:
           name: format
           description: Specify data format
           required: false
-          enum: ['csv']
+          enum: ['csv', 'all']
           type: string
       responses:
         200:

server/api/swagger/swagger.js

@@ -4,7 +4,7 @@ const definition = {
 	swagger: '2.0',
 	info: {
 		title: 'HollaEx Kit',
-		version: '2.6.2'
+		version: '2.6.3'
 	},
 	host: 'api.hollaex.com',
 	basePath: '/v2',

server/api/swagger/user.yaml

@@ -184,7 +184,7 @@ paths:
           name: format
           description: Specify data format
           required: false
-          enum: ['csv']
+          enum: ['csv', 'all']
           type: string
       responses:
         200:
@@ -893,7 +893,7 @@ paths:
           name: format
           description: Specify data format
           required: false
-          enum: ['csv']
+          enum: ['csv', 'all']
           type: string
         - in: query
           name: transaction_id
@@ -1008,7 +1008,7 @@ paths:
           name: format
           description: Specify data format
           required: false
-          enum: ['csv']
+          enum: ['csv', 'all']
           type: string
         - in: query
           name: transaction_id

server/package.json

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

settings/configmap

@@ -88,7 +88,7 @@ ENVIRONMENT_DOCKER_IMAGE_INFLUXDB_REGISTRY=influxdb
 ENVIRONMENT_DOCKER_IMAGE_INFLUXDB_VERSION=1.8.3
 
 ENVIRONMENT_DOCKER_IMAGE_LOCAL_NGINX_REGISTRY=bitholla/nginx-with-certbot
-ENVIRONMENT_DOCKER_IMAGE_LOCAL_NGINX_VERSION=1.15.8
+ENVIRONMENT_DOCKER_IMAGE_LOCAL_NGINX_VERSION=1.24.0
 
 ENVIRONMENT_LOCAL_NGINX_HTTP_PORT=80
 ENVIRONMENT_LOCAL_NGINX_HTTPS_PORT=443

version

@@ -1 +1 @@
-2.6.2
+2.6.3

web/docker/Dockerfile

@@ -9,7 +9,7 @@ RUN npm config set unsafe-perm true && \
 COPY . /app
 RUN npm run build
 
-FROM nginx:1.16.0-alpine
+FROM nginx:1.24.0-alpine
 RUN apk add --update \
     curl \
     && rm -rf /var/cache/apk/*

web/package.json

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

web/src/components/Form/FormFields/FieldWrapper.js

@@ -4,9 +4,36 @@ import classnames from 'classnames';
 import { ReactSVG } from 'react-svg';
 
 import { STATIC_ICONS } from 'config/icons';
-import { ActionNotification } from '../../';
-import { getErrorLocalized } from '../../../utils/errors';
-import { EditWrapper } from 'components';
+import { ActionNotification, EditWrapper } from 'components';
+import { getErrorLocalized } from 'utils/errors';
+
+const Warning = ({ text, className = '' }) => (
+	<div className={classnames('d-flex', 'align-items-baseline', className)}>
+		<ExclamationCircleFilled className="field_warning_icon" />
+		<div className="field_warning_text">{text}</div>
+	</div>
+);
+
+const renderWarning = (warning) => {
+	if (warning) {
+		if (Array.isArray(warning)) {
+			return (
+				<div className="field_warning_wrapper">
+					{warning.map((msg, index) => (
+						<Warning
+							text={msg}
+							className={classnames({ 'mt-2': index !== 0 })}
+						/>
+					))}
+				</div>
+			);
+		} else {
+			return <Warning text={warning} className="field_warning_wrapper" />;
+		}
+	} else {
+		return null;
+	}
+};
 
 export const FieldContent = ({
 	stringId,
@@ -41,12 +68,7 @@ export const FieldContent = ({
 							) : (
 								label
 							)}
-							{warning && (
-								<div className="d-flex align-items-baseline field_warning_wrapper">
-									<ExclamationCircleFilled className="field_warning_icon" />
-									<div className="field_warning_text">{warning}</div>
-								</div>
-							)}
+							{renderWarning(warning)}
 						</div>
 					)}
 					<EditWrapper stringId={stringId} />

web/src/components/Views/NotLoggedIn.js

@@ -11,6 +11,7 @@ const NotLoggedIn = ({
 	placeholderKey = 'NOT_LOGGEDIN.TEXT_GENERAL',
 	children,
 	hasBackground = true,
+	wrapperClassName = '',
 }) => {
 	const SignUpLink = (
 		<Link
@@ -33,26 +34,28 @@ const NotLoggedIn = ({
 	return isLoggedIn() ? (
 		<Fragment>{children}</Fragment>
 	) : (
-		<div
-			className={classnames('not-logged-in_view', {
-				'show-background': hasBackground,
-			})}
-		>
-			<IconTitle
-				iconId="DEMO_LOGIN_ICON"
-				iconPath={ICONS['DEMO_LOGIN_ICON']}
-				textType="title"
-				className="w-100 d-flex justify-content-center"
-			/>
-			<div className="text-center my-3">
-				<div className="xht-order-heading">{STRINGS[placeholderKey]}</div>
-				<div className="xht-order-content">
-					<div className="my-2">
-						{STRINGS.formatString(
-							STRINGS['NOT_LOGGEDIN.TXT_2'],
-							SignUpLink,
-							LoginLink
-						)}
+		<div className={wrapperClassName}>
+			<div
+				className={classnames('not-logged-in_view', {
+					'show-background': hasBackground,
+				})}
+			>
+				<IconTitle
+					iconId="DEMO_LOGIN_ICON"
+					iconPath={ICONS['DEMO_LOGIN_ICON']}
+					textType="title"
+					className="w-100 d-flex justify-content-center"
+				/>
+				<div className="text-center my-3">
+					<div className="xht-order-heading">{STRINGS[placeholderKey]}</div>
+					<div className="xht-order-content">
+						<div className="my-2">
+							{STRINGS.formatString(
+								STRINGS['NOT_LOGGEDIN.TXT_2'],
+								SignUpLink,
+								LoginLink
+							)}
+						</div>
 					</div>
 				</div>
 			</div>

web/src/config/lang/en.json

@@ -887,6 +887,7 @@
 	"WITHDRAWALS_BUTTON_TEXT": "review withdrawal",
 	"WITHDRAWALS_FORM_NETWORK_LABEL": "Network",
 	"DEPOSIT_FORM_NETWORK_WARNING": "Make sure the network selected is compatible with the senders wallets network",
+	"DEPOSIT_FORM_MIN_WARNING": "Only deposits of {0} {1} or more will be accepted. Any deposits below this minimum threshold will result in a permanent loss of funds.",
 	"DEPOSIT_FORM_TITLE_WARNING_DESTINATION_TAG": "Enter both Address and Tag, which are required to deposit into your account successfully.",
 	"WITHDRAW_PAGE_DESTINATION_TAG_NONE": "None",
 	"WITHDRAW_PAGE_DESTINATION_TAG_MESSAGE": "Destination tag: {0}",

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

@@ -127,7 +127,14 @@ const FieldComponent = ({
 	);
 };
 
-const MultiFilter = ({ fields, filterOptions, onHandle, coins }) => {
+const MultiFilter = ({
+	fields,
+	filterOptions,
+	onHandle,
+	coins,
+	setIsLoading,
+	isLoading,
+}) => {
 	const [options, setOptions] = useState(filterOptions);
 	const [fieldsData, setFieldsData] = useState([]);
 	const [filterData, setFilterData] = useState({});
@@ -219,6 +226,7 @@ const MultiFilter = ({ fields, filterOptions, onHandle, coins }) => {
 
 	const onHandleSearch = () => {
 		let obj = {};
+		setIsLoading(true);
 		Object.keys(filterData).forEach((name) => {
 			if (filterData[name] !== '') {
 				obj = { ...obj, [name]: filterData[name] };
@@ -262,6 +270,7 @@ const MultiFilter = ({ fields, filterOptions, onHandle, coins }) => {
 						: 'filter-button green-btn'
 				}
 				disabled={
+					isLoading ||
 					Object.keys(filterData).length === 0 ||
 					!Object.values(filterData)
 						.map((field) => field === '')

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

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { message, Table, Button } from 'antd';
+import { message, Table, Button, Spin } from 'antd';
 import { requestUsersDownload } from '../User/actions';
 import MultiFilter from './TableFilter';
 import { getExchangeWallet } from './action';
@@ -105,8 +105,10 @@ const filterOptions = [
 
 const Wallet = () => {
 	const [userData, setUserData] = useState([]);
+	const [isLoading, setIsLoading] = useState(false);
 
 	useEffect(() => {
+		setIsLoading(true);
 		getWallet();
 	}, []);
 
@@ -115,9 +117,11 @@ const Wallet = () => {
 			const res = await getExchangeWallet(values);
 			if (res && res.data) {
 				setUserData(res.data);
+				setIsLoading(false);
 			}
 		} catch (error) {
 			message.error(error.data.message);
+			setIsLoading(false);
 		}
 	};
 
@@ -133,6 +137,8 @@ const Wallet = () => {
 					fields={filterFields}
 					filterOptions={filterOptions}
 					onHandle={getWallet}
+					setIsLoading={setIsLoading}
+					isLoading={isLoading}
 				/>
 			</div>
 			<div className="mt-5">
@@ -143,7 +149,9 @@ const Wallet = () => {
 					Download below CSV table
 				</span>
 				<div className="mt-4">
-					<Table columns={columns} dataSource={userData} />
+					<Spin spinning={isLoading}>
+						<Table columns={columns} dataSource={userData} />
+					</Spin>
 				</div>
 			</div>
 		</div>