diff --git a/server/api/swagger/swagger.yaml b/server/api/swagger/swagger.yaml index ebccbf364f..b48126833f 100644 --- a/server/api/swagger/swagger.yaml +++ b/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 diff --git a/server/package.json b/server/package.json index 1f46c79bb4..eed3f2da4a 100644 --- a/server/package.json +++ b/server/package.json @@ -1,5 +1,5 @@ { - "version": "2.1.1", + "version": "2.1.2", "private": false, "description": "HollaEx Kit", "keywords": [ diff --git a/version b/version index 3e3c2f1e5e..eca07e4c1a 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.1.1 +2.1.2 diff --git a/web/package.json b/web/package.json index 8748a9af2d..b490290ad3 100644 --- a/web/package.json +++ b/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", diff --git a/web/src/actions/walletActions.js b/web/src/actions/walletActions.js index 5dc5898a6a..89df18f2b6 100644 --- a/web/src/actions/walletActions.js +++ b/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 {}; } diff --git a/web/src/containers/OperatorControls/index.js b/web/src/containers/OperatorControls/index.js index 627d10a186..d36ebb2c62 100644 --- a/web/src/containers/OperatorControls/index.js +++ b/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') || '{}'; diff --git a/web/src/containers/TransactionsHistory/components/DepositAndWithdrawlFilters.js b/web/src/containers/TransactionsHistory/components/DepositAndWithdrawlFilters.js index 83918d5fdd..fddd6f598b 100644 --- a/web/src/containers/TransactionsHistory/components/DepositAndWithdrawlFilters.js +++ b/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 }) => { - diff --git a/web/src/utils/wallet.js b/web/src/utils/wallet.js index 3702a42e37..604e60ab4c 100644 --- a/web/src/utils/wallet.js +++ b/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;