@@ -74,11 +75,12 @@ const MarketList = ({
{markets.map((market, index) => (
))}
diff --git a/web/src/containers/TradeTabs/components/MarketRow.js b/web/src/containers/TradeTabs/components/MarketRow.js
index 35c057aff7..6947d902c4 100644
--- a/web/src/containers/TradeTabs/components/MarketRow.js
+++ b/web/src/containers/TradeTabs/components/MarketRow.js
@@ -5,7 +5,14 @@ import { formatToCurrency } from 'utils/currency';
class MarketRow extends Component {
render() {
- const { icons: ICONS, market, chartData, handleClick } = this.props;
+ const {
+ icons: ICONS,
+ market,
+ chartData,
+ handleClick,
+ loading,
+ index,
+ } = this.props;
const {
key,
@@ -24,30 +31,61 @@ class MarketRow extends Component {
onClick={() => handleClick(key)}
>
-
+ {!loading ? (
+
+ ) : (
+
+ )}
|
-
- {formatToCurrency(ticker.close, increment_price)}
-
- {pair_2_display}
+ {!loading ? (
+
+
+ {formatToCurrency(ticker.close, increment_price)}
+
+ {pair_2_display}
+
+ ) : (
+
+ )}
|
|
- {ticker.volume}
- {pair_base_display}
+ {!loading ? (
+
+ {ticker.volume}
+ {pair_base_display}
+
+ ) : (
+
+ )}
|
{selected === options[0].value ? (
side,
renderCell: ({ side = '' }, key, index) => {
@@ -107,6 +107,21 @@ export const generateOrderHistoryHeaders = (
);
},
},
+ {
+ stringId: 'TYPE',
+ label: STRINGS['TYPE'],
+ key: 'type',
+ exportToCsv: ({ type = '' }) => type,
+ renderCell: ({ type = '' }, key, index) => {
+ return (
+ |
+
+ {type ? STRINGS[`TYPES.${type.toUpperCase()}`] : ''}
+
+ |
+ );
+ },
+ },
{
stringId: 'SIZE',
label: STRINGS['SIZE'],
@@ -150,14 +165,16 @@ export const generateOrderHistoryHeaders = (
if (pairs[symbol]) {
const { increment_price, pair_2_display } = pairs[symbol];
- return STRINGS.formatString(
- CURRENCY_PRICE_FORMAT,
- formatToCurrency(
- calculatePrice(quick, price, size),
- increment_price
- ),
- pair_2_display
- ).join('');
+ return price ?
+ STRINGS.formatString(
+ CURRENCY_PRICE_FORMAT,
+ formatToCurrency(
+ calculatePrice(quick, price, size),
+ increment_price
+ ),
+ pair_2_display
+ ).join('') :
+ ''
} else {
return calculatePrice(quick, price, size);
}
@@ -168,14 +185,16 @@ export const generateOrderHistoryHeaders = (
return (
- {STRINGS.formatString(
+ {price ?
+ STRINGS.formatString(
CURRENCY_PRICE_FORMAT,
formatToCurrency(
calculatePrice(quick, price, size),
increment_price
),
pair_2_display
- )}
+ )
+ : ''}
|
);
} else {
@@ -183,6 +202,51 @@ export const generateOrderHistoryHeaders = (
}
},
},
+ {
+ stringId: 'AVERAGE',
+ label: STRINGS['AVERAGE'],
+ key: 'average',
+ exportToCsv: ({ average = 0, size = 0, quick, symbol }) => {
+ if (pairs[symbol]) {
+ const { increment_price, pair_2_display } = pairs[symbol];
+
+ return average ?
+ STRINGS.formatString(
+ CURRENCY_PRICE_FORMAT,
+ formatToCurrency(
+ calculatePrice(quick, average, size),
+ increment_price
+ ),
+ pair_2_display
+ ).join('') :
+ ''
+ } else {
+ return calculatePrice(quick, average, size);
+ }
+ },
+ renderCell: ({ average = 0, size = 0, quick, symbol }, key, index) => {
+ if (pairs[symbol]) {
+ const { increment_price, pair_2_display } = pairs[symbol];
+
+ return (
+
+ {average ?
+ STRINGS.formatString(
+ CURRENCY_PRICE_FORMAT,
+ formatToCurrency(
+ calculatePrice(quick, average, size),
+ increment_price
+ ),
+ pair_2_display
+ )
+ : ''}
+ |
+ );
+ } else {
+ return {calculatePrice(quick, average, size)} | ;
+ }
+ },
+ },
{
stringId: 'AMOUNT',
label: STRINGS['AMOUNT'],
@@ -275,7 +339,7 @@ export const generateOrderHistoryHeaders = (
);
},
},
- {
+ /*{
stringId: 'FEE,NO_FEE',
label: STRINGS['FEE'],
key: 'fee',
@@ -285,22 +349,22 @@ export const generateOrderHistoryHeaders = (
{STRINGS.formatString(
CURRENCY_PRICE_FORMAT,
- formatToCurrency(fee, 0, true),
+ fee,
fee_coin_display
)}
|
),
- },
+ },*/
{
stringId: 'TIME',
label: STRINGS['TIME'],
- key: 'updated_at',
+ key: 'created_at',
className: isMobile ? 'text-center' : '',
- exportToCsv: ({ updated_at = '' }) => updated_at,
- renderCell: ({ updated_at = '' }, key, index) => {
+ exportToCsv: ({ created_at = '' }) => created_at,
+ renderCell: ({ created_at = '' }, key, index) => {
return (
- {getFormatTimestamp(updated_at)}
+ {getFormatTimestamp(created_at)}
|
);
},
diff --git a/web/src/containers/UserSecurity/ChangePasswordForm.js b/web/src/containers/UserSecurity/ChangePasswordForm.js
index 6f77974961..f618ae4a7c 100644
--- a/web/src/containers/UserSecurity/ChangePasswordForm.js
+++ b/web/src/containers/UserSecurity/ChangePasswordForm.js
@@ -5,9 +5,13 @@ import { isMobile } from 'react-device-detect';
import renderFields from 'components/Form/factoryFields';
import { Button, EditWrapper } from 'components';
import STRINGS from 'config/localizedStrings';
+import { password, required } from 'components/Form/validations';
-const validate = () => {
+const validate = (values) => {
const errors = {};
+ if (values.new_password !== values.new_password_confirm) {
+ errors.new_password_confirm = STRINGS['VALIDATIONS.PASSWORDS_DONT_MATCH'];
+ }
return errors;
};
@@ -22,6 +26,8 @@ export const generateFormValues = () => ({
STRINGS[
'ACCOUNT_SECURITY.CHANGE_PASSWORD.FORM.CURRENT_PASSWORD.placeholder'
],
+ validate: [required, password],
+
fullWidth: isMobile,
ishorizontalfield: true,
},
@@ -33,6 +39,7 @@ export const generateFormValues = () => ({
placeholder:
STRINGS['ACCOUNT_SECURITY.CHANGE_PASSWORD.FORM.NEW_PASSWORD.placeholder'],
fullWidth: isMobile,
+ validate: [required, password],
ishorizontalfield: true,
},
new_password_confirm: {
@@ -47,6 +54,7 @@ export const generateFormValues = () => ({
STRINGS[
'ACCOUNT_SECURITY.CHANGE_PASSWORD.FORM.NEW_PASSWORD_REPEAT.placeholder'
],
+ validate: [password],
fullWidth: isMobile,
ishorizontalfield: true,
},
diff --git a/web/src/containers/Verification/index.js b/web/src/containers/Verification/index.js
index 208fc86d19..4a938c612c 100644
--- a/web/src/containers/Verification/index.js
+++ b/web/src/containers/Verification/index.js
@@ -39,7 +39,7 @@ import { verifyBankData } from 'actions/verificationActions';
import { getErrorLocalized } from 'utils/errors';
import { required, maxLength } from 'components/Form/validations';
import { getCountry } from 'containers/Verification/utils';
-import { getFormatTimestamp } from 'utils/utils';
+import { getFormattedBOD } from 'utils/utils';
import { COUNTRIES_OPTIONS } from 'utils/countries';
import { verificationTabsSelector } from './selector';
// const CONTENT_CLASS =
@@ -449,7 +449,7 @@ class Verification extends Component {
id="REMOTE_COMPONENT__KYC_VERIFICATION_HOME"
handleBack={this.handleBack}
setActivePageContent={this.setActivePageContent}
- getFormatTimestamp={getFormatTimestamp}
+ getFormatTimestamp={getFormattedBOD}
getCountry={getCountry}
/>
),
diff --git a/web/src/containers/Wallet/AssetsBlock.js b/web/src/containers/Wallet/AssetsBlock.js
index f34667e8aa..fe60522ea4 100644
--- a/web/src/containers/Wallet/AssetsBlock.js
+++ b/web/src/containers/Wallet/AssetsBlock.js
@@ -137,7 +137,7 @@ const AssetsBlock = ({
return (
- {totalAssets.length && loading ? (
+ {totalAssets.length && !loading ? (
{BASE_CURRENCY ? (
@@ -252,7 +252,7 @@ const AssetsBlock = ({
*/}
|
- {sortedSearchResults && loading ? (
+ {sortedSearchResults && !loading ? (
{sortedSearchResults &&
baseCoin &&
- loading &&
+ !loading &&
increment_unit ? (
diff --git a/web/src/containers/Wallet/MainWallet.js b/web/src/containers/Wallet/MainWallet.js
index f03a6e752e..98dc758670 100644
--- a/web/src/containers/Wallet/MainWallet.js
+++ b/web/src/containers/Wallet/MainWallet.js
@@ -44,7 +44,8 @@ class Wallet extends Component {
this.props.totalAsset,
this.props.oraclePrices,
this.props.constants,
- this.props.contracts
+ this.props.contracts,
+ this.props.isFetching
);
}
@@ -60,7 +61,8 @@ class Wallet extends Component {
nextProps.totalAsset,
nextProps.oraclePrices,
nextProps.constants,
- nextProps.contracts
+ nextProps.contracts,
+ nextProps.isFetching
);
}
@@ -81,7 +83,8 @@ class Wallet extends Component {
this.props.totalAsset,
this.props.oraclePrices,
this.props.constants,
- this.props.contracts
+ this.props.contracts,
+ this.props.isFetching
);
}
}
@@ -137,14 +140,14 @@ class Wallet extends Component {
total,
oraclePrices,
{ features: { stake_page = false } = {} } = {},
- contracts = {}
+ contracts = {},
+ isFetching
) => {
- const { increment_unit, display_name } =
- coins[BASE_CURRENCY] || DEFAULT_COIN_DATA;
+ const { min, display_name } = coins[BASE_CURRENCY] || DEFAULT_COIN_DATA;
const totalAssets = STRINGS.formatString(
CURRENCY_PRICE_FORMAT,
display_name,
- formatToCurrency(total, increment_unit)
+ formatToCurrency(total, min)
);
const searchResult = this.getSearchResult(coins, balance, oraclePrices);
@@ -171,7 +174,7 @@ class Wallet extends Component {
stake_page &&
!isMobile
}
- loading={this.props.dataFetched}
+ loading={isFetching}
contracts={contracts}
broker={this.props.broker}
/>
@@ -278,7 +281,7 @@ const mapStateToProps = (store) => ({
bankaccount: store.user.userData.bank_account,
totalAsset: store.asset.totalAsset,
oraclePrices: store.asset.oraclePrices,
- dataFetched: store.asset.dataFetched,
+ isFetching: store.asset.isFetching,
contracts: store.app.contracts,
broker: store.app.broker,
});
diff --git a/web/src/containers/Wallet/components/index.js b/web/src/containers/Wallet/components/index.js
index 835a3359c2..3af9f8addd 100644
--- a/web/src/containers/Wallet/components/index.js
+++ b/web/src/containers/Wallet/components/index.js
@@ -150,7 +150,7 @@ export const renderTitleSection = (symbol, type, icon, coins, iconId) => {
diff --git a/web/src/containers/Withdraw/form.js b/web/src/containers/Withdraw/form.js
index a1ead20e32..469e8354bf 100644
--- a/web/src/containers/Withdraw/form.js
+++ b/web/src/containers/Withdraw/form.js
@@ -318,12 +318,16 @@ class Form extends Component {
>
|