Merge pull request #1772 from hollaex/testnet

Testnet
hollaex · Nov 11, 2022 · 362fc77 · 362fc77
2 parents 96fc9f3 + a308324
commit 362fc77
Show file tree

Hide file tree

Showing 18 changed files with 82 additions and 42 deletions.
diff --git a/server/api/swagger/swagger.yaml b/server/api/swagger/swagger.yaml
@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  version: "2.4.5"
+  version: "2.4.6"
   title: HollaEx Kit
 host: api.hollaex.com
 basePath: /v2
@@ -3186,6 +3186,7 @@ paths:
       x-security-scopes:
         - admin
         - supervisor
+        - kyc
   /admin/user/role:
     x-swagger-router-controller: admin
     put:
@@ -3246,6 +3247,7 @@ paths:
         - Bearer: []
       x-security-scopes:
         - admin
+        - supervisor
   /admin/user/discount:
     x-swagger-router-controller: admin
     put:
@@ -3290,6 +3292,7 @@ paths:
         - Bearer: []
       x-security-scopes:
         - admin
+        - supervisor
   /admin/user/note:
     x-swagger-router-controller: admin
     put:

diff --git a/server/docker-compose.yaml b/server/docker-compose.yaml
@@ -33,11 +33,9 @@ services:
     env_file:
       - ./tools/hollaex-kit.env.local
     entrypoint:
-      - pm2-runtime
-      - start
-      - ecosystem.config.js
-      - --env
-      - development
+      - /bin/sh
+      - -c 
+      - ip -4 route list match 0/0 | awk '{print $$3 " host.docker.internal"}' >> /etc/hosts && cat /etc/hosts && pm2-runtime start ecosystem.config.js --env development;
     volumes:
       - ./api:/app/api
       - ./config:/app/config

