Merge pull request #746 from bitholla/hotfix

Hotfix

server/api/swagger/swagger.yaml

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

server/package.json

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

version

@@ -1 +1 @@
-2.1.1
+2.1.2

web/package.json

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

web/src/actions/walletActions.js

@@ -281,7 +281,7 @@ const getParamsByStatus = (status) => {
 		case 'completed':
 			return { status: true };
 		case 'pending':
-			return { processing: true };
+			return { waiting: true };
 		default:
 			return {};
 	}

web/src/containers/OperatorControls/index.js

@@ -43,7 +43,7 @@ class OperatorControls extends Component {
 	constructor(props) {
 		super(props);
 
-		const { themeOptions, injected_html = {} } = this.props;
+		const { themeOptions, injected_html = { head: '', body: '' } } = this.props;
 
 		const strings = localStorage.getItem('strings') || '{}';
 		const icons = localStorage.getItem('icons') || '{}';

web/src/containers/TransactionsHistory/components/DepositAndWithdrawlFilters.js

@@ -1,4 +1,5 @@
-import React from 'react';
+import React, { useState } from 'react';
+import classnames from 'classnames';
 import { Select, Form, Row, Button } from 'antd';
 import { CaretDownOutlined } from '@ant-design/icons';
 import STRINGS from 'config/localizedStrings';
@@ -22,9 +23,15 @@ const STATUS_OPTIONS = {
 
 const Filters = ({ coins = {}, onSearch, formName }) => {
 	const [form] = Form.useForm();
+	const [isSearchShining, setIsSearchShining] = useState(false);
 
 	const onFinish = (values) => {
 		onSearch(values);
+		setIsSearchShining(false);
+	};
+
+	const onValuesChange = () => {
+		setIsSearchShining(true);
 	};
 
 	return (
@@ -33,6 +40,7 @@ const Filters = ({ coins = {}, onSearch, formName }) => {
 			name={`${formName}-filters`}
 			className="ant-advanced-search-form"
 			onFinish={onFinish}
+			onValuesChange={onValuesChange}
 			initialValues={{
 				status: null,
 				currency: null,
@@ -94,7 +102,12 @@ const Filters = ({ coins = {}, onSearch, formName }) => {
 					</Select>
 				</Form.Item>
 				<Form.Item>
-					<Button type="ghost" htmlType="submit" size="small">
+					<Button
+						type="ghost"
+						htmlType="submit"
+						size="small"
+						className={classnames({ active_search_button: isSearchShining })}
+					>
 						Search
 					</Button>
 				</Form.Item>

web/src/utils/wallet.js

@@ -29,7 +29,7 @@ export const getNetworkLabelByKey = (network) => {
 			case 'trx':
 				return 'TRC20';
 			default:
-				network.toUpperCase();
+				return network.toUpperCase();
 		}
 	} else {
 		return network;