From 2e438220daa3984de25a89cacbae44f5d413086a Mon Sep 17 00:00:00 2001 From: Bahar Date: Thu, 14 Apr 2022 11:28:34 +0800 Subject: [PATCH] bahar/landing_on_dtrader_responsive_page_frequently_after_clicking_cashier (#4917) * landing_on_dtrader_responsive_page_frequently_after_clicking_cashier_or_settings_option * fix_issue_with_account_setting * hide_more_options * add_derivgo_condition_for_hiding_option * refactor * chore: renamed variables * fix_issue Co-authored-by: yashim-deriv --- .../account-limits/account-limits-article.jsx | 30 ++++++++++++------ .../account-limits/account-limits.jsx | 4 ++- packages/account/src/Containers/account.jsx | 27 +++++----------- .../Security/AccountLimits/account-limits.jsx | 3 +- .../CashierDefault/cashier-default.jsx | 7 +++-- .../Receipt/account-transfer-receipt.jsx | 29 ++++++++++------- .../Receipt/payment-agent-receipt.jsx | 24 ++++++++------ .../payment-agent-transfer-receipt.jsx | 31 +++++++++++++------ packages/cashier/src/Containers/cashier.jsx | 10 +++--- .../src/Sass/payment-agent-receipt.scss | 24 ++++++++------ .../components/page-overlay/page-overlay.jsx | 2 +- packages/core/src/Stores/common-store.js | 9 ++++-- .../Modules/Reports/Containers/reports.jsx | 5 ++- 13 files changed, 122 insertions(+), 83 deletions(-) diff --git a/packages/account/src/Components/account-limits/account-limits-article.jsx b/packages/account/src/Components/account-limits/account-limits-article.jsx index 9d2ae9885979..4632c98b7ef8 100644 --- a/packages/account/src/Components/account-limits/account-limits-article.jsx +++ b/packages/account/src/Components/account-limits/account-limits-article.jsx @@ -1,22 +1,32 @@ +import PropTypes from 'prop-types'; import * as React from 'react'; import { StaticUrl } from '@deriv/components'; import { Localize, localize } from '@deriv/translations'; import AccountArticle from 'Components/article/article.jsx'; -const AccountLimitsArticle = () => { - return ( - , +const AccountLimitsArticle = ({ is_from_derivgo }) => { + const getDescription = () => { + const description = [ + , + ]; + + if (!is_from_derivgo) { + description.push( ]} - />, - ]} - /> - ); + /> + ); + } + return description; + }; + + return ; +}; + +AccountLimitsArticle.propTypes = { + is_from_derivgo: PropTypes.bool, }; export default AccountLimitsArticle; diff --git a/packages/account/src/Components/account-limits/account-limits.jsx b/packages/account/src/Components/account-limits/account-limits.jsx index 8a7ebb19a903..64ae3fa25e35 100644 --- a/packages/account/src/Components/account-limits/account-limits.jsx +++ b/packages/account/src/Components/account-limits/account-limits.jsx @@ -25,6 +25,7 @@ const AccountLimits = ({ is_switching, is_virtual, overlay_ref, + is_from_derivgo, setIsOverlayShown: setIsPopupOverlayShown, should_bypass_scrollbars, should_show_article, @@ -116,7 +117,7 @@ const AccountLimits = ({ 'da-account-limits--app-settings': is_app_settings, })} > - {should_show_article && isMobile() && } + {should_show_article && isMobile() && }
@@ -343,6 +344,7 @@ AccountLimits.propTypes = { is_app_settings: PropTypes.bool, getLimits: PropTypes.func.isRequired, is_fully_authenticated: PropTypes.bool.isRequired, + is_from_derivgo: PropTypes.bool, is_switching: PropTypes.bool.isRequired, is_virtual: PropTypes.bool.isRequired, overlay_ref: PropTypes.shape({ current: PropTypes.any }), diff --git a/packages/account/src/Containers/account.jsx b/packages/account/src/Containers/account.jsx index d39f4af46c5e..e1b4171956f5 100644 --- a/packages/account/src/Containers/account.jsx +++ b/packages/account/src/Containers/account.jsx @@ -2,14 +2,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import { withRouter } from 'react-router-dom'; import { VerticalTab, FadeWrapper, PageOverlay, Loading, Text } from '@deriv/components'; -import { - routes as shared_routes, - isMobile, - matchRoute, - getSelectedRoute, - platforms, - PlatformContext, -} from '@deriv/shared'; +import { routes as shared_routes, isMobile, matchRoute, getSelectedRoute, PlatformContext } from '@deriv/shared'; import { localize } from '@deriv/translations'; import { connect } from 'Stores/connect'; import { flatten } from '../Helpers/flatten'; @@ -35,21 +28,17 @@ const AccountLogout = ({ logout, history }) => { }; const PageOverlayWrapper = ({ + is_from_derivgo, is_appstore, list_groups, logout, onClickClose, - platform, selected_route, subroutes, }) => { if (isMobile() && selected_route) { return ( - + ); @@ -75,11 +64,7 @@ const PageOverlayWrapper = ({ } return ( - +
({ currency: client.currency, is_logged_in: client.is_logged_in, is_logging_in: client.is_logging_in, + is_from_derivgo: common.is_from_derivgo, is_virtual: client.is_virtual, is_visible: ui.is_account_settings_visible, logout: client.logout, diff --git a/packages/account/src/Sections/Security/AccountLimits/account-limits.jsx b/packages/account/src/Sections/Security/AccountLimits/account-limits.jsx index 3173e32e279f..f62e6119338b 100644 --- a/packages/account/src/Sections/Security/AccountLimits/account-limits.jsx +++ b/packages/account/src/Sections/Security/AccountLimits/account-limits.jsx @@ -1,11 +1,12 @@ import AccountLimits from 'Components/account-limits/account-limits.jsx'; import { connect } from 'Stores/connect'; -export default connect(({ client, ui }) => ({ +export default connect(({ client, common, ui }) => ({ account_limits: client.account_limits, currency: client.currency, getLimits: client.getLimits, is_fully_authenticated: client.is_fully_authenticated, + is_from_derivgo: common.is_from_derivgo, is_virtual: client.is_virtual, is_switching: client.is_switching, should_show_article: true, diff --git a/packages/cashier/src/Components/CashierDefault/cashier-default.jsx b/packages/cashier/src/Components/CashierDefault/cashier-default.jsx index 4b4f076bcf04..a308e37c844b 100644 --- a/packages/cashier/src/Components/CashierDefault/cashier-default.jsx +++ b/packages/cashier/src/Components/CashierDefault/cashier-default.jsx @@ -17,6 +17,7 @@ const CashierDefault = ({ is_dark_mode_on, is_landing_company_loaded, is_mobile, + is_from_derivgo, is_payment_agent_visible_in_onboarding, is_switching, onMountCashierDefault, @@ -154,7 +155,7 @@ const CashierDefault = ({
- {is_mobile && ( + {is_mobile && !is_from_derivgo && (
window.open(getStaticUrl('/payment-methods'))} @@ -192,6 +193,7 @@ CashierDefault.propTypes = { is_dark_mode_on: PropTypes.bool, is_landing_company_loaded: PropTypes.bool, is_mobile: PropTypes.bool, + is_from_derivgo: PropTypes.bool, is_payment_agent_visible_in_onboarding: PropTypes.bool, is_switching: PropTypes.bool, onMountCashierDefault: PropTypes.func, @@ -208,7 +210,7 @@ CashierDefault.propTypes = { toggleSetCurrencyModal: PropTypes.func, }; -export default connect(({ client, modules, ui }) => ({ +export default connect(({ client, common, modules, ui }) => ({ accounts_list: modules.cashier.account_transfer.accounts_list, available_crypto_currencies: client.available_crypto_currencies, currency: client.currency, @@ -216,6 +218,7 @@ export default connect(({ client, modules, ui }) => ({ is_dark_mode_on: ui.is_dark_mode_on, is_landing_company_loaded: client.is_landing_company_loaded, is_mobile: ui.is_mobile, + is_from_derivgo: common.is_from_derivgo, is_payment_agent_visible_in_onboarding: modules.cashier.payment_agent.is_payment_agent_visible_in_onboarding, is_switching: client.is_switching, onMountCashierDefault: modules.cashier.general_store.onMountCashierDefault, diff --git a/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx b/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx index 3c4fceed3d40..c965eb90ef67 100644 --- a/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx +++ b/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx @@ -11,6 +11,7 @@ const AccountTransferReceipt = ({ disableApp, enableApp, history, + is_from_derivgo, loginid, receipt, resetAccountTransfer, @@ -106,14 +107,16 @@ const AccountTransferReceipt = ({
-
)}
-