diff --git a/server/package.json b/server/package.json
@@ -1,5 +1,5 @@
 {
-	"version": "2.4.5",
+	"version": "2.4.6",
 	"private": false,
 	"description": "HollaEx Kit",
 	"keywords": [

diff --git a/server/tools/Dockerfile.pm2 b/server/tools/Dockerfile.pm2
@@ -22,7 +22,7 @@ FROM node:10.15.3-stretch-slim
 
 COPY --from=build /app /app
 
-RUN apt-get update && apt-get install -y --no-install-recommends git python build-essential && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends git iproute2 python build-essential && rm -rf /var/lib/apt/lists/*
 
 RUN npm install pm2@3.2.7 sequelize-cli@5.4.0 mocha@6.2.3 -g
 

diff --git a/version b/version
@@ -1 +1 @@
-2.4.5
+2.4.6
diff --git a/web/.env b/web/.env
@@ -20,3 +20,4 @@ REACT_APP_PLUGIN_DEV_MODE=
 REACT_APP_PLUGIN=
 REACT_APP_LANG=
 
+REACT_APP_LAST_BUILD=
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "hollaex-kit",
-	"version": "2.4.5",
+	"version": "2.4.6",
 	"private": true,
 	"dependencies": {
 		"@ant-design/compatible": "1.0.5",

diff --git a/web/src/components/AppBar/AnnouncementList.js b/web/src/components/AppBar/AnnouncementList.js
@@ -4,10 +4,10 @@ import { bindActionCreators } from 'redux';
 import Scrollbars from 'react-custom-scrollbars';
 
 import { EditWrapper, NotificationsList, Image } from 'components';
-import STRINGS from 'config/localizedStrings';
+import STRINGS from '../../config/localizedStrings';
 import withConfig from 'components/ConfigProvider/withConfig';
 import { getAnnouncement } from 'actions/appActions';
-import { LAST_UPDATED_NOTIFICATION_KEY } from 'config/constants';
+import { LAST_UPDATED_NOTIFICATION_KEY } from '../../config/constants';
 
 const AnnouncementList = ({
 	icons: ICONS,
@@ -97,7 +97,7 @@ const AnnouncementList = ({
 				</div>
 			</div>
 			{isOpen && (
-				<div className="app-bar-account-menu apply_rtl">
+				<div className="app-bar-account-menu apply_rtl opacity-1">
 					<div className="app-announcement-list">
 						<Scrollbars>
 							<NotificationsList ICONS={ICONS} />

diff --git a/web/src/components/CurrencyBall/withPrice.js b/web/src/components/CurrencyBall/withPrice.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import { CurrencyBall } from 'components';
-import { formatToCurrency } from 'utils/currency';
+import { formatCurrencyByIncrementalUnit } from 'utils/currency';
 import { DEFAULT_COIN_DATA } from 'config/constants';
 
 const CurrencyBallWithPrice = ({
@@ -13,13 +13,15 @@ const CurrencyBallWithPrice = ({
 	isExistBroker = false,
 }) => {
 	const { display_name, ...rest } = coins[symbol] || DEFAULT_COIN_DATA;
-	const minValue = rest.min ? rest.min : min;
+	const minValue = rest.increment_unit ?? min;
 
 	return (
 		<div className="with_price-block_amount d-flex direction_ltr">
 			<CurrencyBall name={display_name} symbol={symbol} size={size} />
 			<div className="with_price-block_amount-value d-flex">
-				{isExistBroker ? amount : `${formatToCurrency(amount, minValue)}`}
+				{isExistBroker
+					? amount
+					: `${formatCurrencyByIncrementalUnit(amount, minValue)}`}
 			</div>
 		</div>
 	);

diff --git a/web/src/containers/Admin/User/AboutData.js b/web/src/containers/Admin/User/AboutData.js
@@ -643,7 +643,7 @@ const AboutData = ({
 								/>
 							</div>
 							<div className="user-info-label">
-								Verification level: {userData.verification_level}
+								Tier: {userData.verification_level}
 							</div>
 							<div className="ml-4">
 								<Button

diff --git a/web/src/containers/Admin/UserBalance/index.js b/web/src/containers/Admin/UserBalance/index.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import { Spin, Table } from 'antd';
 import { SubmissionError } from 'redux-form';
 import { ReactSVG } from 'react-svg';
-import Moment from 'react-moment';
 
 import { DonutChart, CurrencyBall } from '../../../components';
 import { requestUserBalance } from './actions';
@@ -126,14 +125,6 @@ class UserBalance extends Component {
 			// 		}
 			// 	}
 			// },
-			{
-				title: 'Last generated',
-				dataIndex: 'updated_at',
-				key: 'updated_at',
-				render: (updated) => (
-					<Moment format="YYYY/MM/DD HH:mm">{updated}</Moment>
-				),
-			},
 			{
 				title: 'Available',
 				dataIndex: 'balance_available',

diff --git a/web/src/containers/Trade/Chart.js b/web/src/containers/Trade/Chart.js
@@ -263,7 +263,7 @@ class TVChartContainer extends React.PureComponent {
 			library_path: libraryPath,
 			// timeframe: 'M',
 			timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-			locale: locale === 'id' ? 'en' : locale,
+			locale: ['id', 'mn'].includes(locale) ? 'en' : locale,
 			withdateranges: true,
 			range: 'ytd',
 			disabled_features: [
@@ -402,8 +402,7 @@ class TVChartContainer extends React.PureComponent {
 			} else if (data.price > lastBar.high) {
 				lastBar.high = data.price;
 			}
-
-			lastBar.volume = lastBar.volume ? lastBar.volume + data.size : data.size;
+			lastBar.volume = lastBar.volume ? Number(lastBar.volume) + Number(data.size) : data.size;
 			lastBar.close = data.price;
 			if (!lastBar.low) lastBar.low = 0;
 			if (!lastBar.close) lastBar.close = 0;

diff --git a/web/src/containers/Trade/components/PriceRow.js b/web/src/containers/Trade/components/PriceRow.js
@@ -54,7 +54,16 @@ class PriceRow extends Component {
 		const fillStyle = {
 			backgroundSize: `${calcPercentage(amount, maxCumulative)}% 100%`,
 		};
-		const totalAmount = isBase ? cumulative : cumulativePrice;
+
+		const totalProps = {
+			className: classnames(
+				'f-1',
+				'trade_orderbook-cell',
+				'trade_orderbook-cell_total',
+				{ pointer: isBase }
+			),
+			...(isBase ? { onClick: onAmountClick(cumulative) } : {}),
+		};
 
 		return (
 			<Transition in={inProp} timeout={1000}>
@@ -87,10 +96,7 @@ class PriceRow extends Component {
 							>
 								{opacifyNumber(formatToCurrency(amount, increment_size))}
 							</div>
-							<div
-								className="f-1 trade_orderbook-cell trade_orderbook-cell_total pointer"
-								onClick={onAmountClick(totalAmount)}
-							>
+							<div {...totalProps}>
 								{isBase
 									? formatToCurrency(cumulative, increment_size)
 									: formatToCurrency(cumulativePrice, increment_price)}

diff --git a/web/src/containers/Wallet/AssetsBlock.js b/web/src/containers/Wallet/AssetsBlock.js
@@ -10,7 +10,10 @@ import {
 	AssetsBlockForm,
 	EditWrapper,
 } from 'components';
-import { formatToCurrency, calculateOraclePrice } from 'utils/currency';
+import {
+	formatCurrencyByIncrementalUnit,
+	calculateOraclePrice,
+} from 'utils/currency';
 import STRINGS from 'config/localizedStrings';
 import {
 	BASE_CURRENCY,
@@ -235,8 +238,11 @@ const AssetsBlock = ({
 							const baseCoin = coins[BASE_CURRENCY] || DEFAULT_COIN_DATA;
 							const balanceText =
 								key === BASE_CURRENCY
-									? formatToCurrency(balanceValue, increment_unit)
-									: formatToCurrency(
+									? formatCurrencyByIncrementalUnit(
+											balanceValue,
+											increment_unit
+									  )
+									: formatCurrencyByIncrementalUnit(
 											calculateOraclePrice(balanceValue, oraclePrice),
 											baseCoin.increment_unit
 									  );
@@ -284,7 +290,10 @@ const AssetsBlock = ({
 												<div className="mr-4">
 													{STRINGS.formatString(
 														CURRENCY_PRICE_FORMAT,
-														formatToCurrency(balanceValue, increment_unit),
+														formatCurrencyByIncrementalUnit(
+															balanceValue,
+															increment_unit
+														),
 														display_name
 													)}
 												</div>

diff --git a/web/src/containers/Wallet/MainWallet.js b/web/src/containers/Wallet/MainWallet.js
@@ -10,7 +10,7 @@ import {
 	CURRENCY_PRICE_FORMAT,
 	DEFAULT_COIN_DATA,
 } from 'config/constants';
-import { formatToCurrency } from 'utils/currency';
+import { formatCurrencyByIncrementalUnit } from 'utils/currency';
 import STRINGS from 'config/localizedStrings';
 import withConfig from 'components/ConfigProvider/withConfig';
 
@@ -143,11 +143,12 @@ class Wallet extends Component {
 		contracts = {},
 		isFetching
 	) => {
-		const { min, display_name } = coins[BASE_CURRENCY] || DEFAULT_COIN_DATA;
+		const { increment_unit, display_name } =
+			coins[BASE_CURRENCY] || DEFAULT_COIN_DATA;
 		const totalAssets = STRINGS.formatString(
 			CURRENCY_PRICE_FORMAT,
 			display_name,
-			formatToCurrency(total, min)
+			formatCurrencyByIncrementalUnit(total, increment_unit)
 		);
 		const searchResult = this.getSearchResult(coins, balance, oraclePrices);
 

diff --git a/web/src/index.css b/web/src/index.css
@@ -4207,6 +4207,11 @@ table th {
   width: 100%;
   font-size: 1rem;
   margin-bottom: 3rem; }
+  .market-list__container .market-list__block .market-list__block-table .loading-anime {
+    height: 20px;
+    width: 100px;
+    border-radius: 7px;
+    animation: mymove 3s infinite; }
   .market-list__container .market-list__block .market-list__block-table thead {
     color: var(--labels_secondary-inactive-label-text-graphics); }
     .market-list__container .market-list__block .market-list__block-table thead tr {
@@ -4260,6 +4265,12 @@ table th {
 .direction_ltr .market-list__container .market-list__block .market-list__block-table .table-icon {
   padding-right: 0.5rem; }
 
+.direction_ltr .market-list__container .market-list__block .market-list__block-table .loading-anime {
+  height: 20px;
+  width: 100px;
+  border-radius: 7px;
+  animation: mymove 3s infinite; }
+
 .direction_rtl .market-list__container .market-list__block .market-list__block-table th,
 .direction_rtl .market-list__container .market-list__block .market-list__block-table td {
   text-align: right; }
@@ -4292,6 +4303,11 @@ table th {
     min-width: 12rem !important;
     max-width: 12rem !important;
     z-index: 1; }
+  .layout-mobile .market-list__container .market-list__block .market-list__block-table .loading-anime {
+    height: 20px;
+    width: 100px;
+    border-radius: 7px;
+    animation: mymove 3s infinite; }
 
 .layout-mobile .trade_tabs-container .sticky-col {
   background-color: var(--base_background) !important; }
@@ -4499,6 +4515,11 @@ table th {
   .trade_tabs-container .market-card__sparkline-wrapper {
     padding-top: 10px;
     height: 12rem; }
+  .trade_tabs-container .loading-anime {
+    height: 20px;
+    width: 100px;
+    border-radius: 7px;
+    animation: mymove 3s infinite; }
 
 .layout-mobile .trade_tabs-container {
   overflow-y: scroll; }

diff --git a/web/src/utils/currency.js b/web/src/utils/currency.js
@@ -68,6 +68,15 @@ export const getFormat = (min = 0, fullFormat) => {
 };
 
 export const formatToCurrency = (amount = 0, min = 0, fullFormat = false) => {
+	let formatObj = getFormat(min, fullFormat);
+	return numbro(roundNumber(amount, formatObj.digit)).format(formatObj.format);
+};
+
+export const formatCurrencyByIncrementalUnit = (
+	amount = 0,
+	min = 0,
+	fullFormat = false
+) => {
 	let formatObj = getFormat(min, fullFormat);
 	let _amount = amount;
 	if (min >= 1) {