Merge pull request #527 from bitholla/2.0

2.0

server/api/swagger/swagger.yaml

@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  version: "2.0.3"
+  version: "2.0.4"
   title: HollaEx Kit
 host: api.hollaex.com
 basePath: /v2

server/package.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.0.3",
+	"version": "2.0.4",
 	"private": false,
 	"description": "HollaEx Kit",
 	"keywords": [

version

@@ -1 +1 @@
-2.0.3
+2.0.4

web/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hollaex-kit",
-	"version": "2.0.3",
+	"version": "2.0.4",
 	"private": true,
 	"dependencies": {
 		"@ant-design/compatible": "1.0.5",

web/src/actions/appActions.js

@@ -1,6 +1,6 @@
 import { setLanguage as storeLanguageInBrowser } from '../utils/string';
 import { hasTheme } from 'utils/theme';
-import { DEFAULT_LANGUAGE, LANGUAGE_KEY, PLUGIN_URL } from '../config/constants';
+import { DEFAULT_LANGUAGE, LANGUAGE_KEY, PLUGIN_URL } from 'config/constants';
 import axios from 'axios';
 
 export const SET_NOTIFICATION = 'SET_NOTIFICATION';
@@ -48,6 +48,7 @@ export const RISKY_ORDER = 'RISKY_ORDER';
 export const LOGOUT_CONFORMATION = 'LOGOUT_CONFORMATION';
 export const SET_CURRENCIES = 'SET_CURRENCIES';
 export const SET_CONFIG = 'SET_CONFIG';
+export const SET_PLUGINS = 'SET_PLUGINS';
 export const REQUEST_XHT_ACCESS = 'REQUEST_XHT_ACCESS';
 export const SET_INFO = 'SET_INFO';
 export const SET_WAVE_AUCTION = 'SET_WAVE_AUCTION';
@@ -219,13 +220,7 @@ export const setCurrencies = (coins) => ({
 });
 
 export const setConfig = (constants = {}) => {
-	let enabledPlugins = [];
 	let features = {};
-	if (constants) {
-		if (constants.plugins && constants.plugins.enabled) {
-			enabledPlugins = constants.plugins.enabled.split(',');
-		}
-	}
 	if (constants) {
 		if (constants.features) {
 			features = constants.features;
@@ -235,12 +230,20 @@ export const setConfig = (constants = {}) => {
 		type: SET_CONFIG,
 		payload: {
 			constants,
-			enabledPlugins,
 			features,
 		},
 	};
 };
 
+export const setPlugins = (enabledPlugins) => {
+	return {
+		type: SET_PLUGINS,
+		payload: {
+			enabledPlugins,
+		},
+	};
+};
+
 export const setInfo = (info) => ({
 	type: SET_INFO,
 	payload: {
@@ -257,6 +260,7 @@ export const openRiskPortfolioOrderWarning = (data = {}) =>
 export const logoutconfirm = (data = {}) =>
 	setNotification(LOGOUT_CONFORMATION, data, true);
 
+export const requestPlugins = () => axios.get(`${PLUGIN_URL}/plugins`);
 export const requestInitial = () => axios.get('/kit');
 export const requestConstant = () => axios.get('/constants');
 export const requestAdminData = () => axios.get('/admin/kit');

web/src/components/AdminForm/hoc.js

@@ -16,9 +16,20 @@ const Form = (name, className = '', allowPristine = false) => {
 		buttonType,
 		small,
 		buttonClass = '',
+		submitOnKeyDown = false,
 	}) => {
 		return (
-			<form className={className}>
+			<form
+				className={className}
+				onKeyDown={(e) => {
+					if (e.key === 'Enter' && !e.shiftKey) {
+						if (submitOnKeyDown && !submitting && valid && !error) {
+							e.preventDefault();
+							handleSubmit(onSubmit)();
+						}
+					}
+				}}
+			>
 				{fields && renderFields(fields)}
 				{error && (
 					<div>

web/src/containers/Admin/AppWrapper/index.js

@@ -236,6 +236,7 @@ class AppWrapper extends React.Component {
 	};
 
 	renderMenuItem = ({ path, label, routeKey, ...rest }, index) => {
+		const { constants: { logo_image } = {} } = this.props;
 		let showLabel = label;
 		if (routeKey === 'main') {
 			showLabel = this.props.constants.api_name || '';
@@ -250,8 +251,15 @@ class AppWrapper extends React.Component {
 							}
 						>
 							<ReactSVG
-								src={STATIC_ICONS.HEX_PATTERN_ICON}
+								src={logo_image || STATIC_ICONS.HEX_PATTERN_ICON}
 								className="sidebar-icon"
+								fallback={() => (
+									<img
+										src={logo_image || STATIC_ICONS.HEX_PATTERN_ICON}
+										alt="exchange-logo"
+										className="sidebar-icon"
+									/>
+								)}
 							/>
 							<div>
 								<div>DASHBOARD</div>

web/src/containers/Admin/General/index.js

@@ -142,6 +142,7 @@ class General extends Component {
 		}
 		this.setState((prevState) => ({
 			...prevState,
+			loading: false,
 			pendingPublishIcons: merge({}, prevState.pendingPublishIcons, {
 				[iconKey]: icons,
 			}),

web/src/containers/Admin/SetupWizard/AccountSecurity.js

@@ -62,6 +62,16 @@ const AccountSecurity = ({
 				message.error(_error);
 			});
 	};
+
+	const open = () => {
+		if (window) {
+			window.open(
+				'https://support.google.com/accounts/answer/1066447?hl=en',
+				'_blank'
+			);
+		}
+	};
+
 	return (
 		<div className="security-content">
 			{user.otp_enabled ? (
@@ -98,7 +108,9 @@ const AccountSecurity = ({
 					<div>{user.otp.secret ? user.otp.secret : ''}</div>
 					<div>
 						Don't know what to do?{' '}
-						<span className="step-link">Click here for directions.</span>
+						<span className="step-link" onClick={open}>
+							Click here for directions.
+						</span>
 					</div>
 					<div className="form-wrapper">
 						<Form name="security-form" onFinish={handleSubmit}>

web/src/containers/Admin/SetupWizard/Assets.js

@@ -17,10 +17,26 @@ const Assets = ({
 		if (Object.keys(coins).length !== 0) {
 			if (coins['usdt']) {
 				return coins['usdt'].symbol;
-			} else {
-				const firstCoinKey = Object.keys(coins)[0];
-				return coins[firstCoinKey].symbol;
 			}
+
+			const [firstFiatCoinKey] =
+				Object.entries(coins).find(
+					([_, { meta: { is_fiat } = {} }]) => is_fiat
+				) || [];
+			if (firstFiatCoinKey) {
+				return coins[firstFiatCoinKey].symbol;
+			}
+
+			if (coins['btc']) {
+				return coins['btc'].symbol;
+			}
+
+			if (coins['eth']) {
+				return coins['eth'].symbol;
+			}
+
+			const firstCoinKey = Object.keys(coins)[0];
+			return coins[firstCoinKey].symbol;
 		}
 	};
 
@@ -45,6 +61,13 @@ const Assets = ({
 		};
 		updateConstants(formValues, () => handleNext(3));
 	};
+
+	const open = (link) => {
+		if (window) {
+			window.open(link, '_blank');
+		}
+	};
+
 	return (
 		<div className="asset-content show-scroll">
 			<div className="title-text">Native currency</div>
@@ -70,7 +93,12 @@ const Assets = ({
 			<div className="title-text">Review assets</div>
 			<div>
 				Don't see your asset?{' '}
-				<span className="step-link">Create or add your asset here.</span>
+				<span
+					className="step-link"
+					onClick={() => open('https://dash.bitholla.com/financial')}
+				>
+					Create or add your asset here.
+				</span>
 			</div>
 			<div className="coin-wrapper">
 				{Object.keys(coins).map((symbol, index) => {
@@ -86,7 +114,12 @@ const Assets = ({
 			<div className="title-text">Review pairs</div>
 			<div>
 				Don't see your pair?{' '}
-				<span className="step-link">Create or add your pair here.</span>
+				<span
+					className="step-link"
+					onClick={() => open('https://dash.bitholla.com/trade')}
+				>
+					Create or add your pair here.
+				</span>
 			</div>
 			<div className="coin-wrapper last">
 				{Object.keys(pairs).map((pair, index) => {

web/src/containers/Admin/SetupWizard/SetupComplete.js

@@ -91,6 +91,12 @@ class ExchangeSetup extends Component {
 									? null
 									: 'icon-align'
 							}
+							beforeInjection={(svg) => {
+								if (value.icon === STATIC_ICONS.SETUP_QUICK_TRADE) {
+									svg.setAttribute('width', '216px');
+									svg.setAttribute('height', '216px');
+								}
+							}}
 						/>
 					</div>
 					<div className="setup-field-label">{value.title}</div>

web/src/containers/Admin/Tiers/ModalForm.js

@@ -367,6 +367,7 @@ class NewTierForm extends Component {
 					<Editor
 						wrapperClassName="text-editor-wrapper"
 						editorClassName="text-editor"
+						toolbarClassName="text-editor-toolbar"
 						editorState={editorState}
 						onEditorStateChange={this.onEditorStateChange}
 					/>

web/src/containers/Admin/Tiers/Tiers.js

@@ -42,7 +42,9 @@ const TiersContainer = ({
 							</div>
 							<div className="mx-3 f-1">
 								<div>
-									<div>Account Tier {tier}</div>
+									<div>
+										{tierData.name ? tierData.name : `Account Tier ${tier}`}
+									</div>
 									<div className="description">{tierData.description}</div>
 								</div>
 								<div className="requirement-divider"></div>

web/src/containers/Admin/Tiers/index.css

@@ -37,6 +37,9 @@
 	border-radius: 4px;
 	min-height: 200px;
 }
+.new-tier-form .text-editor-toolbar {
+	color: black;
+}
 .table-tier-icon {
 	height: 2.5rem;
 	width: 2.5rem;

web/src/containers/App/Socket.js

@@ -43,6 +43,8 @@ import {
 	setSnackDialog,
 	setConfig,
 	setInfo,
+	setPlugins,
+	requestPlugins,
 	requestInitial,
 	requestConstant,
 } from '../../actions/appActions';
@@ -70,6 +72,9 @@ class Container extends Component {
 		if (!this.props.fetchingAuth) {
 			this.initSocketConnections();
 		}
+		requestPlugins().then(({ data = {} }) => {
+			if (data.data && data.data.length !== 0) this.props.setPlugins(data.data);
+		});
 	}
 
 	UNSAFE_componentWillReceiveProps(nextProps) {
@@ -722,6 +727,7 @@ const mapDispatchToProps = (dispatch) => ({
 	setConfig: bindActionCreators(setConfig, dispatch),
 	setInfo: bindActionCreators(setInfo, dispatch),
 	getMe: bindActionCreators(getMe, dispatch),
+	setPlugins: bindActionCreators(setPlugins, dispatch),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(Container);

web/src/containers/Init/Login.js

@@ -95,6 +95,7 @@ const Login = (props) => {
 							}}
 							onSubmit={handleSubmit}
 							buttonText={'Proceed'}
+							submitOnKeyDown={true}
 						/>
 					</div>
 				</div>

web/src/containers/Init/_Init.scss

@@ -4,6 +4,15 @@ $color-white: #ffffff;
 	flex: 1;
 	height: 100%;
 
+	input {
+		border: 1px solid #c4c4c4;
+	}
+
+	input:focus {
+		border: 1px solid #ffffff;
+		outline: 1px solid #ffffff;
+	}
+
 	.message {
 		color: $color-white;
 		width: 100%;

web/src/index.css

@@ -3592,6 +3592,11 @@ table th {
 .init-container {
   flex: 1;
   height: 100%; }
+  .init-container input {
+    border: 1px solid #c4c4c4; }
+  .init-container input:focus {
+    border: 1px solid #ffffff;
+    outline: 1px solid #ffffff; }
   .init-container .message {
     color: #ffffff;
     width: 100%;