+ {this.props.modalsHistory.length > 1 && (
+
+ );
+ }
}
export default connect(mapStateToProps, mapDispatchToProps)(Confirm2FA);
diff --git a/src/containers/modals/account/account-details/account-lessors.js b/src/containers/modals/account/account-details/account-lessors.js
deleted file mode 100644
index a57a45045..000000000
--- a/src/containers/modals/account/account-details/account-lessors.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React, {Comment} from 'react';
-
-class AccountLessors extends Comment {
- componentDidMount = () => {
-
- }
-
- render () {
- return (
- <>
-
-
- );
- }
-}
-
-export default AccountLessors;
\ No newline at end of file
diff --git a/src/containers/modals/account/account-info.js b/src/containers/modals/account/account-info.js
index d2252d264..d9befbd92 100644
--- a/src/containers/modals/account/account-info.js
+++ b/src/containers/modals/account/account-info.js
@@ -3,153 +3,184 @@
* *
******************************************************************************/
-
-import React from 'react';
-import {connect} from 'react-redux';
-import {Text, TextArea} from 'react-form';
+import React from "react";
+import { connect } from "react-redux";
+import { Text, TextArea } from "react-form";
import classNames from "classnames";
-import {NotificationManager} from "react-notifications";
-import {openPrevModal, saveSendModalState, setBodyModalParamsAction, setModalData} from '../../../modules/modals';
+import { NotificationManager } from "react-notifications";
+import {
+ openPrevModal,
+ saveSendModalState,
+ setBodyModalParamsAction,
+ setModalData,
+} from "../../../modules/modals";
import submitForm from "../../../helpers/forms/forms";
import crypto from "../../../helpers/crypto/crypto";
-import ModalFooter from '../../components/modal-footer';
-import BackForm from '../modal-form/modal-form-container';
-import NummericInputForm from "../../components/form-components/numeric-input";
+import ModalFooter from "../../components/modal-footer";
+import BackForm from "../modal-form/modal-form-container";
import FeeInputForm from "../../components/form-components/fee-input";
class AccountInfo extends React.Component {
- constructor(props) {
- super(props);
-
- this.state = {
- activeTab: 0,
- advancedState: false,
- isPending: false,
+ constructor(props) {
+ super(props);
- // submitting
- passphraseStatus: false,
- recipientStatus: false,
- amountStatus: false,
- feeStatus: false
- }
- }
+ this.state = {
+ activeTab: 0,
+ advancedState: false,
+ isPending: false,
- handleFormSubmit = async (values) => {
- if (!this.state.isPending) {
- this.setState({isPending: true});
-
- const res = await this.props.submitForm(values, 'setAccountInfo');
- if (res && res.errorCode) {
- NotificationManager.error(res.errorDescription, 'Error', 5000)
- } else {
- this.props.setBodyModalParamsAction(null, {});
- NotificationManager.success('Account info has been submitted!', null, 5000);
- }
- this.setState({isPending: false});
- }
+ // submitting
+ passphraseStatus: false,
+ recipientStatus: false,
+ amountStatus: false,
+ feeStatus: false,
};
+ }
- handleAdvancedState = () => {
- this.setState({
- advancedState: !this.state.advancedState
- });
- };
+ handleFormSubmit = async (values) => {
+ if (!this.state.isPending) {
+ this.setState({ isPending: true });
- render() {
- return (
-
+ );
+ }
}
-const mapStateToProps = state => ({
- modalData: state.modals.modalData,
- modalsHistory: state.modals.modalsHistory
+const mapStateToProps = (state) => ({
+ modalData: state.modals.modalData,
+ modalsHistory: state.modals.modalsHistory,
});
-const mapDispatchToProps = dispatch => ({
- setModalData: (data) => dispatch(setModalData(data)),
- submitForm: (data, requestType) => dispatch(submitForm.submitForm(data, requestType)),
- setBodyModalParamsAction: (type, data, valueForModal) => dispatch(setBodyModalParamsAction(type, data, valueForModal)),
- validatePassphrase: (passphrase) => dispatch(crypto.validatePassphrase(passphrase)),
- saveSendModalState: (Params) => dispatch(saveSendModalState(Params)),
- openPrevModal: () => dispatch(openPrevModal())
+const mapDispatchToProps = (dispatch) => ({
+ setModalData: (data) => dispatch(setModalData(data)),
+ submitForm: (data, requestType) =>
+ dispatch(submitForm.submitForm(data, requestType)),
+ setBodyModalParamsAction: (type, data, valueForModal) =>
+ dispatch(setBodyModalParamsAction(type, data, valueForModal)),
+ validatePassphrase: (passphrase) =>
+ dispatch(crypto.validatePassphrase(passphrase)),
+ saveSendModalState: (Params) => dispatch(saveSendModalState(Params)),
+ openPrevModal: () => dispatch(openPrevModal()),
});
export default connect(mapStateToProps, mapDispatchToProps)(AccountInfo);
diff --git a/src/containers/modals/account/account/asset.js b/src/containers/modals/account/account/asset.js
index 9306ba659..3de988fc7 100644
--- a/src/containers/modals/account/account/asset.js
+++ b/src/containers/modals/account/account/asset.js
@@ -3,140 +3,158 @@
* *
***************************************************************************** */
-import React from 'react';
-import { v4 as uuidv4 } from 'uuid';
-import { connect } from 'react-redux';
-import { withRouter } from 'react-router-dom';
-import { setBodyModalParamsAction, setModalType } from '../../../../modules/modals';
-import { getAskOrders, getBidOrders } from '../../../../actions/marketplace';
+import React from "react";
+import { v4 as uuidv4 } from "uuid";
+import { connect } from "react-redux";
+import { withRouter } from "react-router-dom";
+import {
+ setBodyModalParamsAction,
+ setModalType,
+} from "../../../../modules/modals";
+import { getAskOrders, getBidOrders } from "../../../../actions/marketplace";
class AssetItem extends React.Component {
- state = {};
+ state = {};
- constructor(props) {
- super(props);
+ constructor(props) {
+ super(props);
- this.getAskOrders();
- this.getBidOrders();
- }
-
- componentWillReceiveProps() {
- this.getAskOrders();
- this.getBidOrders();
- }
-
- getAskOrders = async () => {
- const { asset } = this.props;
-
- const askOrders = await this.props.getAskOrders(asset);
-
- if (askOrders && askOrders.orders) {
- let orders = Math.min(...askOrders.orders.map(el => el.priceATM));
+ this.getAskOrders();
+ this.getBidOrders();
+ }
- orders = isFinite(orders) ? orders : null;
+ componentWillReceiveProps() {
+ this.getAskOrders();
+ this.getBidOrders();
+ }
- this.setState({ lowestAskOrder: orders });
- }
- };
+ getAskOrders = async () => {
+ const { asset } = this.props;
- getBidOrders = async () => {
- const { asset } = this.props;
+ const askOrders = await this.props.getAskOrders(asset);
- const bidOrders = await this.props.getBidOrders(asset);
+ if (askOrders && askOrders.orders) {
+ let orders = Math.min(...askOrders.orders.map((el) => el.priceATM));
- if (bidOrders && bidOrders.orders) {
- let orders = Math.max(...bidOrders.orders.map(el => el.priceATM));
+ orders = isFinite(orders) ? orders : null;
- orders = isFinite(orders) ? orders : null;
+ this.setState({ lowestAskOrder: orders });
+ }
+ };
- this.setState({ highestBidOrder: orders });
- }
- };
+ getBidOrders = async () => {
+ const { asset } = this.props;
- close = () => {
- if (this.props.closeModal) {
- this.props.closeModal();
- }
- };
+ const bidOrders = await this.props.getBidOrders(asset);
- gotToAsset = () => {
- const { asset, history, setBodyModalParamsAction } = this.props;
+ if (bidOrders && bidOrders.orders) {
+ let orders = Math.max(...bidOrders.orders.map((el) => el.priceATM));
- setBodyModalParamsAction();
- history.push(`/asset-exchange/${asset}`);
- };
+ orders = isFinite(orders) ? orders : null;
- render() {
- const {
- decimals, asset, name, unconfirmedQuantityATU, quantityATU,
- } = this.props;
+ this.setState({ highestBidOrder: orders });
+ }
+ };
- return (
-
+
+ );
+ }
}
-const mapDispatchToProps = dispatch => ({
- setBodyModalParamsAction: (type, data, valueForModal) => dispatch(setBodyModalParamsAction(type, data, valueForModal)),
- setModalType: type => dispatch(setModalType(type)),
- getAskOrders: asset => getAskOrders(asset),
- getBidOrders: asset => getBidOrders(asset),
+const mapDispatchToProps = (dispatch) => ({
+ setBodyModalParamsAction: (type, data, valueForModal) =>
+ dispatch(setBodyModalParamsAction(type, data, valueForModal)),
+ setModalType: (type) => dispatch(setModalType(type)),
+ getAskOrders: (asset) => getAskOrders(asset),
+ getBidOrders: (asset) => getBidOrders(asset),
});
export default connect(null, mapDispatchToProps)(withRouter(AssetItem));
diff --git a/src/containers/modals/account/account/goods.js b/src/containers/modals/account/account/goods.js
index 282ed7f08..26aea6e3f 100644
--- a/src/containers/modals/account/account/goods.js
+++ b/src/containers/modals/account/account/goods.js
@@ -1,6 +1,7 @@
import React from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { setBodyModalParamsAction } from '../../../../modules/modals';
+import Button from '../../../components/button';
const Goods = ({
name, goods, quantity, priceATM,
@@ -11,10 +12,12 @@ const Goods = ({
return (
- |
- dispatch(setBodyModalParamsAction('MARKETPLACE_PURCHASE', goods))}>
- {name}
-
+ |
+ |
{priceATM / decimals}
diff --git a/src/containers/modals/account/account/index.js b/src/containers/modals/account/account/index.js
index 3d31f64ba..8614adb96 100644
--- a/src/containers/modals/account/account/index.js
+++ b/src/containers/modals/account/account/index.js
@@ -202,8 +202,9 @@ class InfoAccount extends React.PureComponent {
this.props.modalData &&
|