Skip to content

Commit 57d22a3

Browse files
abeikverdiabeikverdi
authored
Merge pull request #51 from bitholla/develop
Develop
2 parents 029c990 + 6f71fb5 commit 57d22a3

File tree

16 files changed

+107
-102
lines changed

16 files changed

+107
-102
lines changed

‎version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.1
1+
1.1.2

‎web/.env

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Web application domain
2-
REACT_APP_PUBLIC_URL=https://pro.hollaex.com
2+
REACT_APP_PUBLIC_URL=
33

44
# HollaEx Kit server endpoint
5-
REACT_APP_SERVER_ENDPOINT=https://api.hollaex.com
5+
REACT_APP_SERVER_ENDPOINT=
66

77
# network [mainnet, testnet] (used for crypto wallets)
88
REACT_APP_NETWORK=mainnet
99

1010
# Your exchange name
11-
REACT_APP_EXCHANGE_NAME=HollaEx
11+
REACT_APP_EXCHANGE_NAME=
1212

1313
# your google recaptcha key
1414
REACT_APP_CAPTCHA_SITE_KEY=

‎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",
3-
"version": "1.20.16",
3+
"version": "1.20.17",
44
"private": true,
55
"dependencies": {
66
"@material/button": "^0.7.0",

‎web/public/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
gtag('config', 'UA-154626247-1');
2323
</script>
2424

25-
<title>HollaEx | Open Crypto Exchange | Buy & Sell Crypto Assets</title>
25+
<title>BitHolla Exchange Demo | HollaEx Kit</title>
2626
</head>
2727
<body>
2828
<noscript>

‎web/src/actions/appActions.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ export const NOTIFICATIONS = {
2525
GENERATE_ADDRESS: 'NOTIFICATIONS_GENERATE_ADDRESS',
2626
WITHDRAWAL_EMAIL_CONFIRMATION: 'WITHDRAWAL_EMAIL_CONFIRMATION',
2727
INVITE_FRIENDS: 'INVITE_FRIENDS',
28-
STAKE_TOKEN:'STAKE_TOKEN',
28+
STAKE_TOKEN: 'STAKE_TOKEN',
2929
DEPOSIT_INFO: 'DEPOSIT_INFO',
30-
XHT_SUCCESS_ACCESS :'XHT_SUCCESS_ACCESS',
31-
WAVE_NOTIFICATION: 'WAVE_NOTIFICATION'
30+
XHT_SUCCESS_ACCESS: 'XHT_SUCCESS_ACCESS'
3231
};
3332
export const CONTACT_FORM = 'CONTACT_FORM';
3433
export const HELPFUL_RESOURCES_FORM = 'HELPFUL_RESOURCES_FORM';
@@ -216,7 +215,7 @@ export const setConfig = (config) => {
216215
let config_level = [];
217216
if (config) {
218217
for (let i = 1; i <= parseInt(config.tiers, 10); i++) {
219-
config_level = [...config_level, i]
218+
config_level = [...config_level, i];
220219
}
221220
}
222221
return {
@@ -225,7 +224,7 @@ export const setConfig = (config) => {
225224
config,
226225
config_level
227226
}
228-
}
227+
};
229228
};
230229

