Merge pull request #575 from bitholla/2.0-develop

2.0 develop

web/src/actions/appActions.js

@@ -308,7 +308,7 @@ export const getWaveAuction = () => {
 
 export const getAnnouncement = () => (dispatch) => {
 	return axios
-		.get(`${PLUGIN_URL}/plugins/announcement`)
+		.get(`${PLUGIN_URL}/plugins/announcements`)
 		.then((res) => {
 			if (res.data && res.data.data) {
 				dispatch({

web/src/actions/walletActions.js

@@ -25,7 +25,6 @@ export const ACTION_KEYS = {
 	WITHDRAWAL_CANCEL_PENDING: 'WITHDRAWAL_CANCEL_PENDING',
 	WITHDRAWAL_CANCEL_FULFILLED: 'WITHDRAWAL_CANCEL_FULFILLED',
 	WITHDRAWAL_CANCEL_REJECTED: 'WITHDRAWAL_CANCEL_REJECTED',
-	DEPOSIT_STATUS_SUCCESS: 'DEPOSIT_STATUS_SUCCESS',
 };
 
 const ENDPOINTS = {
@@ -39,6 +38,7 @@ const ENDPOINTS = {
 	WITHDRAW_FEE: (currency) => `/user/withdrawal?currency=${currency}`,
 	CANCEL_WITHDRAWAL: '/user/withdrawal',
 	CONFIRM_WITHDRAWAL: '/user/confirm-withdrawal',
+	CHECK_TRANSACTION: '/user/check-transaction',
 };
 
 export const performWithdraw = (currency, values) => {
@@ -353,13 +353,7 @@ export const performConfirmWithdrawal = (token) => {
 	return axios.post(ENDPOINTS.CONFIRM_WITHDRAWAL, { token });
 };
 
-export const searchUserDeposits = (params) => {
+export const searchTransaction = (params) => {
 	const query = querystring.stringify(params);
-	return axios.get(`${ENDPOINTS.DEPOSITS}?${query}`);
-};
-
-export const setDeposit = (deposit) => {
-	return (dispatch) => {
-		dispatch({ type: ACTION_KEYS.DEPOSIT_STATUS_SUCCESS, payload: deposit });
-	};
+	return axios.get(`${ENDPOINTS.CHECK_TRANSACTION}?${query}`);
 };

web/src/components/CheckDeposit/_CheckDeposit.scss

@@ -10,7 +10,7 @@
 		border-top: 1px solid $colors-border;
 		margin-top: 3rem;
 		padding: 10px 0;
-		span {
+		.field-header {
 			color: $colors-black;
 		}
 		.success-msg {

web/src/components/CheckDeposit/index.js

@@ -7,6 +7,7 @@ import { Button } from '../../components';
 import { STATIC_ICONS } from 'config/icons';
 import renderFields from '../../components/Form/factoryFields';
 import withConfig from 'components/ConfigProvider/withConfig';
+import { required } from '../Form/validations';
 
 const FORM_NAME = 'CheckDeposit';
 
@@ -15,35 +16,55 @@ const CheckDeposit = ({
 	requestDeposit,
 	isLoading,
 	message,
-	successMsg,
+	handleSubmit,
+	coins,
+	pristine,
+	submitting,
+	valid,
 	error,
-	handleSearch = () => {},
 	...props
 }) => {
-	const handleItemSearch = () => {
-		handleSearch(props.formValues);
-	};
+	const coinOptions = [];
+	Object.keys(coins).forEach((data) => {
+		let temp = coins[data];
+		if (temp) {
+			coinOptions.push({
+				label: `${temp.fullname} (${temp.symbol})`,
+				value: data,
+			});
+		}
+	});
 
 	const formFields = {
 		transaction_id: {
 			type: 'text',
 			placeholder: STRINGS['DEPOSIT_STATUS.SEARCH_FIELD_LABEL'],
+			label: STRINGS['DEPOSIT_STATUS.TRANSACTION_ID'],
+			validate: [required],
+			fullWidth: true,
+		},
+		currency: {
+			type: 'select',
+			placeholder: STRINGS['DEPOSIT_STATUS.CURRENCY_FIELD_LABEL'],
+			label: STRINGS['COINS'],
+			options: coinOptions,
+			validate: [required],
+			fullWidth: true,
+		},
+		address: {
+			type: 'text',
+			placeholder: STRINGS['DEPOSIT_STATUS.ADDRESS_FIELD_LABEL'],
+			label:
+				STRINGS[
+					'USER_VERIFICATION.USER_DOCUMENTATION_FORM.FORM_FIELDS.ADDRESS_LABEL'
+				],
+			validate: [required],
 			fullWidth: true,
-			notification: {
-				stringId: 'DEPOSIT_STATUS.SEARCH',
-				text: isLoading
-					? STRINGS['DEPOSIT_STATUS.SEARCHING']
-					: STRINGS['DEPOSIT_STATUS.SEARCH'],
-				iconPath: isLoading
-					? props.icons['CONNECT_LOADING']
-					: STATIC_ICONS.SEARCH,
-				onClick: handleItemSearch,
-			},
 		},
 	};
 
 	return (
-		<form className="check-deposit-modal-wrapper">
+		<form className="check-deposit-modal-wrapper" onSubmit={handleSubmit}>
 			<div className="d-flex justify-content-center align-items-center flex-column">
 				<img
 					src={STATIC_ICONS.SEARCH}
@@ -53,13 +74,14 @@ const CheckDeposit = ({
 				<h2>{STRINGS['DEPOSIT_STATUS.CHECK_DEPOSIT_STATUS']}</h2>
 			</div>
 			<div className="inner-content">
-				<span>{STRINGS['DEPOSIT_STATUS.CHECK_DEPOSIT_STATUS']}</span>
+				<span className="field-header">
+					{STRINGS['DEPOSIT_STATUS.CHECK_DEPOSIT_STATUS']}
+				</span>
 				<div className="mb-5">
 					{STRINGS['DEPOSIT_STATUS.STATUS_DESCRIPTION']}
 				</div>
-				<span>{STRINGS['DEPOSIT_STATUS.TRANSACTION_ID']}</span>
 				{renderFields(formFields)}
-				{message === successMsg ? (
+				{message ? (
 					<div className="d-flex">
 						<img
 							src={STATIC_ICONS.VERIFICATION_ICON}
@@ -68,23 +90,28 @@ const CheckDeposit = ({
 						/>
 						<p className="success-msg">{message}</p>
 					</div>
-				) : (
-					<p className="error-msg">{message}</p>
-				)}
+				) : null}
+				{error && <div className="warning_text">{error}</div>}
 			</div>
-			<div className="w-100 buttons-wrapper d-flex mt-3">
-				<Button label="BACK" onClick={onCloseDialog} />
+			<div className="w-100 buttons-wrapper d-flex justify-content-between mt-3">
+				<Button label="BACK" onClick={onCloseDialog} className="mr-3" />
+				<Button
+					label={STRINGS['SUBMIT']}
+					disabled={pristine || submitting || !valid}
+				/>
 			</div>
 		</form>
 	);
 };
 
 const CheckDepositForm = reduxForm({
 	form: FORM_NAME,
+	enableReinitialize: true,
 })(CheckDeposit);
 
 const mapStateToProps = (state) => ({
 	formValues: getFormValues(FORM_NAME)(state),
+	coins: state.app.coins,
 });
 
 export default connect(mapStateToProps)(withConfig(CheckDepositForm));

web/src/components/Notification/InviteFriends.js

@@ -8,6 +8,7 @@ import DumbField from '../Form/FormFields/DumbField';
 import Button from '../Button';
 import STRINGS from '../../config/localizedStrings';
 import { getUserReferralCount } from '../../actions/userAction';
+import { setSnackNotification } from '../../actions/appActions';
 import { EditWrapper } from 'components';
 
 const RenderDumbField = (props) => <DumbField {...props} />;
@@ -24,6 +25,14 @@ class InviteFriends extends Component {
 		this.props.getUserReferralCount();
 	}
 
+	handleCopy = () => {
+		const { icons: ICONS, setSnackNotification } = this.props;
+		setSnackNotification({
+			icon: ICONS.COPY_NOTIFICATION,
+			content: STRINGS['COPY_SUCCESS_TEXT'],
+		});
+	};
+
 	render() {
 		const { affiliation_code } = this.props.data;
 		const { affiliation, icons: ICONS } = this.props;
@@ -96,6 +105,7 @@ const mapStateToProps = (store) => ({
 
 const mapDispatchToProps = (dispatch) => ({
 	getUserReferralCount: bindActionCreators(getUserReferralCount, dispatch),
+	setSnackNotification: bindActionCreators(setSnackNotification, dispatch),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(InviteFriends);

web/src/components/Sidebar/_Sidebar.scss

@@ -154,6 +154,9 @@ $row--size: calc(#{$row--height} - #{$sidebar-sections-padding});
 				fill: transparent;
 			}
 		}
+		img.sidebar-bottom-icon {
+			@include size(3rem);
+		}
 	}
 }
 

web/src/components/Sidebar/index.js

@@ -31,7 +31,7 @@ const Sidebar = ({
 			})}
 		>
 			<SidebarHub {...sidebarHubProps} />
-			{enabledPlugins.includes('announcement') ? (
+			{enabledPlugins.includes('announcements') ? (
 				<div className="sidebar-notifications m-3">
 					<div className="ml-3 my-3 sidebar-title">
 						{STRINGS['TRADE_TAB_POSTS'].toUpperCase()}

web/src/config/lang/en.js

@@ -1408,9 +1408,9 @@ const nestedContent = {
 		STATUS_DESCRIPTION:
 			'You can check the status of your deposit by passing the transaction ID (hash) below.',
 		TRANSACTION_ID: 'Transaction ID (hash)',
-		SEARCH_SUCCESS: 'Transaction found!',
-		SEARCH_ERROR:
-			'Transaction not found. Please check the ID and try again. If your believe there is a problem please contact support.',
+		SEARCH_SUCCESS: 'Search complete', // new
+		ADDRESS_FIELD_LABEL: 'Paste your address', // new
+		CURRENCY_FIELD_LABEL: 'Select the currency', // new
 	},
 	CANCEL_ORDERS: {
 		HEADING: 'Cancel orders',

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

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Modal } from 'antd';
+import { message, Modal } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import _isEqual from 'lodash/isEqual';
 
@@ -322,35 +322,45 @@ class FooterConfig extends Component {
 	};
 
 	handleAddLink = (formProps) => {
-		const custom_fields = { ...this.state.custom_fields };
-		let currentField = custom_fields[this.state.currentSection];
-		let currentFieldContent = currentField.content || {};
-		let currentFieldHeader = currentField.header || {};
-		let currentContentFields = currentFieldContent.fields || {};
-		custom_fields[this.state.currentSection] = {
-			...currentField,
-			content: {
-				...currentFieldContent,
-				fields: {
-					...currentContentFields,
-					[formProps.link.toLowerCase()]: {
-						type: 'input',
-						label: formProps.link,
-						placeholder: 'http://',
-						isClosable: true,
-						closeCallback: () =>
-							this.handleRemoveLinks(
-								currentFieldHeader.fields,
-								formProps.link.toLowerCase()
-							),
+		let initialCustom = { ...this.state.initialCustom };
+		if (
+			formProps.link &&
+			Object.keys(initialCustom).includes(formProps.link.toLowerCase())
+		) {
+			message.warn('Link already exist');
+		} else {
+			const custom_fields = { ...this.state.custom_fields };
+			let currentField = custom_fields[this.state.currentSection];
+			let currentFieldContent = currentField.content || {};
+			let currentFieldHeader = currentField.header || {};
+			let currentContentFields = currentFieldContent.fields || {};
+			custom_fields[this.state.currentSection] = {
+				...currentField,
+				content: {
+					...currentFieldContent,
+					fields: {
+						...currentContentFields,
+						[formProps.link.toLowerCase()]: {
+							type: 'input',
+							label: formProps.link,
+							placeholder: 'http://',
+							isClosable: true,
+							closeCallback: () =>
+								this.handleRemoveLinks(
+									currentFieldHeader.fields,
+									formProps.link.toLowerCase()
+								),
+						},
 					},
 				},
-			},
-		};
-		this.setState({
-			custom_fields,
-		});
-		this.onCancel();
+			};
+			initialCustom[formProps.link.toLowerCase()] = '';
+			this.setState({
+				initialCustom,
+				custom_fields,
+			});
+			this.onCancel();
+		}
 	};
 
 	handleSubmitLinks = (formProps) => {

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

@@ -17,7 +17,7 @@ const MoveToDash = () => {
 			/>
 			<div>
 				<a
-					href="https://dash.bitholla.com/"
+					href="https://dash.bitholla.com/financial"
 					target="_blank"
 					rel="noopener noreferrer"
 				>

web/src/containers/App/App.js

@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import ReactDOM from 'react-dom';
 import classnames from 'classnames';
 import EventListener from 'react-event-listener';
 import { Helmet } from 'react-helmet';
@@ -699,7 +700,10 @@ class App extends Component {
 								)}
 							</div>
 						</div>
-						<SnackNotification />
+						{ReactDOM.createPortal(
+							<SnackNotification />,
+							document.getElementsByTagName('body')[0]
+						)}
 						<SnackDialog />
 					</div>
 					<div

web/src/containers/MobileHome/index.js

@@ -92,7 +92,7 @@ class Home extends Component {
 					} */}
 					<div className="post-wrapper mt-4 mx-3">
 						<div className="post-title mb-3">{STRINGS['TRADE_TAB_POSTS']}</div>
-						{enabledPlugins.includes('announcement') ? (
+						{enabledPlugins.includes('announcements') ? (
 							<NotificationsList />
 						) : null}
 					</div>