Skip to content

Commit c55d349

Browse files
authored
Merge pull request #225 from bitholla/develop
Develop
2 parents 8260cc5 + 5c3e72d commit c55d349

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed

mail/strings/ko.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const SIGNUP = {
3939
TITLE: '회원가입',
4040
GREETING: (name) => COMMON.GREETING(name),
4141
BODY: {
42-
1: `안녕하세요. 아래 버튼을 클릭하여 회원님의 이메일 계정을 인증해주시기바랍니다.
42+
1: () => `안녕하세요. 아래 버튼을 클릭하여 회원님의 이메일 계정을 인증해주시기바랍니다.
4343
문의사항은 본 메일에 회신하여 문의하실 수 있습니다.`,
4444
2: '아래 버튼을 클릭하여 등록 절차를 진행하시기 바랍니다.',
4545
3: '나의 계정 활성화'

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.7
1+
1.5.9

web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hollaex-kit",
3-
"version": "1.5.7",
3+
"version": "1.5.9",
44
"private": true,
55
"dependencies": {
66
"@material/button": "0.7.0",

web/src/config/lang/en.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,10 +1269,9 @@ export default {
12691269
'We will review your request and send further instructions to your email on how to access the HollaEx exchange.', // new
12701270
WARNING_TXT1:
12711271
'In the mean time you can familiarize yourself with the HollaEx network with the resources below', // new
1272-
XHT_ORDER_TXT_1: 'To start trading the HollaEx token (XHT) you must login', // new
1273-
XHT_ORDER_TXT_2:
1274-
'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
1275-
XHT_ORDER_TXT_3: '{0} to join the Wave Auction or {1}', // new
1272+
XHT_ORDER_TXT_1: 'To start trading you must login', // new
1273+
XHT_ORDER_TXT_2: '', // new
1274+
XHT_ORDER_TXT_3: '{0} or {1}', // new
12761275
XHT_TITLE: 'XHT', //new
12771276
XHT_TRADE_TXT_1: 'Login to see your recent trades', //new
12781277
XHT_TRADE_TXT_2: 'You can {0} to see your recent trade history', //new

web/src/containers/Trade/components/LogoutInfoOrder.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import React from 'react';
2-
import ReactSVG from 'react-svg';
32
import { Link } from 'react-router';
43
import classnames from 'classnames';
54

6-
import { ICONS } from '../../../config/constants';
75
import STRINGS from '../../../config/localizedStrings';
86

97
const LogoutInfoOrder = ({ activeTheme }) => {
@@ -12,9 +10,7 @@ const LogoutInfoOrder = ({ activeTheme }) => {
1210
</Link>
1311
return (
1412
<div className='text-center'>
15-
<div className={'flex-row d-flex justify-content-center'}>
16-
<ReactSVG path={ICONS.XHT_ICON_DARK} wrapperClassName="xht-logo" />
17-
</div>
13+
1814
<div className="xht-order-heading">
1915
{STRINGS.TERMS_OF_SERVICES.XHT_ORDER_TXT_1}
2016
</div>

0 commit comments

Comments
 (0)