diff --git a/.drone.yml b/.drone.yml index 6c1c5d9a94..eb3e688b91 100644 --- a/.drone.yml +++ b/.drone.yml @@ -119,7 +119,7 @@ steps: - echo "Current version tag is :" && cat .tags - name: request_hollacloud_to_run_upgrade - image: bitholla/devops-tools:drone_hollacloud-220121 + image: bitholla/devops-tools:drone_hollacloud-220216 environment: HOLLAEX_EMAIL: from_secret: hollaex_email @@ -166,7 +166,7 @@ steps: - echo "Current version tag is :" && cat .tags - name: request_hollacloud_to_run_upgrade - image: bitholla/devops-tools:drone_hollacloud-220208 + image: bitholla/devops-tools:drone_hollacloud-220216 environment: HOLLAEX_EMAIL: from_secret: next_email diff --git a/web/src/containers/Admin/AdminFinancials/Assets.js b/web/src/containers/Admin/AdminFinancials/Assets.js index a563c7119f..79394b4342 100644 --- a/web/src/containers/Admin/AdminFinancials/Assets.js +++ b/web/src/containers/Admin/AdminFinancials/Assets.js @@ -166,7 +166,7 @@ const getColumns = ( className="coin-symbol-wrapper" onClick={() => handlePreview(selectedAsset)} > - {balance[symbol] || 0} + {balance[`${symbol}_available`] || 0} ); }, diff --git a/web/src/containers/Admin/AdminFinancials/index.css b/web/src/containers/Admin/AdminFinancials/index.css index ba40c30b47..95eeffdb36 100644 --- a/web/src/containers/Admin/AdminFinancials/index.css +++ b/web/src/containers/Admin/AdminFinancials/index.css @@ -135,10 +135,6 @@ text-decoration: underline; cursor: pointer; } -.ant-table-row-expand-icon { - color: #2930ff; - border-color: #2930ff; -} .admin-earnings-container .id-wrapper { background-color: #288500; width: 35px; diff --git a/web/src/containers/Admin/AppWrapper/Timer.js b/web/src/containers/Admin/AppWrapper/Timer.js index f78482e217..9475dddd7b 100644 --- a/web/src/containers/Admin/AppWrapper/Timer.js +++ b/web/src/containers/Admin/AppWrapper/Timer.js @@ -1,43 +1,46 @@ import React from 'react'; import moment from 'moment'; +import 'moment-timezone'; class Timer extends React.Component { - constructor(prop) { - super(prop); - let date = this.getTimeString(); - this.state = { - time: date - }; - } + constructor(prop) { + super(prop); + let date = this.getTimeString(); + this.state = { + time: date, + }; + } - componentDidMount () { + componentDidMount() { this.timer = setInterval(() => { const date = this.getTimeString(); this.setState({ - time: date - }) + time: date, + }); }, 1000); - } + } getTimeString() { let date = moment().format('hh:mm:ssA'); - if (this.props.isHover) { - date = moment().format('DD/MMM/YYYY, hh:mm:ssA ').toUpperCase() + new Date().toTimeString().slice(9); - } + if (this.props.isHover) { + date = + moment().format('DD/MMM/YYYY, hh:mm:ssA ').toUpperCase() + + moment.tz.guess(true) + + ' ' + + new Date().toTimeString().slice(9); + } return date; } - componentWillUnmount() { - if (this.timer) { - clearInterval(this.timer); - } - } + componentWillUnmount() { + if (this.timer) { + clearInterval(this.timer); + } + } - render () { - return ( -
{this.state.time}
- ) - } -}; + render() { + return
{this.state.time}
; + } +} -export default Timer; \ No newline at end of file +export default Timer; diff --git a/web/src/containers/Admin/General/Description.js b/web/src/containers/Admin/General/Description.js index f2565f8565..c090b7e6bb 100644 --- a/web/src/containers/Admin/General/Description.js +++ b/web/src/containers/Admin/General/Description.js @@ -157,7 +157,10 @@ class Description extends Component { buttonClass="green-btn minimal-btn" onSubmit={this.props.handleSubmitReferralBadge} disableAllFields={ - plan !== 'crypto' && plan !== 'fiat' && type !== 'Enterprise' + plan !== 'crypto' && + plan !== 'fiat' && + type !== 'Enterprise' && + plan !== 'boost' } buttonSubmitting={buttonSubmitting} /> diff --git a/web/src/containers/Admin/General/index.css b/web/src/containers/Admin/General/index.css index 67d536bafb..ab228d3c6d 100644 --- a/web/src/containers/Admin/General/index.css +++ b/web/src/containers/Admin/General/index.css @@ -11,14 +11,14 @@ width: 10rem !important; } .wizard-container .sub-title, -.ant-modal-body .sub-title, +/* .ant-modal-body .sub-title, */ .admin-content-wrapper .sub-title { color: #ffffff; font-size: 15px; font-weight: bold; } -.admin-content-wrapper .divider, -.ant-modal-body .divider { +/* .ant-modal-body .divider, */ +.admin-content-wrapper .divider { border-top: 1px solid #c4c4c4; margin: 2rem 0; width: 500px; @@ -26,7 +26,7 @@ .wizard-container .description { /* width: 550px; */ } -.ant-modal-body .description, +/* .ant-modal-body .description, */ .admin-content-wrapper .description, .wizard-container .description { color: #ffffff; @@ -228,13 +228,13 @@ left: 18px; color: #000000 !important; } -.ant-checkbox-wrapper-checked .buy { +.general-wrapper .ant-checkbox-wrapper-checked .buy { background-color: #ffffff; } -.ant-checkbox-wrapper-checked .sell { +.general-wrapper .ant-checkbox-wrapper-checked .sell { border: 1px solid #ffffff; } -.ant-checkbox-wrapper-checked .sell .label { +.general-wrapper .ant-checkbox-wrapper-checked .sell .label { color: #ffffff; } .general-wrapper .ant-radio-wrapper { @@ -269,7 +269,7 @@ } h2, .email-config-form, -.ant-checkbox-wrapper span, +.input_field .ant-checkbox-wrapper span, .description-wrapper, .bottom-description, .custom-form-wrapper { diff --git a/web/src/containers/Admin/Roles/index.css b/web/src/containers/Admin/Roles/index.css index 2096cc1a55..f678c2afe7 100644 --- a/web/src/containers/Admin/Roles/index.css +++ b/web/src/containers/Admin/Roles/index.css @@ -117,7 +117,7 @@ padding: 3px 8px; } .admin-roles-wrapper .ant-input:focus, -.ant-input:active { +.admin-roles-wrapper .ant-input:active { border: 1px solid #c4c4c4; } .admin-roles-wrapper .ant-form-item { diff --git a/web/src/containers/Admin/SetupWizard/Assets.js b/web/src/containers/Admin/SetupWizard/Assets.js index 2d72573e0d..025015ea59 100644 --- a/web/src/containers/Admin/SetupWizard/Assets.js +++ b/web/src/containers/Admin/SetupWizard/Assets.js @@ -124,8 +124,8 @@ const Assets = ({
{Object.keys(pairs).map((pair, index) => { const { pair_2 = '', pair_base = '' } = pairs[pair] || {}; - const pairData = coins[pair_2]; - const pairBaseData = coins[pair_base]; + const pairData = coins[pair_2] || {}; + const pairBaseData = coins[pair_base] || {}; return (
{pairData.fullname}
diff --git a/web/src/utils/utils.js b/web/src/utils/utils.js index 4ed3972ada..529a555573 100644 --- a/web/src/utils/utils.js +++ b/web/src/utils/utils.js @@ -282,6 +282,7 @@ export const handleUpgrade = (info = {}) => { if ( _toLower(info.plan) !== 'crypto' && _toLower(info.plan) !== 'fiat' && + _toLower(info.plan) !== 'boost' && _toLower(info.type) !== 'enterprise' ) { return true;