From 4f46c2e2baeaecab020a02dd8cd525328c30f952 Mon Sep 17 00:00:00 2001 From: Amir Hossein Salar Date: Thu, 4 Mar 2021 10:32:21 +0330 Subject: [PATCH 01/16] changes for assets wrapper issue in the summary page --- web/src/containers/Summary/_Summary.scss | 9 ++++++++- web/src/index.css | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/web/src/containers/Summary/_Summary.scss b/web/src/containers/Summary/_Summary.scss index 67095888b7..1690bba5f5 100644 --- a/web/src/containers/Summary/_Summary.scss +++ b/web/src/containers/Summary/_Summary.scss @@ -679,7 +679,14 @@ $trade-tab--arrow-size: 0.4rem; font-size: 1.2rem !important; } .assets-wrapper { - margin-top: 40px; + margin-top: 0; + } + } + .layout-mobile { + .summary-container { + .assets-wrapper { + margin-top: 40px; + } } } } diff --git a/web/src/index.css b/web/src/index.css index 1ddaf3b252..134d783c2b 100644 --- a/web/src/index.css +++ b/web/src/index.css @@ -2798,6 +2798,8 @@ table th { .summary-container .summary-content-txt { font-size: 1.2rem !important; } .summary-container .assets-wrapper { + margin-top: 0; } + .layout-mobile .summary-container .assets-wrapper { margin-top: 40px; } } @media (min-width: 1920px) { From 997e22888d012173b577b9407bacd4725c01cec9 Mon Sep 17 00:00:00 2001 From: Amir Hossein Salar Date: Thu, 4 Mar 2021 11:20:19 +0330 Subject: [PATCH 02/16] changes for summary section issue --- web/src/containers/Summary/_Summary.scss | 6 +++--- web/src/index.css | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/src/containers/Summary/_Summary.scss b/web/src/containers/Summary/_Summary.scss index 1690bba5f5..1b1c700962 100644 --- a/web/src/containers/Summary/_Summary.scss +++ b/web/src/containers/Summary/_Summary.scss @@ -152,7 +152,7 @@ $trade-tab--arrow-size: 0.4rem; font-weight: bold; } .summary-section_1 { - height: 26rem; + height: 28rem; .assets-wrapper { .donut-container { @@ -722,7 +722,7 @@ $trade-tab--arrow-size: 0.4rem; width: 65% !important; } .summary-section_1 { - height: 29rem !important; + height: 31rem !important; } .summary-section_2 { height: 43rem !important; @@ -743,7 +743,7 @@ $trade-tab--arrow-size: 0.4rem; font-size: 0.9rem; } .summary-section_1 { - height: 29rem !important; + height: 31rem !important; } .summary-section_2 { height: 44rem !important; diff --git a/web/src/index.css b/web/src/index.css index 134d783c2b..196369ea66 100644 --- a/web/src/index.css +++ b/web/src/index.css @@ -2411,7 +2411,7 @@ table th { color: var(--specials_buttons-links-and-highlights); font-weight: bold; } .summary-container .summary-section_1 { - height: 26rem; } + height: 28rem; } .summary-container .summary-section_1 .assets-wrapper .donut-container { height: 16rem; width: 100%; } @@ -2822,7 +2822,7 @@ table th { .summary-container .requirement-wrapper { width: 65% !important; } .summary-container .summary-section_1 { - height: 29rem !important; } + height: 31rem !important; } .summary-container .summary-section_2 { height: 43rem !important; } .fee-limits-wrapper .content-txt { @@ -2835,7 +2835,7 @@ table th { .summary-container .trader-account-wrapper { font-size: 0.9rem; } .summary-container .summary-section_1 { - height: 29rem !important; } + height: 31rem !important; } .summary-container .summary-section_2 { height: 44rem !important; } .fee-limits-wrapper .content-txt { From 5078b36c6e771b9327c03ecfa2aaed98e7d73330 Mon Sep 17 00:00:00 2001 From: Amir Hossein Salar Date: Fri, 5 Mar 2021 17:15:27 +0330 Subject: [PATCH 03/16] Revert "changes for assets wrapper issue in the summary page" This reverts commit 4f46c2e --- web/src/containers/Summary/_Summary.scss | 9 +-------- web/src/index.css | 2 -- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/web/src/containers/Summary/_Summary.scss b/web/src/containers/Summary/_Summary.scss index 1b1c700962..5df8dee430 100644 --- a/web/src/containers/Summary/_Summary.scss +++ b/web/src/containers/Summary/_Summary.scss @@ -679,14 +679,7 @@ $trade-tab--arrow-size: 0.4rem; font-size: 1.2rem !important; } .assets-wrapper { - margin-top: 0; - } - } - .layout-mobile { - .summary-container { - .assets-wrapper { - margin-top: 40px; - } + margin-top: 40px; } } } diff --git a/web/src/index.css b/web/src/index.css index 196369ea66..4c23061c0b 100644 --- a/web/src/index.css +++ b/web/src/index.css @@ -2798,8 +2798,6 @@ table th { .summary-container .summary-content-txt { font-size: 1.2rem !important; } .summary-container .assets-wrapper { - margin-top: 0; } - .layout-mobile .summary-container .assets-wrapper { margin-top: 40px; } } @media (min-width: 1920px) { From e456b123911b5a200e38dc61e60c3be241de7272 Mon Sep 17 00:00:00 2001 From: Amir Hossein Salar Date: Fri, 5 Mar 2021 17:15:43 +0330 Subject: [PATCH 04/16] Revert "changes for summary section issue" This reverts commit 997e228 --- web/src/containers/Summary/_Summary.scss | 6 +++--- web/src/index.css | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/src/containers/Summary/_Summary.scss b/web/src/containers/Summary/_Summary.scss index 5df8dee430..67095888b7 100644 --- a/web/src/containers/Summary/_Summary.scss +++ b/web/src/containers/Summary/_Summary.scss @@ -152,7 +152,7 @@ $trade-tab--arrow-size: 0.4rem; font-weight: bold; } .summary-section_1 { - height: 28rem; + height: 26rem; .assets-wrapper { .donut-container { @@ -715,7 +715,7 @@ $trade-tab--arrow-size: 0.4rem; width: 65% !important; } .summary-section_1 { - height: 31rem !important; + height: 29rem !important; } .summary-section_2 { height: 43rem !important; @@ -736,7 +736,7 @@ $trade-tab--arrow-size: 0.4rem; font-size: 0.9rem; } .summary-section_1 { - height: 31rem !important; + height: 29rem !important; } .summary-section_2 { height: 44rem !important; diff --git a/web/src/index.css b/web/src/index.css index 4c23061c0b..1ddaf3b252 100644 --- a/web/src/index.css +++ b/web/src/index.css @@ -2411,7 +2411,7 @@ table th { color: var(--specials_buttons-links-and-highlights); font-weight: bold; } .summary-container .summary-section_1 { - height: 28rem; } + height: 26rem; } .summary-container .summary-section_1 .assets-wrapper .donut-container { height: 16rem; width: 100%; } @@ -2820,7 +2820,7 @@ table th { .summary-container .requirement-wrapper { width: 65% !important; } .summary-container .summary-section_1 { - height: 31rem !important; } + height: 29rem !important; } .summary-container .summary-section_2 { height: 43rem !important; } .fee-limits-wrapper .content-txt { @@ -2833,7 +2833,7 @@ table th { .summary-container .trader-account-wrapper { font-size: 0.9rem; } .summary-container .summary-section_1 { - height: 31rem !important; } + height: 29rem !important; } .summary-container .summary-section_2 { height: 44rem !important; } .fee-limits-wrapper .content-txt { From 4ef2468d70baebe79bf162c414803298541c6d77 Mon Sep 17 00:00:00 2001 From: Amir Hossein Salar Date: Mon, 8 Mar 2021 23:39:30 +0330 Subject: [PATCH 05/16] changes for market selector menu issue --- web/src/components/AppBar/_AppBar.scss | 6 +++--- web/src/index.css | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/src/components/AppBar/_AppBar.scss b/web/src/components/AppBar/_AppBar.scss index 273924380d..92bfb65397 100644 --- a/web/src/components/AppBar/_AppBar.scss +++ b/web/src/components/AppBar/_AppBar.scss @@ -1174,9 +1174,9 @@ $app-menu-notification-size: 1.2rem; } .app-bar-add-tab-menu { width: 36rem; - position: fixed; - top: 13.7rem; - left: 2.2rem; + position: absolute; + top: 7.8rem; + left: 1.2rem; .app-bar-add-tab-content, .app-bar-tab-menu-list, diff --git a/web/src/index.css b/web/src/index.css index 1ddaf3b252..8b2b75d798 100644 --- a/web/src/index.css +++ b/web/src/index.css @@ -5009,9 +5009,9 @@ table th { .layout-mobile .app-bar-add-tab-menu { width: 36rem; - position: fixed; - top: 13.7rem; - left: 2.2rem; } + position: absolute; + top: 7.8rem; + left: 1.2rem; } .layout-mobile .app-bar-add-tab-menu .app-bar-add-tab-content, .layout-mobile .app-bar-add-tab-menu .app-bar-tab-menu-list, .layout-mobile .app-bar-add-tab-menu .app-bar-tab-overflow-content { From d319be05747a305fcdca6b721df8bd6e9c75233b Mon Sep 17 00:00:00 2001 From: Amir Hossein Salar Date: Mon, 8 Mar 2021 23:40:04 +0330 Subject: [PATCH 06/16] changes for Market sparkLine issue --- web/src/actions/chartAction.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/actions/chartAction.js b/web/src/actions/chartAction.js index a29ed474f9..6eff0fecbd 100644 --- a/web/src/actions/chartAction.js +++ b/web/src/actions/chartAction.js @@ -66,7 +66,7 @@ export const getSparklines = async () => { const to = moment().format('X'); const { data = {} } = await axios({ - url: `/charts?resolution=D&from=${from}&to=${to}`, + url: `/charts?resolution=H&from=${from}&to=${to}`, method: 'GET', }); From 7c71c85718ec9f725e10cbf4f73d43e0a61eef33 Mon Sep 17 00:00:00 2001 From: Amir Hossein Salar Date: Mon, 8 Mar 2021 23:41:13 +0330 Subject: [PATCH 07/16] changes for cross-browser image issues --- web/src/_common.scss | 1 + web/src/index.css | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/src/_common.scss b/web/src/_common.scss index e83d879da1..368dda2fda 100644 --- a/web/src/_common.scss +++ b/web/src/_common.scss @@ -183,6 +183,7 @@ table th { .object-fit-contain { object-fit: contain; + height: 100%; } .background-contain { diff --git a/web/src/index.css b/web/src/index.css index 8b2b75d798..55d64d4068 100644 --- a/web/src/index.css +++ b/web/src/index.css @@ -228,7 +228,8 @@ table th { pointer-events: none; } .object-fit-contain { - object-fit: contain; } + object-fit: contain; + height: 100%; } .background-contain { -webkit-background-size: contain; From e322a23fa986d9901d441d3e84e360b686f7ebda Mon Sep 17 00:00:00 2001 From: Amir Hossein Salar Date: Tue, 9 Mar 2021 08:06:28 +0330 Subject: [PATCH 08/16] changes for tier name issues in fees and limits modal --- web/package-lock.json | 2 +- web/src/config/lang/en.js | 3 ++- .../Summary/components/FeesAndLimits.js | 26 ++++++++++++++----- .../Summary/components/LimitsBlock.js | 4 +-- web/src/index.css | 26 +++++++++---------- 5 files changed, 37 insertions(+), 24 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index d1a0ab1867..b2f4f88fa1 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,6 +1,6 @@ { "name": "hollaex-kit", - "version": "2.0.6", + "version": "2.0.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/web/src/config/lang/en.js b/web/src/config/lang/en.js index 483533e488..bb0ec267ea 100644 --- a/web/src/config/lang/en.js +++ b/web/src/config/lang/en.js @@ -1208,6 +1208,7 @@ const nestedContent = { ACCOUNT_AGE_OF_MONTHS: 'Account Age of {0} Months', TRADING_VOLUME_EQUIVALENT: '{0} {1} Trading Volume Equivalent', LEVEL_OF_ACCOUNT: 'Level {0} Account', + TITLE_OF_ACCOUNT: '{0} Account', LEVEL_TXT_DEFAULT: 'Add your level description here', LEVEL_1_TXT: 'Your journey starts here young crypto trader! To obtain bonuses you can verify your identification and also get larger deposit and withdraw limits with reduced trading fees.', // new @@ -1421,7 +1422,7 @@ const nestedContent = { AMOUNT_IN: 'Amount in', LIMITS_BLOCK: { HEADER_ROW_DESCRIPTION: - 'Deposit and withdrawal allowance for all assets (level {0})', + 'Deposit and withdrawal allowance for all assets ({0})', HEADER_ROW_TYPE: 'Type (All assets)', HEADER_ROW_AMOUNT: 'Amount ({0})', }, diff --git a/web/src/containers/Summary/components/FeesAndLimits.js b/web/src/containers/Summary/components/FeesAndLimits.js index 20913ea0b3..08e42793bc 100644 --- a/web/src/containers/Summary/components/FeesAndLimits.js +++ b/web/src/containers/Summary/components/FeesAndLimits.js @@ -15,13 +15,23 @@ const FeesAndLimits = ({ pairs, constants = {}, icons: ICONS, - tiers, + tiers = {}, }) => { const { verification_level, discount = 0 } = data; const LEVEL_OF_ACCOUNT = STRINGS.formatString( STRINGS['SUMMARY.LEVEL_OF_ACCOUNT'], verification_level ); + + const { name } = tiers[verification_level] || {}; + + const TITLE_OF_ACCOUNT = STRINGS.formatString( + STRINGS['SUMMARY.TITLE_OF_ACCOUNT'], + name + ); + + const title = TITLE_OF_ACCOUNT || LEVEL_OF_ACCOUNT; + const Discount_percentage = discount > 0 ? STRINGS.formatString(STRINGS['SUMMARY.DISCOUNT'], discount) @@ -29,13 +39,10 @@ const FeesAndLimits = ({ return (
- {STRINGS.formatString( - STRINGS['SUMMARY.FEES_AND_LIMIT'], - LEVEL_OF_ACCOUNT - )}{' '} + {STRINGS.formatString(STRINGS['SUMMARY.FEES_AND_LIMIT'], title)}{' '} {Discount_percentage} } @@ -66,7 +73,12 @@ const FeesAndLimits = ({
- +
{ ); }; -const LimitsBlock = ({ level, coins, tiers }) => { +const LimitsBlock = ({ level, coins, tiers, title }) => { return (
@@ -112,7 +112,7 @@ const LimitsBlock = ({ level, coins, tiers }) => { {STRINGS.formatString( STRINGS['LIMITS_BLOCK.HEADER_ROW_DESCRIPTION'], - level + title )} diff --git a/web/src/index.css b/web/src/index.css index 0683bd9c19..7cb4de126b 100644 --- a/web/src/index.css +++ b/web/src/index.css @@ -330,13 +330,13 @@ table th { height: auto; flex: 1; } .app_container.layout-mobile .app_container-content { - min-height: calc( 100vh - 10rem); - max-height: calc( 100vh - 10rem); + min-height: calc( 100vh - 10rem); + max-height: calc( 100vh - 10rem); max-width: 100vw; overflow-y: scroll; } .app_container.layout-mobile .content-with-bar { - min-height: calc( 100vh - 17rem); - max-height: calc( 100vh - 17rem); + min-height: calc( 100vh - 17rem); + max-height: calc( 100vh - 17rem); max-width: 100vw; padding: 1rem; margin: 0; @@ -917,8 +917,8 @@ table th { height: calc(100% - 4rem) !important; } .layout-mobile.home_container .app_container-content { - min-height: calc( 100vh - 4rem); - max-height: calc( 100vh - 4rem); } + min-height: calc( 100vh - 4rem); + max-height: calc( 100vh - 4rem); } .home_container { background-repeat: no-repeat; @@ -2172,8 +2172,8 @@ table th { .layout-mobile .quote-container { background-color: transparent; overflow-y: scroll; - min-height: calc( 100vh - 17rem); - max-height: calc( 100vh - 17rem); } + min-height: calc( 100vh - 17rem); + max-height: calc( 100vh - 17rem); } .layout-mobile .quote-container .quick_trade-wrapper { flex: 1; min-width: 100vw; @@ -2260,7 +2260,7 @@ table th { .layout-mobile .presentation_container.verification_container { padding-top: 0 !important; - max-height: calc( 100vh - 10rem); } + max-height: calc( 100vh - 10rem); } .layout-mobile .presentation_container.verification_container .header-content { font-size: 12px !important; } @@ -6264,14 +6264,14 @@ table th { right: 0 !important; min-width: 100vw; max-width: 100vw; - min-height: calc( 100vh - 4rem); - max-height: calc( 100vh - 4rem); + min-height: calc( 100vh - 4rem); + max-height: calc( 100vh - 4rem); border-radius: 0 !important; padding: 0 !important; } .layout-mobile .ReactModal__Content .dialog-mobile-content { padding: 2.5rem !important; - min-height: calc( 100vh - 8rem); - max-height: calc( 100vh - 8rem); + min-height: calc( 100vh - 8rem); + max-height: calc( 100vh - 8rem); display: flex; } .layout-mobile.LogoutModal .ReactModal__Content { From 4b55155a784674b0fb2353d768fbb228be4dac7f Mon Sep 17 00:00:00 2001 From: Brandon Kim Date: Tue, 9 Mar 2021 13:47:19 +0900 Subject: [PATCH 09/16] tier email --- server/mail/strings/en.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/mail/strings/en.js b/server/mail/strings/en.js index 036808893d..cce05608d2 100644 --- a/server/mail/strings/en.js +++ b/server/mail/strings/en.js @@ -125,8 +125,8 @@ const ACCOUNTUPGRADE = { TITLE: 'Account Upgraded', GREETING: (name) => COMMON.GREETING(name), BODY: { - 1: (level) => - `Congratulations. Your account access level is upgraded to level ${level}. You will benefit from lower fees, higher withdrawal limits and other premium features.`, + 1: (tier) => + `Congratulations. Your account access level is upgraded to ${tier} tier. You will benefit from lower fees, higher withdrawal limits and other premium features.`, 2: 'Trade Now' }, CLOSING: COMMON.CLOSING From 827883c2b6b8fb991d1307d27f9438d5f0ecf390 Mon Sep 17 00:00:00 2001 From: Amir Hossein Salar Date: Tue, 9 Mar 2021 08:21:58 +0330 Subject: [PATCH 10/16] changes for disabled withdrawal_limit text --- web/src/config/lang/ar.js | 2 +- web/src/config/lang/de.js | 2 +- web/src/config/lang/en.js | 2 +- web/src/config/lang/es.js | 2 +- web/src/config/lang/fa.js | 2 +- web/src/config/lang/fr.js | 2 +- web/src/config/lang/id.js | 2 +- web/src/config/lang/ja.js | 2 +- web/src/config/lang/ko.js | 2 +- web/src/config/lang/vi.js | 2 +- web/src/config/lang/zh.js | 2 +- web/src/containers/Admin/Tiers/Limits.js | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/web/src/config/lang/ar.js b/web/src/config/lang/ar.js index 1040d3e7f2..cfce788df6 100644 --- a/web/src/config/lang/ar.js +++ b/web/src/config/lang/ar.js @@ -1071,7 +1071,7 @@ const nestedContent = { LABEL_PAIR_MAKER_FEE: '{0} کارمزد سفارش گذار', LABEL_PAIR_TAKER_FEE: '{0} کارمزد پذیرنده سفارش', UNLIMITED: 'نامحدود', - BLOCKED: '0', + BLOCKED: 'Disabled', }, WALLET_ADDRESS_TITLE: 'ساخت کیف پول {0} ', WALLET_ADDRESS_GENERATE: 'ساخت', diff --git a/web/src/config/lang/de.js b/web/src/config/lang/de.js index 2425ca67bc..b33ab28ed4 100644 --- a/web/src/config/lang/de.js +++ b/web/src/config/lang/de.js @@ -1083,7 +1083,7 @@ export default { LABEL_PAIR_MAKER_FEE: '{0} Maker Gebühr', LABEL_PAIR_TAKER_FEE: '{0} Taker Gebühr', UNLIMITED: 'Unbegrenzt', - BLOCKED: '0', + BLOCKED: 'Disabled', }, WALLET_ADDRESS_TITLE: 'Geldbörse {0} generieren', WALLET_ADDRESS_GENERATE: 'Erzeugen', diff --git a/web/src/config/lang/en.js b/web/src/config/lang/en.js index bb0ec267ea..587738fa0b 100644 --- a/web/src/config/lang/en.js +++ b/web/src/config/lang/en.js @@ -1114,7 +1114,7 @@ const nestedContent = { LABEL_PAIR_MAKER_FEE: '{0} Maker Fee', LABEL_PAIR_TAKER_FEE: '{0} Taker Fee', UNLIMITED: 'Unlimited', - BLOCKED: '0', + BLOCKED: 'Disabled', }, WALLET_ADDRESS_TITLE: 'Generate {0} Wallet', WALLET_ADDRESS_GENERATE: 'Generate', diff --git a/web/src/config/lang/es.js b/web/src/config/lang/es.js index a29347a7e3..493665a6d1 100644 --- a/web/src/config/lang/es.js +++ b/web/src/config/lang/es.js @@ -1116,7 +1116,7 @@ export default { LABEL_PAIR_MAKER_FEE: '{0} Maker Fee', LABEL_PAIR_TAKER_FEE: '{0} Taker Fee', UNLIMITED: 'Sin lìmite', - BLOCKED: '0', + BLOCKED: 'Disabled', }, WALLET_ADDRESS_TITLE: 'Generar {0} Billetera', WALLET_ADDRESS_GENERATE: 'Generar', diff --git a/web/src/config/lang/fa.js b/web/src/config/lang/fa.js index f7de0d48a2..f9a12c66ff 100644 --- a/web/src/config/lang/fa.js +++ b/web/src/config/lang/fa.js @@ -1079,7 +1079,7 @@ const nestedContent = { LABEL_PAIR_MAKER_FEE: '{0} کارمزد سفارش گذار', LABEL_PAIR_TAKER_FEE: '{0} کارمزد پذیرنده سفارش', UNLIMITED: 'نامحدود', - BLOCKED: '0', + BLOCKED: 'Disabled', }, WALLET_ADDRESS_TITLE: 'ساخت کیف پول {0} ', WALLET_ADDRESS_GENERATE: 'ساخت', diff --git a/web/src/config/lang/fr.js b/web/src/config/lang/fr.js index 08411bce21..95e61de6fe 100644 --- a/web/src/config/lang/fr.js +++ b/web/src/config/lang/fr.js @@ -1124,7 +1124,7 @@ export default { LABEL_PAIR_MAKER_FEE: '{0} Frais du Maker', LABEL_PAIR_TAKER_FEE: '{0} Frais du Taker', UNLIMITED: 'Illimité', - BLOCKED: '0', + BLOCKED: 'Disabled', }, WALLET_ADDRESS_TITLE: 'Générer {0} portefeuille', WALLET_ADDRESS_GENERATE: 'Générer', diff --git a/web/src/config/lang/id.js b/web/src/config/lang/id.js index 661c9ba6a8..e5c4ba9ba1 100644 --- a/web/src/config/lang/id.js +++ b/web/src/config/lang/id.js @@ -1106,7 +1106,7 @@ export default { LABEL_PAIR_MAKER_FEE: '{0} Maker Fee', LABEL_PAIR_TAKER_FEE: '{0} Taker Fee', UNLIMITED: 'Tidak terbatas', - BLOCKED: '0', + BLOCKED: 'Disabled', }, WALLET_ADDRESS_TITLE: 'Buat Dompet {0}', WALLET_ADDRESS_GENERATE: 'Buat', diff --git a/web/src/config/lang/ja.js b/web/src/config/lang/ja.js index 4e927721e4..5704979418 100644 --- a/web/src/config/lang/ja.js +++ b/web/src/config/lang/ja.js @@ -1080,7 +1080,7 @@ export default { LABEL_PAIR_MAKER_FEE: '{0} Maker Fee', LABEL_PAIR_TAKER_FEE: '{0} Taker Fee', UNLIMITED: '無制限', - BLOCKED: '0', + BLOCKED: 'Disabled', }, WALLET_ADDRESS_TITLE: '{0}ウォレット作成', WALLET_ADDRESS_GENERATE: '作成', diff --git a/web/src/config/lang/ko.js b/web/src/config/lang/ko.js index a0b2f1e6ef..231d8f88e7 100644 --- a/web/src/config/lang/ko.js +++ b/web/src/config/lang/ko.js @@ -1056,7 +1056,7 @@ const nestedContent = { LABEL_PAIR_MAKER_FEE: '{0} Maker Fee', LABEL_PAIR_TAKER_FEE: '{0} Taker Fee', UNLIMITED: '무제한', - BLOCKED: '0', + BLOCKED: 'Disabled', }, WALLET_ADDRESS_TITLE: '{0} 지갑 생성하기', WALLET_ADDRESS_GENERATE: '발급', diff --git a/web/src/config/lang/vi.js b/web/src/config/lang/vi.js index 81c1697e30..91e5a95887 100644 --- a/web/src/config/lang/vi.js +++ b/web/src/config/lang/vi.js @@ -1111,7 +1111,7 @@ export default { LABEL_PAIR_MAKER_FEE: '{0} Maker Fee', LABEL_PAIR_TAKER_FEE: '{0} Taker Fee', UNLIMITED: 'Không giới hạn', - BLOCKED: '0', + BLOCKED: 'Disabled', }, WALLET_ADDRESS_TITLE: 'Tạo ví {0}', WALLET_ADDRESS_GENERATE: 'Tạo', diff --git a/web/src/config/lang/zh.js b/web/src/config/lang/zh.js index d83c12b584..3f26398f58 100644 --- a/web/src/config/lang/zh.js +++ b/web/src/config/lang/zh.js @@ -1016,7 +1016,7 @@ export default { LABEL_PAIR_MAKER_FEE: '{0} Maker Fee', LABEL_PAIR_TAKER_FEE: '{0} Taker Fee', UNLIMITED: '无限制', - BLOCKED: '0', + BLOCKED: 'Disabled', }, WALLET_ADDRESS_TITLE: '生成{0}钱包', WALLET_ADDRESS_GENERATE: '生成', diff --git a/web/src/containers/Admin/Tiers/Limits.js b/web/src/containers/Admin/Tiers/Limits.js index 5a3298965a..fdcd12ce27 100644 --- a/web/src/containers/Admin/Tiers/Limits.js +++ b/web/src/containers/Admin/Tiers/Limits.js @@ -9,7 +9,7 @@ import withConfig from 'components/ConfigProvider/withConfig'; const limitStatus = (value, nativeCurrency) => { if (value === -1) { - return 'BLOCKED'; + return 'DISABLED'; } else if (value === 0) { return 'UNLIMITED'; } else if (!value) { From fa2bd79de8dc7831ff01609edd3c488fed438aae Mon Sep 17 00:00:00 2001 From: Amir Hossein Salar Date: Tue, 9 Mar 2021 12:35:20 +0330 Subject: [PATCH 11/16] changes for market cards in mobile layout --- web/src/containers/TradeTabs/_TradeTabs.scss | 38 ++++++++++++++++++++ web/src/index.css | 25 +++++++++++++ 2 files changed, 63 insertions(+) diff --git a/web/src/containers/TradeTabs/_TradeTabs.scss b/web/src/containers/TradeTabs/_TradeTabs.scss index f6630a0309..ce6993c89f 100644 --- a/web/src/containers/TradeTabs/_TradeTabs.scss +++ b/web/src/containers/TradeTabs/_TradeTabs.scss @@ -297,6 +297,44 @@ $trade-tab--arrow-size: 0.4rem; .trade_tabs-container { overflow-y: scroll; } + + @media screen and (max-width: 1096px) { + .trade_tabs-container { + .trade-tab-list { + margin: 1.5rem 1rem; + } + .trade_tab-icons { + width: 2.25rem; + } + .tabs-pair-details { + font-size: 1rem; + width: 28rem; + } + .market-card__sparkline-wrapper { + height: 10rem; + } + } + } + + @media screen and (max-width: $bp-xs) { + .trade_tabs-container { + overflow-y: scroll; + .trade-tab-list { + margin: 1.5rem 1rem; + } + .trade_tab-icons { + width: 2.25rem; + } + .tabs-pair-details { + font-size: 1.5rem; + width: 34rem; + max-width: 96%; + } + .market-card__sparkline-wrapper { + height: 12rem; + } + } + } } @media screen and (max-width: 1096px) { diff --git a/web/src/index.css b/web/src/index.css index 7cb4de126b..533548e6fd 100644 --- a/web/src/index.css +++ b/web/src/index.css @@ -3178,6 +3178,31 @@ table th { .layout-mobile .trade_tabs-container { overflow-y: scroll; } +@media screen and (max-width: 1096px) { + .layout-mobile .trade_tabs-container .trade-tab-list { + margin: 1.5rem 1rem; } + .layout-mobile .trade_tabs-container .trade_tab-icons { + width: 2.25rem; } + .layout-mobile .trade_tabs-container .tabs-pair-details { + font-size: 1rem; + width: 28rem; } + .layout-mobile .trade_tabs-container .market-card__sparkline-wrapper { + height: 10rem; } } + +@media screen and (max-width: 575px) { + .layout-mobile .trade_tabs-container { + overflow-y: scroll; } + .layout-mobile .trade_tabs-container .trade-tab-list { + margin: 1.5rem 1rem; } + .layout-mobile .trade_tabs-container .trade_tab-icons { + width: 2.25rem; } + .layout-mobile .trade_tabs-container .tabs-pair-details { + font-size: 1.5rem; + width: 34rem; + max-width: 96%; } + .layout-mobile .trade_tabs-container .market-card__sparkline-wrapper { + height: 12rem; } } + @media screen and (max-width: 1096px) { .trade_tabs-container .trade-tab-list { margin: 1.5rem 1rem; } From bf6b8d62887b7c4f7f8c17624d24ed4dd4c4e79d Mon Sep 17 00:00:00 2001 From: Yechan Kim Date: Wed, 10 Mar 2021 17:42:45 +0900 Subject: [PATCH 12/16] Set Docker image execution accounts to non-root --- Dockerfile | 9 +++++++++ web/docker/Dockerfile | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9fc8aee39e..5beed6f7bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,15 @@ COPY ./server /app WORKDIR /app +# Changing the default image user to 'appuser' +RUN groupadd -g 999 appuser && \ + useradd -r -u 999 -g appuser appuser && \ + mkdir /home/appuser && \ + chown -R appuser /home/appuser && \ + chown -R appuser /app + +USER appuser + RUN npm install --loglevel=error && \ pm2 update && \ cd /app/mail && npm install --loglevel=error diff --git a/web/docker/Dockerfile b/web/docker/Dockerfile index f23233ac10..253d929709 100644 --- a/web/docker/Dockerfile +++ b/web/docker/Dockerfile @@ -14,7 +14,13 @@ RUN apk add --update \ COPY --from=build /app/build /usr/share/nginx/html RUN rm /etc/nginx/conf.d/default.conf COPY docker/nginx.conf /etc/nginx/conf.d -EXPOSE 80 +# Changing the user to 'nginx' +RUN chown -R nginx:nginx /var/cache/nginx && \ + chown -R nginx:nginx /var/log/nginx && \ + chown -R nginx:nginx /etc/nginx/conf.d && \ + touch /var/run/nginx.pid && \ + chown -R nginx:nginx /var/run/nginx.pid +EXPOSE 80 443 CMD ["nginx", "-g", "daemon off;"] From 3c24958c574ce43fb0c711dcdc2c923c96febf84 Mon Sep 17 00:00:00 2001 From: Yechan Kim Date: Thu, 11 Mar 2021 11:47:33 +0900 Subject: [PATCH 13/16] Forwarding '/' requests to API on Nginx --- templates/local/nginx/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/local/nginx/nginx.conf b/templates/local/nginx/nginx.conf index 927901ddea..b730be649c 100644 --- a/templates/local/nginx/nginx.conf +++ b/templates/local/nginx/nginx.conf @@ -58,7 +58,7 @@ server { proxy_pass http://api; } - location /v2 { + location / { limit_req zone=api burst=10 nodelay; limit_req_log_level info; limit_req_status 429; From 2bb058cd1407ec291c168bd9b2ed5afa42358735 Mon Sep 17 00:00:00 2001 From: Ali Beikverdi Date: Thu, 11 Mar 2021 16:02:40 +0900 Subject: [PATCH 14/16] root and explorer endpoint to the server --- server/app.js | 6 +++++- server/tools/nginx/logs/hollaex.access.log | 11 +++++++++++ server/tools/nginx/nginx.conf | 12 ++++++------ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/server/app.js b/server/app.js index 3fcd52ce33..2779dd0941 100644 --- a/server/app.js +++ b/server/app.js @@ -65,7 +65,11 @@ var options = { 'https://rm-content.s3.amazonaws.com/5aead825bb456c005e2322dd/upload-c116da40-ebd2-11e8-9c84-e32cc39c32d1_57.png' }; -app.use('/docs', swaggerUi.serve, swaggerUi.setup(swaggerDoc, options)); +app.get('/', (req, res) => { + res.redirect('/v2/health'); +}); + +app.use('/explorer', swaggerUi.serve, swaggerUi.setup(swaggerDoc, options)); SwaggerExpress.create(config, function(err, swaggerExpress) { if (err) { throw err; } diff --git a/server/tools/nginx/logs/hollaex.access.log b/server/tools/nginx/logs/hollaex.access.log index e69de29bb2..13b200688c 100644 --- a/server/tools/nginx/logs/hollaex.access.log +++ b/server/tools/nginx/logs/hollaex.access.log @@ -0,0 +1,11 @@ +172.20.0.1 - - [11/Mar/2021:07:01:36 +0000] 404 "GET /docs HTTP/1.1" 143 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36" "-" +172.20.0.1 - - [11/Mar/2021:07:01:38 +0000] 200 "GET /v2/health HTTP/1.1" 55 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36" "-" +172.20.0.1 - - [11/Mar/2021:07:01:38 +0000] 404 "GET /favicon.ico HTTP/1.1" 150 "http://localhost/v2/health" "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36" "-" +172.20.0.1 - - [11/Mar/2021:07:01:43 +0000] 301 "GET /explorer HTTP/1.1" 175 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36" "-" +172.20.0.1 - - [11/Mar/2021:07:01:43 +0000] 200 "GET /explorer/ HTTP/1.1" 3595 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36" "-" +172.20.0.1 - - [11/Mar/2021:07:01:43 +0000] 200 "GET /explorer/swagger-ui-init.js HTTP/1.1" 169875 "http://localhost/explorer/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36" "-" +172.20.0.1 - - [11/Mar/2021:07:01:43 +0000] 200 "GET /explorer/swagger-ui.css HTTP/1.1" 143212 "http://localhost/explorer/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36" "-" +172.20.0.1 - - [11/Mar/2021:07:01:43 +0000] 200 "GET /explorer/swagger-ui-standalone-preset.js HTTP/1.1" 333912 "http://localhost/explorer/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36" "-" +172.20.0.1 - - [11/Mar/2021:07:01:43 +0000] 200 "GET /explorer/swagger-ui-bundle.js HTTP/1.1" 1063738 "http://localhost/explorer/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36" "-" +172.20.0.1 - - [11/Mar/2021:07:01:48 +0000] 302 "GET / HTTP/1.1" 64 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36" "-" +172.20.0.1 - - [11/Mar/2021:07:01:48 +0000] 200 "GET /v2/health HTTP/1.1" 55 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36" "-" diff --git a/server/tools/nginx/nginx.conf b/server/tools/nginx/nginx.conf index cfc0bdda88..3c69e7e350 100644 --- a/server/tools/nginx/nginx.conf +++ b/server/tools/nginx/nginx.conf @@ -31,11 +31,7 @@ server { include /etc/nginx/conf.d/plugin*.conf; - location /api-docs { - proxy_pass http://api; - } - - location /docs { + location /explorer { proxy_pass http://api; } @@ -47,7 +43,7 @@ server { proxy_pass http://api; } - location /plugins { + location /plugins { proxy_pass http://plugins; } @@ -59,6 +55,10 @@ server { proxy_pass http://socket; } + location / { + proxy_pass http://api; + } + error_page 429 /429.html; location = /429.html { root /usr/share/nginx/html; From fa83ef1f5843be810995dd1a6837595de478dbb8 Mon Sep 17 00:00:00 2001 From: Ali Beikverdi Date: Thu, 11 Mar 2021 16:03:40 +0900 Subject: [PATCH 15/16] version update --- server/api/swagger/swagger.yaml | 2 +- server/package.json | 2 +- version | 2 +- web/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/api/swagger/swagger.yaml b/server/api/swagger/swagger.yaml index 7f2e40ce10..9e2cff386c 100644 --- a/server/api/swagger/swagger.yaml +++ b/server/api/swagger/swagger.yaml @@ -1,6 +1,6 @@ swagger: "2.0" info: - version: "2.0.9" + version: "2.0.10" title: HollaEx Kit host: api.hollaex.com basePath: /v2 diff --git a/server/package.json b/server/package.json index 285adc3129..56986db0c4 100644 --- a/server/package.json +++ b/server/package.json @@ -1,5 +1,5 @@ { - "version": "2.0.9", + "version": "2.0.10", "private": false, "description": "HollaEx Kit", "keywords": [ diff --git a/version b/version index ed35d09262..fee3c9251d 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.0.9 \ No newline at end of file +2.0.10 \ No newline at end of file diff --git a/web/package.json b/web/package.json index 85ee01201f..a9d45c6612 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "hollaex-kit", - "version": "2.0.9", + "version": "2.0.10", "private": true, "dependencies": { "@ant-design/compatible": "1.0.5", From 9308ccdf9fd6bfa97d9f74188c3688ff095292af Mon Sep 17 00:00:00 2001 From: ram Date: Thu, 11 Mar 2021 12:48:50 +0530 Subject: [PATCH 16/16] changes for plugin announcement token issue --- web/src/containers/Admin/Plugins/PluginConfigureForm.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/src/containers/Admin/Plugins/PluginConfigureForm.js b/web/src/containers/Admin/Plugins/PluginConfigureForm.js index 4e60caf3a8..a1fc89defc 100644 --- a/web/src/containers/Admin/Plugins/PluginConfigureForm.js +++ b/web/src/containers/Admin/Plugins/PluginConfigureForm.js @@ -5,6 +5,7 @@ import { message, Spin } from 'antd'; import { STATIC_ICONS } from 'config/icons'; import { AdminHocForm } from '../../../components'; import { updatePluginMeta, getPluginMeta } from './action'; +import { TOKEN_KEY } from '../../../config/constants'; import './index.css'; const Form = AdminHocForm('PLUGIN_CONFIGURE_FORM'); @@ -56,6 +57,7 @@ const renderContent = (selectedPlugin, requestPlugin, metaData) => { ); } else if (selectedPlugin.admin_view) { + window.plugin_key = TOKEN_KEY; return (
Configure