231230
export const setInfo = (info) => ({

‎web/src/components/AppBar/index.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -456,11 +456,13 @@ class AppBar extends Component {
456456
)}
457457
</div>
458458
{!isLoggedIn() ? (
459-
<ThemeSwitcher
460-
selected={selected}
461-
options={options}
462-
toggle={this.onToggle}
463-
/>
459+
<div id="trade-nav-container">
460+
<ThemeSwitcher
461+
selected={selected}
462+
options={options}
463+
toggle={this.onToggle}
464+
/>
465+
</div>
464466
) : null}
465467
{!isHome ? (
466468
isLoggedIn() ? (

‎web/src/components/Notification/WaveInfo.js

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ import {
1111
import { Button } from '../';
1212

1313
const generateRows = ({ wave, pair }, pairs, coins) => {
14-
const { no, amount, filled, floor } = wave;
15-
const pairData = pairs[pair];
14+
const { no, amount, filled, floor } = wave;
15+
const pairData = pairs[pair];
1616
// const secondaryFormat = coins[pairData.pair_2] || DEFAULT_COIN_DATA;
17-
const baseFormat = coins[pairData.pair_base] || DEFAULT_COIN_DATA;
1817
const rows = [];
1918

2019
rows.push({
@@ -24,31 +23,33 @@ const generateRows = ({ wave, pair }, pairs, coins) => {
2423

2524
rows.push({
2625
label: STRINGS.WAVES.WAVE_AMOUNT,
27-
value: `${amount} ${baseFormat.symbol}`
26+
value: `${amount} XHT`
2827
});
2928

30-
rows.push({
31-
label: STRINGS.WAVES.FLOOR,
32-
value: floor
33-
});
29+
rows.push({
30+
label: STRINGS.WAVES.FLOOR,
31+
value: floor
32+
});
3433

35-
rows.push({
36-
label: STRINGS.FILLED,
37-
value: filled
38-
});
34+
rows.push({
35+
label: STRINGS.FILLED,
36+
value: filled
37+
});
3938

40-
// rows.push({
41-
// label: STRINGS.WAVES.LAST_WAVE,
42-
// value: filled
43-
// });
39+
// rows.push({
40+
// label: STRINGS.WAVES.LAST_WAVE,
41+
// value: filled
42+
// });
4443

4544
return rows;
4645
};
4746

4847
const OrderDisplay = ({ rows }) => {
4948
return (
5049
<NotificationContent>
51-
{rows.map((row, index) => <InformationRow {...row} key={index} />)}
50+
{rows.map((row, index) => (
51+
<InformationRow {...row} key={index} />
52+
))}
5253
</NotificationContent>
5354
);
5455
};
@@ -85,7 +86,7 @@ const WaveNotification = ({ type, data, coins, pairs, onBack, onConfirm }) => {
8586

8687
const mapStateToProps = (state) => ({
8788
coins: state.app.coins,
88-
pairs: state.app.pairs
89+
pairs: state.app.pairs
8990
});
9091

9192
export default connect(mapStateToProps)(WaveNotification);

‎web/src/components/Notification/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ const generateNotificationContent = ({ type, data, ...rest }) => {
4646
return <InviteFriends data={data} {...rest} />;
4747
case NOTIFICATIONS.STAKE_TOKEN:
4848
return <StakeToken data={data} {...rest} />;
49-
case NOTIFICATIONS.WAVE_NOTIFICATION:
50-
return <WaveNotification data={data} {...rest} />;
5149
default:
5250
break;
5351
}

‎web/src/config/en.js

Lines changed: 43 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ export default {
1414
'Do you want to cancel your pending withdrawal of:',
1515
CANT_BE_CANCELLED: '-',
1616
ALREADY_CANCELLED: '-',
17-
TIMESTAMP_FORMAT: 'YYYY/MM/DD HH:mm:ss A',
18-
HOUR_FORMAT: 'HH:mm:ss A',
17+
TIMESTAMP_FORMAT: 'YYYY/MM/DD HH:mm:ss',
18+
HOUR_FORMAT: 'HH:mm:ss',
1919
LOGIN_TEXT: 'Login',
2020
SIGN_IN: 'Sign In',
2121
SIGNUP_TEXT: 'Sign Up',
@@ -45,8 +45,8 @@ export default {
4545
NO_OPTIONS: 'No options availables',
4646
SECONDS: 'seconds',
4747
VIEW_MARKET: 'view market', // new
48-
GO_TRADE:'Go Trade', // new
49-
VIEW_INFO:'View info page', // new
48+
GO_TRADE: 'Go Trade', // new
49+
VIEW_INFO: 'View info page', // new
5050
APPLY_HERE: 'Apply Here', // new
5151
HOME: {
5252
SECTION_1_TITLE: 'Welcome to HollaEx Exchange Kit!',
@@ -83,8 +83,7 @@ export default {
8383
{ key: 'en', label: 'English' },
8484
{ key: 'ko', label: '한국어' }
8585
],
86-
FOOTER_COPYRIGHT:
87-
' Copyright {0} ⓒ bitHolla Inc. All rights reserved',
86+
FOOTER_COPYRIGHT: ' Copyright {0} ⓒ bitHolla Inc. All rights reserved',
8887
SECTIONS: {
8988
SECTION_1_TITLE: 'ABOUT',
9089
SECTION_1_LINK_1: 'About Us',
@@ -1151,22 +1150,34 @@ export default {
11511150
ACCOUNT_AGE_OF_MONTHS: 'Account Age of {0} Months',
11521151
TRADING_VOLUME_EQUIVALENT: '{0} {1} Trading Volume Equivalent',
11531152
LEVEL_OF_ACCOUNT: 'Level {0} Account',
1154-
LEVEL_TXT_DEFAULT:'Add your level description here',
1155-
LEVEL_1_TXT: 'Your journey starts here young crypto trader! To obtain bonuses you can verify your identification and also get larger deposit and withdraw limits with reduced trading fees.', // new
1156-
LEVEL_2_TXT: 'Simply trade monthly over $3,000 USDT worth or have balance of over 5,000 XHT and enjoy lower trading fees.', // new
1157-
LEVEL_3_TXT: 'This is where things get real! Enjoy reduced trading fees and large deposit and withdrawal limits. To get to level 3 you must complete your verification', // new
1158-
LEVEL_4_TXT: 'Simply trade monthly over $10,000 USDT worth or have balance of over 10,000 XHT and enjoy lower trading fees.', // new
1159-
LEVEL_5_TXT: 'You’ve made it! The level 5 account is a rare account only for exchange operators, Vault users or HollaEx Affiliate Program (HAP). Enjoy large limits and enjoy zero maker fees.', // new
1160-
LEVEL_6_TXT: 'Simply trade monthly over $300,000 USDT worth or have balance of over 100,000 XHT and enjoy lower trading fees. Increased withdraw amount.', // new
1161-
LEVEL_7_TXT: 'Simply trade monthly over $500,000 USDT worth or have balance of over 300,000 XHT and enjoy lower trading fees. Increased withdraw amount.', // new
1162-
LEVEL_8_TXT: 'Simply trade monthly over $600,000 USDT worth or have balance of over 400,000 XHT and enjoy lower trading fees.', // new
1163-
LEVEL_9_TXT: 'Simply trade monthly over $2,000,000 USDT worth or have balance of over 1,000,000 XHT and enjoy lower trading fees.', // new
1164-
LEVEL_10_TXT: 'The whale trader account that earns you money back for market making. To obtain this special account please get in touch with us.', // new
1153+
LEVEL_TXT_DEFAULT: 'Add your level description here',
1154+
LEVEL_1_TXT:
1155+
'Your journey starts here young crypto trader! To obtain bonuses you can verify your identification and also get larger deposit and withdraw limits with reduced trading fees.', // new
1156+
LEVEL_2_TXT:
1157+
'Simply trade monthly over $3,000 USDT worth or have balance of over 5,000 XHT and enjoy lower trading fees.', // new
1158+
LEVEL_3_TXT:
1159+
'This is where things get real! Enjoy reduced trading fees and large deposit and withdrawal limits. To get to level 3 you must complete your verification', // new
1160+
LEVEL_4_TXT:
1161+
'Simply trade monthly over $10,000 USDT worth or have balance of over 10,000 XHT and enjoy lower trading fees.', // new
1162+
LEVEL_5_TXT:
1163+
'You’ve made it! The level 5 account is a rare account only for exchange operators, Vault users or HollaEx Affiliate Program (HAP). Enjoy large limits and enjoy zero maker fees.', // new
1164+
LEVEL_6_TXT:
1165+
'Simply trade monthly over $300,000 USDT worth or have balance of over 100,000 XHT and enjoy lower trading fees. Increased withdraw amount.', // new
1166+
LEVEL_7_TXT:
1167+
'Simply trade monthly over $500,000 USDT worth or have balance of over 300,000 XHT and enjoy lower trading fees. Increased withdraw amount.', // new
1168+
LEVEL_8_TXT:
1169+
'Simply trade monthly over $600,000 USDT worth or have balance of over 400,000 XHT and enjoy lower trading fees.', // new
1170+
LEVEL_9_TXT:
1171+
'Simply trade monthly over $2,000,000 USDT worth or have balance of over 1,000,000 XHT and enjoy lower trading fees.', // new
1172+
LEVEL_10_TXT:
1173+
'The whale trader account that earns you money back for market making. To obtain this special account please get in touch with us.', // new
11651174
CURRENT_TXT: 'Current',
1166-
TRADER_ACCOUNT_XHT_TEXT: 'Your account is in the presale period of XHT, this means you can obtain XHT for $0.10 per XHT. All deposit will be converted to XHT once the transaction has cleared.',
1175+
TRADER_ACCOUNT_XHT_TEXT:
1176+
'Your account is in the presale period of XHT, this means you can obtain XHT for $0.10 per XHT. All deposit will be converted to XHT once the transaction has cleared.',
11671177
TRADER_ACCOUNT_TITLE: 'Account - Presale Period', // new
11681178
HAP_ACCOUNT: 'HAP Account', // new
1169-
HAP_ACCOUNT_TXT: 'Your account is a verified HollaEx affiliate program account. You can now earn 10% bonus for every person you invite that buys XHT.', // new
1179+
HAP_ACCOUNT_TXT:
1180+
'Your account is a verified HollaEx affiliate program account. You can now earn 10% bonus for every person you invite that buys XHT.', // new
11701181
EMAIL_VERIFICATION: 'Email Verification', // new
11711182
DOCUMENTS: 'Documents', // new
11721183
HAP_TEXT: 'HollaEx Affiliate Program (HAP) {0}', // new
@@ -1180,14 +1191,18 @@ export default {
11801191
TASKS: 'Tasks', // new
11811192
MAKE_FIRST_DEPOSIT: 'Make your first deposit receive 1 XHT', // new
11821193
BUY_FIRST_XHT: 'Buy your first XHT and receive a bonus of 5 XHT', // new
1183-
COMPLETE_ACC_VERIFICATION: 'Complete account verification and get a 20 XHT bonus', // new
1194+
COMPLETE_ACC_VERIFICATION:
1195+
'Complete account verification and get a 20 XHT bonus', // new
11841196
INVITE_USER: 'Invite users and enjoy commissions from their trade', // new
11851197
JOIN_HAP: 'Join HAP and earn 10% for every HollaEx Kit you sell', // new
11861198
EARN_RUNNING_EXCHANGE: 'Earn passive income for running your own exchange', // new
11871199
XHT_WAVE_AUCTION: 'XHT Wave Auction Data', // new
1188-
XHT_WAVE_DESC_1: 'The distribution of the HollaEx token (XHT) is done through a Wave Auction.', // new
1189-
XHT_WAVE_DESC_2: 'The Wave Auction sells a random amount of XHT at random times to the highest bidders on the orderbook', // new
1190-
XHT_WAVE_DESC_3: 'Below displays the historic data on the Wave Auction history', // new
1200+
XHT_WAVE_DESC_1:
1201+
'The distribution of the HollaEx token (XHT) is done through a Wave Auction.', // new
1202+
XHT_WAVE_DESC_2:
1203+
'The Wave Auction sells a random amount of XHT at random times to the highest bidders on the orderbook', // new
1204+
XHT_WAVE_DESC_3:
1205+
'Below displays the historic data on the Wave Auction history', // new
11911206
WAVE_AUCTION_PHASE: 'Wave Auction Phase {0}', // new
11921207
LEARN_MORE_WAVE_AUCTION: 'Learn more about the Wave Auction', // new
11931208
WAVE_NUMBER: 'Wave Number', // new
@@ -1196,8 +1211,10 @@ export default {
11961211
},
11971212
REFERRAL_LINK: {
11981213
TITLE: 'Invite your friend', // new
1199-
INFO_TEXT: 'Refer your friends by giving out this link. Your friends will receive {0}% discount by signing up through your link.', // new
1200-
INFO_TEXT_1: '{0}% of trading fees collected from those you refer will be monthly credited to your account.', // new
1214+
INFO_TEXT:
1215+
'Refer your friends by giving out this link. Your friends will receive {0}% discount by signing up through your link.', // new
1216+
INFO_TEXT_1:
1217+
'{0}% of trading fees collected from those you refer will be monthly credited to your account.', // new
12011218
COPY_FIELD_LABEL: 'Share the link below with friends and earn commissions:', // new
12021219
REFERRED_USER_COUT: 'You have referred {0} users', // new
12031220
COPY_LINK_BUTTON: 'COPY REFERRAL LINK', // new
@@ -1310,5 +1327,5 @@ export default {
13101327
APPLY_TODAY: 'Apply today' // new
13111328
},
13121329
OPEN_WALLET: 'Open wallet', // new
1313-
AGO: 'ago', // new
1330+
AGO: 'ago' // new
13141331
};

‎web/src/config/ko.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ export default {
1313
CANCEL_WITHDRAWAL_POPUP_CONFIRM: '진행중인 출금 거래를 취소하시겠습니까?:',
1414
CANT_BE_CANCELLED: '-',
1515
ALREADY_CANCELLED: '-',
16-
TIMESTAMP_FORMAT: 'YYYY/MM/DD HH:mm:ss A',
17-
HOUR_FORMAT: 'HH:mm:ss A',
16+
TIMESTAMP_FORMAT: 'YYYY/MM/DD HH:mm:ss',
17+
HOUR_FORMAT: 'HH:mm:ss',
1818
LOGIN_TEXT: '로그인',
1919
SIGN_IN: '로그인',
2020
SIGNUP_TEXT: '회원가입',

0 commit comments

Comments
 (0)