Skip to content

Commit

Permalink
Merge pull request #212 from bitholla/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
abeikverdi authored Aug 24, 2020
2 parents c6aff2a + 50de056 commit 1bb8b75
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.7
1.5.8
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hollaex-kit",
"version": "1.5.7",
"version": "1.5.8",
"private": true,
"dependencies": {
"@material/button": "0.7.0",
Expand Down
7 changes: 3 additions & 4 deletions web/src/config/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -1269,10 +1269,9 @@ export default {
'We will review your request and send further instructions to your email on how to access the HollaEx exchange.', // new
WARNING_TXT1:
'In the mean time you can familiarize yourself with the HollaEx network with the resources below', // new
XHT_ORDER_TXT_1: 'To start trading the HollaEx token (XHT) you must login', // new
XHT_ORDER_TXT_2:
'The HollaEx token is distributed through a Wave Auction where at random times daily there will be random amount of HollaEx token sold to the highest bidders on the orderbook.', // new
XHT_ORDER_TXT_3: '{0} to join the Wave Auction or {1}', // new
XHT_ORDER_TXT_1: 'To start trading you must login', // new
XHT_ORDER_TXT_2: '', // new
XHT_ORDER_TXT_3: '{0} or {1}', // new
XHT_TITLE: 'XHT', //new
XHT_TRADE_TXT_1: 'Login to see your recent trades', //new
XHT_TRADE_TXT_2: 'You can {0} to see your recent trade history', //new
Expand Down
6 changes: 1 addition & 5 deletions web/src/containers/Trade/components/LogoutInfoOrder.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import React from 'react';
import ReactSVG from 'react-svg';
import { Link } from 'react-router';
import classnames from 'classnames';

import { ICONS } from '../../../config/constants';
import STRINGS from '../../../config/localizedStrings';

const LogoutInfoOrder = ({ activeTheme }) => {
Expand All @@ -12,9 +10,7 @@ const LogoutInfoOrder = ({ activeTheme }) => {
</Link>
return (
<div className='text-center'>
<div className={'flex-row d-flex justify-content-center'}>
<ReactSVG path={ICONS.XHT_ICON_DARK} wrapperClassName="xht-logo" />
</div>

<div className="xht-order-heading">
{STRINGS.TERMS_OF_SERVICES.XHT_ORDER_TXT_1}
</div>
Expand Down

0 comments on commit 1bb8b75

Please sign in to comment.