From d697f833a6d6d75f14faf744bf8c4225ce02c517 Mon Sep 17 00:00:00 2001
From: Bahar <bahar@firstsource.tech>
Date: Tue, 22 Feb 2022 14:11:35 +0330
Subject: [PATCH 1/7] 
 landing_on_dtrader_responsive_page_frequently_after_clicking_cashier_or_settings_option

---
 .../Receipt/account-transfer-receipt.jsx      | 31 +++++++++++--------
 .../Modules/Reports/Containers/reports.jsx    | 11 +++++--
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx b/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx
index 3c4fceed3d40..9d30f5417c56 100644
--- a/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx
+++ b/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { withRouter } from 'react-router';
 import { Button, Modal, Icon, Text } from '@deriv/components';
-import { formatMoney, getCurrencyDisplayCode, isMobile, routes } from '@deriv/shared';
+import { formatMoney, getCurrencyDisplayCode, isMobile, platforms, routes } from '@deriv/shared';
 import { localize, Localize } from '@deriv/translations';
 import { connect } from 'Stores/connect';
 import 'Sass/account-transfer-receipt.scss';
@@ -12,6 +12,7 @@ const AccountTransferReceipt = ({
     enableApp,
     history,
     loginid,
+    platform,
     receipt,
     resetAccountTransfer,
     selected_from,
@@ -106,14 +107,16 @@ const AccountTransferReceipt = ({
                 </div>
             </div>
             <div className='account-transfer-receipt__crypto--form-submit'>
-                <Button
-                    className='account-transfer-receipt__button'
-                    has_effect
-                    text={localize('View transaction details')}
-                    onClick={checkAccount}
-                    secondary
-                    large
-                />
+                {!platforms[platform] && (
+                    <Button
+                        className='account-transfer-receipt__button'
+                        has_effect
+                        text={localize('View transaction details')}
+                        onClick={checkAccount}
+                        secondary
+                        large
+                    />
+                )}
                 <Button
                     className='account-transfer-receipt__button'
                     has_effect
@@ -158,6 +161,7 @@ AccountTransferReceipt.propTypes = {
     disableApp: PropTypes.func,
     enableApp: PropTypes.func,
     loginid: PropTypes.string,
+    platform: PropTypes.string,
     receipt: PropTypes.object,
     resetAccountTransfer: PropTypes.func,
     selected_from: PropTypes.object,
@@ -166,14 +170,15 @@ AccountTransferReceipt.propTypes = {
 };
 
 export default withRouter(
-    connect(({ client, modules, ui }) => ({
+    connect(({ client, common, modules, ui }) => ({
+        disableApp: ui.disableApp,
+        enableApp: ui.enableApp,
         loginid: client.loginid,
-        switchAccount: client.switchAccount,
+        platform: common.platform,
         receipt: modules.cashier.account_transfer.receipt,
         resetAccountTransfer: modules.cashier.account_transfer.resetAccountTransfer,
         selected_from: modules.cashier.account_transfer.selected_from,
         selected_to: modules.cashier.account_transfer.selected_to,
-        disableApp: ui.disableApp,
-        enableApp: ui.enableApp,
+        switchAccount: client.switchAccount,
     }))(AccountTransferReceipt)
 );
diff --git a/packages/trader/src/Modules/Reports/Containers/reports.jsx b/packages/trader/src/Modules/Reports/Containers/reports.jsx
index 871bb6307a27..8203dd53b20c 100644
--- a/packages/trader/src/Modules/Reports/Containers/reports.jsx
+++ b/packages/trader/src/Modules/Reports/Containers/reports.jsx
@@ -11,7 +11,7 @@ import {
     SelectNative,
     Loading,
 } from '@deriv/components';
-import { getSelectedRoute } from '@deriv/shared';
+import { getSelectedRoute, platforms } from '@deriv/shared';
 import { localize } from '@deriv/translations';
 import { connect } from 'Stores/connect';
 import 'Sass/app/modules/reports.scss';
@@ -22,6 +22,7 @@ const Reports = ({
     is_logging_in,
     is_visible,
     location,
+    platform,
     routeBackInApp,
     routes,
     setTabIndex,
@@ -67,7 +68,11 @@ const Reports = ({
     return (
         <FadeWrapper is_visible={is_visible} className='reports-page-wrapper' keyname='reports-page-wrapper'>
             <div className='reports'>
-                <PageOverlay header={localize('Reports')} onClickClose={onClickClose}>
+                <PageOverlay
+                    header={localize('Reports')}
+                    onClickClose={onClickClose}
+                    is_close_disabled={!!platforms[platform]}
+                >
                     <DesktopWrapper>
                         <VerticalTab
                             alignment='center'
@@ -111,6 +116,7 @@ Reports.propTypes = {
     is_logging_in: PropTypes.bool,
     is_visible: PropTypes.bool,
     location: PropTypes.object,
+    platform: PropTypes.string,
     routeBackInApp: PropTypes.func,
     routes: PropTypes.arrayOf(PropTypes.object),
     setTabIndex: PropTypes.func,
@@ -123,6 +129,7 @@ export default connect(({ client, common, ui }) => ({
     is_logged_in: client.is_logged_in,
     is_logging_in: client.is_logging_in,
     is_visible: ui.is_reports_visible,
+    platform: common.platform,
     routeBackInApp: common.routeBackInApp,
     setVisibilityRealityCheck: client.setVisibilityRealityCheck,
     setTabIndex: ui.setReportsTabIndex,

From 26ef9c2a4faf6133991ada07d4927c964ae9e1d3 Mon Sep 17 00:00:00 2001
From: Bahar <bahar@firstsource.tech>
Date: Wed, 23 Feb 2022 08:03:15 +0330
Subject: [PATCH 2/7] fix_issue_with_account_setting

---
 packages/account/src/Containers/account.jsx               | 8 ++------
 .../src/components/page-overlay/page-overlay.jsx          | 2 +-
 .../trader/src/Modules/Reports/Containers/reports.jsx     | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/account/src/Containers/account.jsx b/packages/account/src/Containers/account.jsx
index d90f53923fb2..e2ec34d7b296 100644
--- a/packages/account/src/Containers/account.jsx
+++ b/packages/account/src/Containers/account.jsx
@@ -48,7 +48,7 @@ const PageOverlayWrapper = ({
             <PageOverlay
                 header={selected_route.getTitle()}
                 onClickClose={onClickClose}
-                is_close_disabled={!!platforms[platform]}
+                is_from_app={!!platforms[platform]}
             >
                 <selected_route.component component_icon={selected_route.icon_component} />
             </PageOverlay>
@@ -75,11 +75,7 @@ const PageOverlayWrapper = ({
     }
 
     return (
-        <PageOverlay
-            header={localize('Settings')}
-            onClickClose={onClickClose}
-            is_close_disabled={!!platforms[platform]}
-        >
+        <PageOverlay header={localize('Settings')} onClickClose={onClickClose} is_from_app={!!platforms[platform]}>
             <VerticalTab
                 alignment='center'
                 is_floating
diff --git a/packages/components/src/components/page-overlay/page-overlay.jsx b/packages/components/src/components/page-overlay/page-overlay.jsx
index 96062ef4af61..ffa0c888af63 100644
--- a/packages/components/src/components/page-overlay/page-overlay.jsx
+++ b/packages/components/src/components/page-overlay/page-overlay.jsx
@@ -65,7 +65,7 @@ PageOverlay.propTypes = {
     children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
     header: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
     id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    is_close_disabled: PropTypes.bool,
+    is_from_app: PropTypes.bool,
     is_open: PropTypes.bool,
     onClickClose: PropTypes.func,
     portal_id: PropTypes.string,
diff --git a/packages/trader/src/Modules/Reports/Containers/reports.jsx b/packages/trader/src/Modules/Reports/Containers/reports.jsx
index 8203dd53b20c..6acce038b0c7 100644
--- a/packages/trader/src/Modules/Reports/Containers/reports.jsx
+++ b/packages/trader/src/Modules/Reports/Containers/reports.jsx
@@ -71,7 +71,7 @@ const Reports = ({
                 <PageOverlay
                     header={localize('Reports')}
                     onClickClose={onClickClose}
-                    is_close_disabled={!!platforms[platform]}
+                    is_from_app={!!platforms[platform]}
                 >
                     <DesktopWrapper>
                         <VerticalTab

From 7b24973b19402e12bbf59c5294ce468f53752bb0 Mon Sep 17 00:00:00 2001
From: Bahar <bahar@firstsource.tech>
Date: Wed, 2 Mar 2022 10:53:50 +0330
Subject: [PATCH 3/7] hide_more_options

---
 .../account-limits/account-limits-article.jsx | 30 ++++++++++++------
 .../account-limits/account-limits.jsx         |  6 +++-
 .../Security/AccountLimits/account-limits.jsx |  3 +-
 .../CashierDefault/cashier-default.jsx        |  7 +++--
 .../Receipt/payment-agent-receipt.jsx         | 31 +++++++++++++------
 .../payment-agent-transfer-receipt.jsx        | 31 +++++++++++++------
 packages/core/src/Stores/common-store.js      |  9 ++++--
 7 files changed, 81 insertions(+), 36 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 9041af00ca34..274b5e60e383 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 (
-        <AccountArticle
-            title={localize('Account limits')}
-            descriptions={[
-                <Localize key={0} i18n_default_text='These are default limits that we apply to your accounts.' />,
+const AccountLimitsArticle = ({ is_navigated_from_deriv_go }) => {
+    const getDescription = () => {
+        const description = [];
+        description.push(
+            <Localize key={0} i18n_default_text='These are default limits that we apply to your accounts.' />
+        );
+        if (!is_navigated_from_deriv_go) {
+            description.push(
                 <Localize
                     key={1}
                     i18n_default_text='To learn more about trading limits and how they apply, please go to the <0>Help Centre.</0>'
                     components={[<StaticUrl key={0} className='link' href='/help-centre' />]}
-                />,
-            ]}
-        />
-    );
+                />
+            );
+        }
+        return description;
+    };
+
+    return <AccountArticle title={localize('Account limits')} descriptions={getDescription()} />;
+};
+
+AccountLimitsArticle.propTypes = {
+    is_navigated_from_deriv_go: 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 7d1c72a9a922..79aa28a7dc31 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_navigated_from_deriv_go,
     setIsOverlayShown: setIsPopupOverlayShown,
     should_bypass_scrollbars,
     should_show_article,
@@ -116,7 +117,9 @@ const AccountLimits = ({
                         'da-account-limits--app-settings': is_app_settings,
                     })}
                 >
-                    {should_show_article && isMobile() && <AccountLimitsArticle />}
+                    {should_show_article && isMobile() && (
+                        <AccountLimitsArticle is_navigated_from_deriv_go={is_navigated_from_deriv_go} />
+                    )}
                     <div className='da-account-limits__table-wrapper'>
                         <ThemedScrollbars is_bypassed={should_bypass_scrollbars || isMobile()}>
                             <table className='da-account-limits__table'>
@@ -343,6 +346,7 @@ AccountLimits.propTypes = {
     is_app_settings: PropTypes.bool,
     getLimits: PropTypes.func.isRequired,
     is_fully_authenticated: PropTypes.bool.isRequired,
+    is_navigated_from_deriv_go: 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/Sections/Security/AccountLimits/account-limits.jsx b/packages/account/src/Sections/Security/AccountLimits/account-limits.jsx
index 3173e32e279f..43ea140a11ea 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_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
     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..2e4c4fa57718 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_navigated_from_deriv_go,
     is_payment_agent_visible_in_onboarding,
     is_switching,
     onMountCashierDefault,
@@ -154,7 +155,7 @@ const CashierDefault = ({
                         <Localize i18n_default_text='Please note that some payment methods might not be available in your country.' />
                     </Text>
                 </div>
-                {is_mobile && (
+                {is_mobile && !is_navigated_from_deriv_go && (
                     <div
                         className='cashier-default-header-learn-more'
                         onClick={() => 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_navigated_from_deriv_go: 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_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
     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/payment-agent-receipt.jsx b/packages/cashier/src/Components/Receipt/payment-agent-receipt.jsx
index 1312a6cc052c..856d86054120 100644
--- a/packages/cashier/src/Components/Receipt/payment-agent-receipt.jsx
+++ b/packages/cashier/src/Components/Receipt/payment-agent-receipt.jsx
@@ -13,7 +13,14 @@ const openStatement = (history, resetPaymentAgent) => {
     resetPaymentAgent();
 };
 
-const PaymentAgentReceipt = ({ currency, history, loginid, receipt, resetPaymentAgent }) => {
+const PaymentAgentReceipt = ({
+    currency,
+    history,
+    is_navigated_from_deriv_go,
+    loginid,
+    receipt,
+    resetPaymentAgent,
+}) => {
     React.useEffect(() => {
         return () => resetPaymentAgent();
     }, [resetPaymentAgent]);
@@ -107,14 +114,16 @@ const PaymentAgentReceipt = ({ currency, history, loginid, receipt, resetPayment
                 </div>
             )}
             <div className='cashier__form-submit'>
-                <Button
-                    className='cashier__form-submit-button'
-                    has_effect
-                    text={localize('View in statement')}
-                    onClick={() => openStatement(history, resetPaymentAgent)}
-                    secondary
-                    large
-                />
+                {!is_navigated_from_deriv_go && (
+                    <Button
+                        className='cashier__form-submit-button'
+                        has_effect
+                        text={localize('View in statement')}
+                        onClick={() => openStatement(history, resetPaymentAgent)}
+                        secondary
+                        large
+                    />
+                )}
                 <Button
                     className='cashier__form-submit-button cashier__done-button'
                     has_effect
@@ -131,14 +140,16 @@ const PaymentAgentReceipt = ({ currency, history, loginid, receipt, resetPayment
 PaymentAgentReceipt.propTypes = {
     currency: PropTypes.string,
     history: PropTypes.object,
+    is_navigated_from_deriv_go: PropTypes.bool,
     loginid: PropTypes.string,
     receipt: PropTypes.object,
     resetPaymentAgent: PropTypes.func,
 };
 
 export default withRouter(
-    connect(({ client, modules }) => ({
+    connect(({ client, common, modules }) => ({
         currency: client.currency,
+        is_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
         loginid: client.loginid,
         receipt: modules.cashier.payment_agent.receipt,
         resetPaymentAgent: modules.cashier.payment_agent.resetPaymentAgent,
diff --git a/packages/cashier/src/Components/Receipt/payment-agent-transfer-receipt.jsx b/packages/cashier/src/Components/Receipt/payment-agent-transfer-receipt.jsx
index 36eb6da39f6c..060e47042d53 100644
--- a/packages/cashier/src/Components/Receipt/payment-agent-transfer-receipt.jsx
+++ b/packages/cashier/src/Components/Receipt/payment-agent-transfer-receipt.jsx
@@ -12,7 +12,14 @@ const openStatement = (history, resetPaymentAgentTransfer) => {
     resetPaymentAgentTransfer();
 };
 
-const PaymentAgentTransferReceipt = ({ currency, history, loginid, receipt, resetPaymentAgentTransfer }) => (
+const PaymentAgentTransferReceipt = ({
+    currency,
+    history,
+    is_navigated_from_deriv_go,
+    loginid,
+    receipt,
+    resetPaymentAgentTransfer,
+}) => (
     <div className='cashier__wrapper payment-agent-transfer-receipt__wrapper'>
         <div className='cashier__success'>
             <Text as='h2' color='prominent' align='center' weight='bold' className='cashier__header'>
@@ -56,14 +63,16 @@ const PaymentAgentTransferReceipt = ({ currency, history, loginid, receipt, rese
             </div>
         </div>
         <div className='cashier__form-submit'>
-            <Button
-                className='cashier__form-submit-button'
-                has_effect
-                text={localize('View in statement')}
-                onClick={() => openStatement(history, resetPaymentAgentTransfer)}
-                secondary
-                large
-            />
+            {!is_navigated_from_deriv_go && (
+                <Button
+                    className='cashier__form-submit-button'
+                    has_effect
+                    text={localize('View in statement')}
+                    onClick={() => openStatement(history, resetPaymentAgentTransfer)}
+                    secondary
+                    large
+                />
+            )}
             <Button
                 className='cashier__form-submit-button cashier__done-button'
                 has_effect
@@ -79,14 +88,16 @@ const PaymentAgentTransferReceipt = ({ currency, history, loginid, receipt, rese
 PaymentAgentTransferReceipt.propTypes = {
     currency: PropTypes.string,
     history: PropTypes.object,
+    is_navigated_from_deriv_go: PropTypes.bool,
     loginid: PropTypes.string,
     receipt: PropTypes.object,
     resetPaymentAgentTransfer: PropTypes.func,
 };
 
 export default withRouter(
-    connect(({ client, modules }) => ({
+    connect(({ client, common, modules }) => ({
         currency: client.currency,
+        is_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
         loginid: client.loginid,
         receipt: modules.cashier.payment_agent_transfer.receipt,
         resetPaymentAgentTransfer: modules.cashier.payment_agent_transfer.resetPaymentAgentTransfer,
diff --git a/packages/core/src/Stores/common-store.js b/packages/core/src/Stores/common-store.js
index ac75c5d8ed5a..85a264b2b6a2 100644
--- a/packages/core/src/Stores/common-store.js
+++ b/packages/core/src/Stores/common-store.js
@@ -1,6 +1,6 @@
-import { getAppId, getUrlBinaryBot, getUrlSmartTrader, isMobile, routes, toMoment } from '@deriv/shared';
+import { getAppId, getUrlBinaryBot, getUrlSmartTrader, isMobile, platforms, routes, toMoment } from '@deriv/shared';
 import { getAllowedLanguages } from '@deriv/translations';
-import { action, observable } from 'mobx';
+import { action, computed, observable } from 'mobx';
 import { currentLanguage } from 'Utils/Language/index';
 import ServerTime from '_common/base/server_time';
 import BinarySocket from '_common/base/socket_base';
@@ -71,6 +71,11 @@ export default class CommonStore extends BaseStore {
         }
     }
 
+    @computed
+    get is_navigated_from_deriv_go() {
+        return platforms[this.platform]?.platform_name === platforms.derivgo.platform_name;
+    }
+
     @action.bound
     setInitialRouteHistoryItem(location) {
         if (window.location.href.indexOf('?ext_platform_url=') !== -1) {

From 1b85dd169aefb1af9e1abba1a5a471ed2a388f92 Mon Sep 17 00:00:00 2001
From: Bahar <bahar@firstsource.tech>
Date: Wed, 2 Mar 2022 12:39:51 +0330
Subject: [PATCH 4/7] add_derivgo_condition_for_hiding_option

---
 packages/account/src/Containers/account.jsx   | 19 ++++++-------------
 .../Receipt/account-transfer-receipt.jsx      | 10 +++++-----
 packages/cashier/src/Containers/cashier.jsx   | 14 +++++++++-----
 .../Modules/Reports/Containers/reports.jsx    | 10 +++++-----
 4 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/packages/account/src/Containers/account.jsx b/packages/account/src/Containers/account.jsx
index e2ec34d7b296..686490658191 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';
@@ -36,10 +29,10 @@ const AccountLogout = ({ logout, history }) => {
 
 const PageOverlayWrapper = ({
     is_dashboard,
+    is_navigated_from_deriv_go,
     list_groups,
     logout,
     onClickClose,
-    platform,
     selected_route,
     subroutes,
 }) => {
@@ -48,7 +41,7 @@ const PageOverlayWrapper = ({
             <PageOverlay
                 header={selected_route.getTitle()}
                 onClickClose={onClickClose}
-                is_from_app={!!platforms[platform]}
+                is_from_app={is_navigated_from_deriv_go}
             >
                 <selected_route.component component_icon={selected_route.icon_component} />
             </PageOverlay>
@@ -75,7 +68,7 @@ const PageOverlayWrapper = ({
     }
 
     return (
-        <PageOverlay header={localize('Settings')} onClickClose={onClickClose} is_from_app={!!platforms[platform]}>
+        <PageOverlay header={localize('Settings')} onClickClose={onClickClose} is_from_app={is_navigated_from_deriv_go}>
             <VerticalTab
                 alignment='center'
                 is_floating
@@ -185,11 +178,11 @@ Account.propTypes = {
     history: PropTypes.object,
     is_logged_in: PropTypes.bool,
     is_logging_in: PropTypes.bool,
+    is_navigated_from_deriv_go: PropTypes.bool,
     is_virtual: PropTypes.bool,
     is_visible: PropTypes.bool,
     location: PropTypes.object,
     logout: PropTypes.func,
-    platform: PropTypes.string,
     routes: PropTypes.arrayOf(PropTypes.object),
     should_allow_authentication: PropTypes.bool,
     toggleAccount: PropTypes.func,
@@ -199,10 +192,10 @@ export default connect(({ client, common, ui }) => ({
     currency: client.currency,
     is_logged_in: client.is_logged_in,
     is_logging_in: client.is_logging_in,
+    is_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
     is_virtual: client.is_virtual,
     is_visible: ui.is_account_settings_visible,
     logout: client.logout,
-    platform: common.platform,
     routeBackInApp: common.routeBackInApp,
     should_allow_authentication: client.should_allow_authentication,
     toggleAccount: ui.toggleAccountSettings,
diff --git a/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx b/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx
index 9d30f5417c56..37437bdf2ddf 100644
--- a/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx
+++ b/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { withRouter } from 'react-router';
 import { Button, Modal, Icon, Text } from '@deriv/components';
-import { formatMoney, getCurrencyDisplayCode, isMobile, platforms, routes } from '@deriv/shared';
+import { formatMoney, getCurrencyDisplayCode, isMobile, routes } from '@deriv/shared';
 import { localize, Localize } from '@deriv/translations';
 import { connect } from 'Stores/connect';
 import 'Sass/account-transfer-receipt.scss';
@@ -11,8 +11,8 @@ const AccountTransferReceipt = ({
     disableApp,
     enableApp,
     history,
+    is_navigated_from_deriv_go,
     loginid,
-    platform,
     receipt,
     resetAccountTransfer,
     selected_from,
@@ -107,7 +107,7 @@ const AccountTransferReceipt = ({
                 </div>
             </div>
             <div className='account-transfer-receipt__crypto--form-submit'>
-                {!platforms[platform] && (
+                {!is_navigated_from_deriv_go && (
                     <Button
                         className='account-transfer-receipt__button'
                         has_effect
@@ -160,8 +160,8 @@ const AccountTransferReceipt = ({
 AccountTransferReceipt.propTypes = {
     disableApp: PropTypes.func,
     enableApp: PropTypes.func,
+    is_navigated_from_deriv_go: PropTypes.bool,
     loginid: PropTypes.string,
-    platform: PropTypes.string,
     receipt: PropTypes.object,
     resetAccountTransfer: PropTypes.func,
     selected_from: PropTypes.object,
@@ -173,8 +173,8 @@ export default withRouter(
     connect(({ client, common, modules, ui }) => ({
         disableApp: ui.disableApp,
         enableApp: ui.enableApp,
+        is_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
         loginid: client.loginid,
-        platform: common.platform,
         receipt: modules.cashier.account_transfer.receipt,
         resetAccountTransfer: modules.cashier.account_transfer.resetAccountTransfer,
         selected_from: modules.cashier.account_transfer.selected_from,
diff --git a/packages/cashier/src/Containers/cashier.jsx b/packages/cashier/src/Containers/cashier.jsx
index 505ab29e0cbd..fecda6efbdf2 100644
--- a/packages/cashier/src/Containers/cashier.jsx
+++ b/packages/cashier/src/Containers/cashier.jsx
@@ -12,7 +12,7 @@ import {
     Loading,
 } from '@deriv/components';
 import { localize } from '@deriv/translations';
-import { getSelectedRoute, getStaticUrl, isMobile, routes, WS, platforms } from '@deriv/shared';
+import { getSelectedRoute, getStaticUrl, isMobile, routes, WS } from '@deriv/shared';
 import { connect } from 'Stores/connect';
 import AccountPromptDialog from 'Components/account-prompt-dialog.jsx';
 import ErrorDialog from 'Components/error-dialog.jsx';
@@ -28,6 +28,7 @@ const Cashier = ({
     is_loading,
     is_logged_in,
     is_logging_in,
+    is_navigated_from_deriv_go,
     is_onramp_tab_visible,
     is_p2p_enabled,
     is_payment_agent_transfer_visible,
@@ -37,7 +38,6 @@ const Cashier = ({
     location,
     onMount,
     p2p_notification_count,
-    platform,
     routeBackInApp,
     routes: routes_config,
     setAccountSwitchListener,
@@ -117,7 +117,11 @@ const Cashier = ({
             <AccountPromptDialog />
             <ErrorDialog />
             <div className='cashier'>
-                <PageOverlay header={getHeaderTitle()} onClickClose={onClickClose} is_from_app={!!platforms[platform]}>
+                <PageOverlay
+                    header={getHeaderTitle()}
+                    onClickClose={onClickClose}
+                    is_from_app={is_navigated_from_deriv_go}
+                >
                     <DesktopWrapper>
                         <VerticalTab
                             alignment='center'
@@ -187,6 +191,7 @@ Cashier.propTypes = {
     is_loading: PropTypes.bool,
     is_logged_in: PropTypes.bool,
     is_logging_in: PropTypes.bool,
+    is_navigated_from_deriv_go: PropTypes.bool,
     is_onramp_tab_visible: PropTypes.bool,
     is_p2p_enabled: PropTypes.bool,
     is_payment_agent_transfer_visible: PropTypes.bool,
@@ -196,7 +201,6 @@ Cashier.propTypes = {
     location: PropTypes.object,
     onMount: PropTypes.func,
     p2p_notification_count: PropTypes.number,
-    platform: PropTypes.string,
     routeBackInApp: PropTypes.func,
     routes: PropTypes.arrayOf(PropTypes.object),
     setAccountSwitchListener: PropTypes.func,
@@ -214,6 +218,7 @@ export default connect(({ client, common, modules, ui }) => ({
     is_loading: modules.cashier.general_store.is_loading,
     is_logged_in: client.is_logged_in,
     is_logging_in: client.is_logging_in,
+    is_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
     is_onramp_tab_visible: modules.cashier.onramp.is_onramp_tab_visible,
     is_p2p_enabled: modules.cashier.general_store.is_p2p_enabled,
     is_payment_agent_transfer_visible: modules.cashier.payment_agent_transfer.is_payment_agent_transfer_visible,
@@ -222,7 +227,6 @@ export default connect(({ client, common, modules, ui }) => ({
     is_visible: ui.is_cashier_visible,
     onMount: modules.cashier.general_store.onMountCommon,
     p2p_notification_count: modules.cashier.general_store.p2p_notification_count,
-    platform: common.platform,
     routeBackInApp: common.routeBackInApp,
     setAccountSwitchListener: modules.cashier.general_store.setAccountSwitchListener,
     setTabIndex: modules.cashier.general_store.setCashierTabIndex,
diff --git a/packages/trader/src/Modules/Reports/Containers/reports.jsx b/packages/trader/src/Modules/Reports/Containers/reports.jsx
index 6acce038b0c7..383103fc35c7 100644
--- a/packages/trader/src/Modules/Reports/Containers/reports.jsx
+++ b/packages/trader/src/Modules/Reports/Containers/reports.jsx
@@ -11,7 +11,7 @@ import {
     SelectNative,
     Loading,
 } from '@deriv/components';
-import { getSelectedRoute, platforms } from '@deriv/shared';
+import { getSelectedRoute } from '@deriv/shared';
 import { localize } from '@deriv/translations';
 import { connect } from 'Stores/connect';
 import 'Sass/app/modules/reports.scss';
@@ -20,9 +20,9 @@ const Reports = ({
     history,
     is_logged_in,
     is_logging_in,
+    is_navigated_from_deriv_go,
     is_visible,
     location,
-    platform,
     routeBackInApp,
     routes,
     setTabIndex,
@@ -71,7 +71,7 @@ const Reports = ({
                 <PageOverlay
                     header={localize('Reports')}
                     onClickClose={onClickClose}
-                    is_from_app={!!platforms[platform]}
+                    is_from_app={is_navigated_from_deriv_go}
                 >
                     <DesktopWrapper>
                         <VerticalTab
@@ -114,9 +114,9 @@ Reports.propTypes = {
     history: PropTypes.object,
     is_logged_in: PropTypes.bool,
     is_logging_in: PropTypes.bool,
+    is_navigated_from_deriv_go: PropTypes.bool,
     is_visible: PropTypes.bool,
     location: PropTypes.object,
-    platform: PropTypes.string,
     routeBackInApp: PropTypes.func,
     routes: PropTypes.arrayOf(PropTypes.object),
     setTabIndex: PropTypes.func,
@@ -128,8 +128,8 @@ Reports.propTypes = {
 export default connect(({ client, common, ui }) => ({
     is_logged_in: client.is_logged_in,
     is_logging_in: client.is_logging_in,
+    is_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
     is_visible: ui.is_reports_visible,
-    platform: common.platform,
     routeBackInApp: common.routeBackInApp,
     setVisibilityRealityCheck: client.setVisibilityRealityCheck,
     setTabIndex: ui.setReportsTabIndex,

From 133d6290e6e3a996cbc16c1656e66376cfc991f3 Mon Sep 17 00:00:00 2001
From: Bahar <bahar@firstsource.tech>
Date: Wed, 2 Mar 2022 13:52:00 +0330
Subject: [PATCH 5/7] refactor

---
 .../account-limits/account-limits-article.jsx     | 14 +++++++-------
 .../Components/account-limits/account-limits.jsx  |  8 +++-----
 packages/account/src/Containers/account.jsx       | 14 +++++---------
 .../Security/AccountLimits/account-limits.jsx     |  2 +-
 .../Components/CashierDefault/cashier-default.jsx |  8 ++++----
 .../Receipt/account-transfer-receipt.jsx          |  8 ++++----
 .../Components/Receipt/payment-agent-receipt.jsx  | 15 ++++-----------
 .../Receipt/payment-agent-transfer-receipt.jsx    |  8 ++++----
 packages/cashier/src/Containers/cashier.jsx       | 12 ++++--------
 packages/core/src/Stores/common-store.js          |  2 +-
 .../src/Modules/Reports/Containers/reports.jsx    | 12 ++++--------
 11 files changed, 41 insertions(+), 62 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 274b5e60e383..ca5aa9d7899b 100644
--- a/packages/account/src/Components/account-limits/account-limits-article.jsx
+++ b/packages/account/src/Components/account-limits/account-limits-article.jsx
@@ -4,13 +4,13 @@ import { StaticUrl } from '@deriv/components';
 import { Localize, localize } from '@deriv/translations';
 import AccountArticle from 'Components/article/article.jsx';
 
-const AccountLimitsArticle = ({ is_navigated_from_deriv_go }) => {
+const AccountLimitsArticle = ({ if_from_derivgo }) => {
     const getDescription = () => {
-        const description = [];
-        description.push(
-            <Localize key={0} i18n_default_text='These are default limits that we apply to your accounts.' />
-        );
-        if (!is_navigated_from_deriv_go) {
+        const description = [
+            <Localize key={0} i18n_default_text='These are default limits that we apply to your accounts.' />,
+        ];
+
+        if (!if_from_derivgo) {
             description.push(
                 <Localize
                     key={1}
@@ -26,7 +26,7 @@ const AccountLimitsArticle = ({ is_navigated_from_deriv_go }) => {
 };
 
 AccountLimitsArticle.propTypes = {
-    is_navigated_from_deriv_go: PropTypes.bool,
+    if_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 79aa28a7dc31..6ba2ed2710bf 100644
--- a/packages/account/src/Components/account-limits/account-limits.jsx
+++ b/packages/account/src/Components/account-limits/account-limits.jsx
@@ -25,7 +25,7 @@ const AccountLimits = ({
     is_switching,
     is_virtual,
     overlay_ref,
-    is_navigated_from_deriv_go,
+    if_from_derivgo,
     setIsOverlayShown: setIsPopupOverlayShown,
     should_bypass_scrollbars,
     should_show_article,
@@ -117,9 +117,7 @@ const AccountLimits = ({
                         'da-account-limits--app-settings': is_app_settings,
                     })}
                 >
-                    {should_show_article && isMobile() && (
-                        <AccountLimitsArticle is_navigated_from_deriv_go={is_navigated_from_deriv_go} />
-                    )}
+                    {should_show_article && isMobile() && <AccountLimitsArticle if_from_derivgo={if_from_derivgo} />}
                     <div className='da-account-limits__table-wrapper'>
                         <ThemedScrollbars is_bypassed={should_bypass_scrollbars || isMobile()}>
                             <table className='da-account-limits__table'>
@@ -346,7 +344,7 @@ AccountLimits.propTypes = {
     is_app_settings: PropTypes.bool,
     getLimits: PropTypes.func.isRequired,
     is_fully_authenticated: PropTypes.bool.isRequired,
-    is_navigated_from_deriv_go: PropTypes.bool,
+    if_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 686490658191..762cf1e33374 100644
--- a/packages/account/src/Containers/account.jsx
+++ b/packages/account/src/Containers/account.jsx
@@ -29,7 +29,7 @@ const AccountLogout = ({ logout, history }) => {
 
 const PageOverlayWrapper = ({
     is_dashboard,
-    is_navigated_from_deriv_go,
+    if_from_derivgo,
     list_groups,
     logout,
     onClickClose,
@@ -38,11 +38,7 @@ const PageOverlayWrapper = ({
 }) => {
     if (isMobile() && selected_route) {
         return (
-            <PageOverlay
-                header={selected_route.getTitle()}
-                onClickClose={onClickClose}
-                is_from_app={is_navigated_from_deriv_go}
-            >
+            <PageOverlay header={selected_route.getTitle()} onClickClose={onClickClose} is_from_app={if_from_derivgo}>
                 <selected_route.component component_icon={selected_route.icon_component} />
             </PageOverlay>
         );
@@ -68,7 +64,7 @@ const PageOverlayWrapper = ({
     }
 
     return (
-        <PageOverlay header={localize('Settings')} onClickClose={onClickClose} is_from_app={is_navigated_from_deriv_go}>
+        <PageOverlay header={localize('Settings')} onClickClose={onClickClose} is_from_app={if_from_derivgo}>
             <VerticalTab
                 alignment='center'
                 is_floating
@@ -178,7 +174,7 @@ Account.propTypes = {
     history: PropTypes.object,
     is_logged_in: PropTypes.bool,
     is_logging_in: PropTypes.bool,
-    is_navigated_from_deriv_go: PropTypes.bool,
+    if_from_derivgo: PropTypes.bool,
     is_virtual: PropTypes.bool,
     is_visible: PropTypes.bool,
     location: PropTypes.object,
@@ -192,7 +188,7 @@ export default connect(({ client, common, ui }) => ({
     currency: client.currency,
     is_logged_in: client.is_logged_in,
     is_logging_in: client.is_logging_in,
-    is_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
+    if_from_derivgo: common.if_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 43ea140a11ea..0e55b9ffbf70 100644
--- a/packages/account/src/Sections/Security/AccountLimits/account-limits.jsx
+++ b/packages/account/src/Sections/Security/AccountLimits/account-limits.jsx
@@ -6,7 +6,7 @@ export default connect(({ client, common, ui }) => ({
     currency: client.currency,
     getLimits: client.getLimits,
     is_fully_authenticated: client.is_fully_authenticated,
-    is_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
+    if_from_derivgo: common.if_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 2e4c4fa57718..53412fc72e53 100644
--- a/packages/cashier/src/Components/CashierDefault/cashier-default.jsx
+++ b/packages/cashier/src/Components/CashierDefault/cashier-default.jsx
@@ -17,7 +17,7 @@ const CashierDefault = ({
     is_dark_mode_on,
     is_landing_company_loaded,
     is_mobile,
-    is_navigated_from_deriv_go,
+    if_from_derivgo,
     is_payment_agent_visible_in_onboarding,
     is_switching,
     onMountCashierDefault,
@@ -155,7 +155,7 @@ const CashierDefault = ({
                         <Localize i18n_default_text='Please note that some payment methods might not be available in your country.' />
                     </Text>
                 </div>
-                {is_mobile && !is_navigated_from_deriv_go && (
+                {is_mobile && !if_from_derivgo && (
                     <div
                         className='cashier-default-header-learn-more'
                         onClick={() => window.open(getStaticUrl('/payment-methods'))}
@@ -193,7 +193,7 @@ CashierDefault.propTypes = {
     is_dark_mode_on: PropTypes.bool,
     is_landing_company_loaded: PropTypes.bool,
     is_mobile: PropTypes.bool,
-    is_navigated_from_deriv_go: PropTypes.bool,
+    if_from_derivgo: PropTypes.bool,
     is_payment_agent_visible_in_onboarding: PropTypes.bool,
     is_switching: PropTypes.bool,
     onMountCashierDefault: PropTypes.func,
@@ -218,7 +218,7 @@ export default connect(({ client, common, 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_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
+    if_from_derivgo: common.if_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 37437bdf2ddf..26b74bf060b3 100644
--- a/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx
+++ b/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx
@@ -11,7 +11,7 @@ const AccountTransferReceipt = ({
     disableApp,
     enableApp,
     history,
-    is_navigated_from_deriv_go,
+    if_from_derivgo,
     loginid,
     receipt,
     resetAccountTransfer,
@@ -107,7 +107,7 @@ const AccountTransferReceipt = ({
                 </div>
             </div>
             <div className='account-transfer-receipt__crypto--form-submit'>
-                {!is_navigated_from_deriv_go && (
+                {!if_from_derivgo && (
                     <Button
                         className='account-transfer-receipt__button'
                         has_effect
@@ -160,7 +160,7 @@ const AccountTransferReceipt = ({
 AccountTransferReceipt.propTypes = {
     disableApp: PropTypes.func,
     enableApp: PropTypes.func,
-    is_navigated_from_deriv_go: PropTypes.bool,
+    if_from_derivgo: PropTypes.bool,
     loginid: PropTypes.string,
     receipt: PropTypes.object,
     resetAccountTransfer: PropTypes.func,
@@ -173,7 +173,7 @@ export default withRouter(
     connect(({ client, common, modules, ui }) => ({
         disableApp: ui.disableApp,
         enableApp: ui.enableApp,
-        is_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
+        if_from_derivgo: common.if_from_derivgo,
         loginid: client.loginid,
         receipt: modules.cashier.account_transfer.receipt,
         resetAccountTransfer: modules.cashier.account_transfer.resetAccountTransfer,
diff --git a/packages/cashier/src/Components/Receipt/payment-agent-receipt.jsx b/packages/cashier/src/Components/Receipt/payment-agent-receipt.jsx
index 856d86054120..efa37ff9298c 100644
--- a/packages/cashier/src/Components/Receipt/payment-agent-receipt.jsx
+++ b/packages/cashier/src/Components/Receipt/payment-agent-receipt.jsx
@@ -13,14 +13,7 @@ const openStatement = (history, resetPaymentAgent) => {
     resetPaymentAgent();
 };
 
-const PaymentAgentReceipt = ({
-    currency,
-    history,
-    is_navigated_from_deriv_go,
-    loginid,
-    receipt,
-    resetPaymentAgent,
-}) => {
+const PaymentAgentReceipt = ({ currency, history, if_from_derivgo, loginid, receipt, resetPaymentAgent }) => {
     React.useEffect(() => {
         return () => resetPaymentAgent();
     }, [resetPaymentAgent]);
@@ -114,7 +107,7 @@ const PaymentAgentReceipt = ({
                 </div>
             )}
             <div className='cashier__form-submit'>
-                {!is_navigated_from_deriv_go && (
+                {!if_from_derivgo && (
                     <Button
                         className='cashier__form-submit-button'
                         has_effect
@@ -140,7 +133,7 @@ const PaymentAgentReceipt = ({
 PaymentAgentReceipt.propTypes = {
     currency: PropTypes.string,
     history: PropTypes.object,
-    is_navigated_from_deriv_go: PropTypes.bool,
+    if_from_derivgo: PropTypes.bool,
     loginid: PropTypes.string,
     receipt: PropTypes.object,
     resetPaymentAgent: PropTypes.func,
@@ -149,7 +142,7 @@ PaymentAgentReceipt.propTypes = {
 export default withRouter(
     connect(({ client, common, modules }) => ({
         currency: client.currency,
-        is_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
+        if_from_derivgo: common.if_from_derivgo,
         loginid: client.loginid,
         receipt: modules.cashier.payment_agent.receipt,
         resetPaymentAgent: modules.cashier.payment_agent.resetPaymentAgent,
diff --git a/packages/cashier/src/Components/Receipt/payment-agent-transfer-receipt.jsx b/packages/cashier/src/Components/Receipt/payment-agent-transfer-receipt.jsx
index 060e47042d53..1354bbae18ad 100644
--- a/packages/cashier/src/Components/Receipt/payment-agent-transfer-receipt.jsx
+++ b/packages/cashier/src/Components/Receipt/payment-agent-transfer-receipt.jsx
@@ -15,7 +15,7 @@ const openStatement = (history, resetPaymentAgentTransfer) => {
 const PaymentAgentTransferReceipt = ({
     currency,
     history,
-    is_navigated_from_deriv_go,
+    if_from_derivgo,
     loginid,
     receipt,
     resetPaymentAgentTransfer,
@@ -63,7 +63,7 @@ const PaymentAgentTransferReceipt = ({
             </div>
         </div>
         <div className='cashier__form-submit'>
-            {!is_navigated_from_deriv_go && (
+            {!if_from_derivgo && (
                 <Button
                     className='cashier__form-submit-button'
                     has_effect
@@ -88,7 +88,7 @@ const PaymentAgentTransferReceipt = ({
 PaymentAgentTransferReceipt.propTypes = {
     currency: PropTypes.string,
     history: PropTypes.object,
-    is_navigated_from_deriv_go: PropTypes.bool,
+    if_from_derivgo: PropTypes.bool,
     loginid: PropTypes.string,
     receipt: PropTypes.object,
     resetPaymentAgentTransfer: PropTypes.func,
@@ -97,7 +97,7 @@ PaymentAgentTransferReceipt.propTypes = {
 export default withRouter(
     connect(({ client, common, modules }) => ({
         currency: client.currency,
-        is_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
+        if_from_derivgo: common.if_from_derivgo,
         loginid: client.loginid,
         receipt: modules.cashier.payment_agent_transfer.receipt,
         resetPaymentAgentTransfer: modules.cashier.payment_agent_transfer.resetPaymentAgentTransfer,
diff --git a/packages/cashier/src/Containers/cashier.jsx b/packages/cashier/src/Containers/cashier.jsx
index fecda6efbdf2..6832fd6511e6 100644
--- a/packages/cashier/src/Containers/cashier.jsx
+++ b/packages/cashier/src/Containers/cashier.jsx
@@ -28,7 +28,7 @@ const Cashier = ({
     is_loading,
     is_logged_in,
     is_logging_in,
-    is_navigated_from_deriv_go,
+    if_from_derivgo,
     is_onramp_tab_visible,
     is_p2p_enabled,
     is_payment_agent_transfer_visible,
@@ -117,11 +117,7 @@ const Cashier = ({
             <AccountPromptDialog />
             <ErrorDialog />
             <div className='cashier'>
-                <PageOverlay
-                    header={getHeaderTitle()}
-                    onClickClose={onClickClose}
-                    is_from_app={is_navigated_from_deriv_go}
-                >
+                <PageOverlay header={getHeaderTitle()} onClickClose={onClickClose} is_from_app={if_from_derivgo}>
                     <DesktopWrapper>
                         <VerticalTab
                             alignment='center'
@@ -191,7 +187,7 @@ Cashier.propTypes = {
     is_loading: PropTypes.bool,
     is_logged_in: PropTypes.bool,
     is_logging_in: PropTypes.bool,
-    is_navigated_from_deriv_go: PropTypes.bool,
+    if_from_derivgo: PropTypes.bool,
     is_onramp_tab_visible: PropTypes.bool,
     is_p2p_enabled: PropTypes.bool,
     is_payment_agent_transfer_visible: PropTypes.bool,
@@ -218,7 +214,7 @@ export default connect(({ client, common, modules, ui }) => ({
     is_loading: modules.cashier.general_store.is_loading,
     is_logged_in: client.is_logged_in,
     is_logging_in: client.is_logging_in,
-    is_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
+    if_from_derivgo: common.if_from_derivgo,
     is_onramp_tab_visible: modules.cashier.onramp.is_onramp_tab_visible,
     is_p2p_enabled: modules.cashier.general_store.is_p2p_enabled,
     is_payment_agent_transfer_visible: modules.cashier.payment_agent_transfer.is_payment_agent_transfer_visible,
diff --git a/packages/core/src/Stores/common-store.js b/packages/core/src/Stores/common-store.js
index 85a264b2b6a2..2bf6320bcbb3 100644
--- a/packages/core/src/Stores/common-store.js
+++ b/packages/core/src/Stores/common-store.js
@@ -72,7 +72,7 @@ export default class CommonStore extends BaseStore {
     }
 
     @computed
-    get is_navigated_from_deriv_go() {
+    get if_from_derivgo() {
         return platforms[this.platform]?.platform_name === platforms.derivgo.platform_name;
     }
 
diff --git a/packages/trader/src/Modules/Reports/Containers/reports.jsx b/packages/trader/src/Modules/Reports/Containers/reports.jsx
index 383103fc35c7..2d3fbc2fcd5f 100644
--- a/packages/trader/src/Modules/Reports/Containers/reports.jsx
+++ b/packages/trader/src/Modules/Reports/Containers/reports.jsx
@@ -20,7 +20,7 @@ const Reports = ({
     history,
     is_logged_in,
     is_logging_in,
-    is_navigated_from_deriv_go,
+    if_from_derivgo,
     is_visible,
     location,
     routeBackInApp,
@@ -68,11 +68,7 @@ const Reports = ({
     return (
         <FadeWrapper is_visible={is_visible} className='reports-page-wrapper' keyname='reports-page-wrapper'>
             <div className='reports'>
-                <PageOverlay
-                    header={localize('Reports')}
-                    onClickClose={onClickClose}
-                    is_from_app={is_navigated_from_deriv_go}
-                >
+                <PageOverlay header={localize('Reports')} onClickClose={onClickClose} is_from_app={if_from_derivgo}>
                     <DesktopWrapper>
                         <VerticalTab
                             alignment='center'
@@ -114,7 +110,7 @@ Reports.propTypes = {
     history: PropTypes.object,
     is_logged_in: PropTypes.bool,
     is_logging_in: PropTypes.bool,
-    is_navigated_from_deriv_go: PropTypes.bool,
+    if_from_derivgo: PropTypes.bool,
     is_visible: PropTypes.bool,
     location: PropTypes.object,
     routeBackInApp: PropTypes.func,
@@ -128,7 +124,7 @@ Reports.propTypes = {
 export default connect(({ client, common, ui }) => ({
     is_logged_in: client.is_logged_in,
     is_logging_in: client.is_logging_in,
-    is_navigated_from_deriv_go: common.is_navigated_from_deriv_go,
+    if_from_derivgo: common.if_from_derivgo,
     is_visible: ui.is_reports_visible,
     routeBackInApp: common.routeBackInApp,
     setVisibilityRealityCheck: client.setVisibilityRealityCheck,

From 2ad42af34cd5d6f3b143cc95e128937d7d7b32f2 Mon Sep 17 00:00:00 2001
From: yashim-deriv <yashim@deriv.com>
Date: Thu, 3 Mar 2022 10:35:51 +0800
Subject: [PATCH 6/7] chore: renamed variables

---
 .../account-limits/account-limits-article.jsx          |  6 +++---
 .../src/Components/account-limits/account-limits.jsx   |  6 +++---
 packages/account/src/Containers/account.jsx            | 10 +++++-----
 .../Sections/Security/AccountLimits/account-limits.jsx |  2 +-
 .../src/Components/CashierDefault/cashier-default.jsx  |  8 ++++----
 .../Components/Receipt/account-transfer-receipt.jsx    |  8 ++++----
 .../src/Components/Receipt/payment-agent-receipt.jsx   |  8 ++++----
 .../Receipt/payment-agent-transfer-receipt.jsx         |  8 ++++----
 packages/cashier/src/Containers/cashier.jsx            |  8 ++++----
 packages/core/src/Stores/common-store.js               |  2 +-
 .../trader/src/Modules/Reports/Containers/reports.jsx  |  8 ++++----
 11 files changed, 37 insertions(+), 37 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 ca5aa9d7899b..95240515d720 100644
--- a/packages/account/src/Components/account-limits/account-limits-article.jsx
+++ b/packages/account/src/Components/account-limits/account-limits-article.jsx
@@ -4,13 +4,13 @@ import { StaticUrl } from '@deriv/components';
 import { Localize, localize } from '@deriv/translations';
 import AccountArticle from 'Components/article/article.jsx';
 
-const AccountLimitsArticle = ({ if_from_derivgo }) => {
+const AccountLimitsArticle = ({ is_from_derivgo }) => {
     const getDescription = () => {
         const description = [
             <Localize key={0} i18n_default_text='These are default limits that we apply to your accounts.' />,
         ];
 
-        if (!if_from_derivgo) {
+        if (!is_from_derivgo) {
             description.push(
                 <Localize
                     key={1}
@@ -26,7 +26,7 @@ const AccountLimitsArticle = ({ if_from_derivgo }) => {
 };
 
 AccountLimitsArticle.propTypes = {
-    if_from_derivgo: PropTypes.bool,
+    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 6ba2ed2710bf..63297323d7e4 100644
--- a/packages/account/src/Components/account-limits/account-limits.jsx
+++ b/packages/account/src/Components/account-limits/account-limits.jsx
@@ -25,7 +25,7 @@ const AccountLimits = ({
     is_switching,
     is_virtual,
     overlay_ref,
-    if_from_derivgo,
+    is_from_derivgo,
     setIsOverlayShown: setIsPopupOverlayShown,
     should_bypass_scrollbars,
     should_show_article,
@@ -117,7 +117,7 @@ const AccountLimits = ({
                         'da-account-limits--app-settings': is_app_settings,
                     })}
                 >
-                    {should_show_article && isMobile() && <AccountLimitsArticle if_from_derivgo={if_from_derivgo} />}
+                    {should_show_article && isMobile() && <AccountLimitsArticle is_from_derivgo={is_from_derivgo} />}
                     <div className='da-account-limits__table-wrapper'>
                         <ThemedScrollbars is_bypassed={should_bypass_scrollbars || isMobile()}>
                             <table className='da-account-limits__table'>
@@ -344,7 +344,7 @@ AccountLimits.propTypes = {
     is_app_settings: PropTypes.bool,
     getLimits: PropTypes.func.isRequired,
     is_fully_authenticated: PropTypes.bool.isRequired,
-    if_from_derivgo: PropTypes.bool,
+    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 762cf1e33374..1bd906bacbff 100644
--- a/packages/account/src/Containers/account.jsx
+++ b/packages/account/src/Containers/account.jsx
@@ -29,7 +29,7 @@ const AccountLogout = ({ logout, history }) => {
 
 const PageOverlayWrapper = ({
     is_dashboard,
-    if_from_derivgo,
+    is_from_derivgo,
     list_groups,
     logout,
     onClickClose,
@@ -38,7 +38,7 @@ const PageOverlayWrapper = ({
 }) => {
     if (isMobile() && selected_route) {
         return (
-            <PageOverlay header={selected_route.getTitle()} onClickClose={onClickClose} is_from_app={if_from_derivgo}>
+            <PageOverlay header={selected_route.getTitle()} onClickClose={onClickClose} is_from_app={is_from_derivgo}>
                 <selected_route.component component_icon={selected_route.icon_component} />
             </PageOverlay>
         );
@@ -64,7 +64,7 @@ const PageOverlayWrapper = ({
     }
 
     return (
-        <PageOverlay header={localize('Settings')} onClickClose={onClickClose} is_from_app={if_from_derivgo}>
+        <PageOverlay header={localize('Settings')} onClickClose={onClickClose} is_from_app={is_from_derivgo}>
             <VerticalTab
                 alignment='center'
                 is_floating
@@ -174,7 +174,7 @@ Account.propTypes = {
     history: PropTypes.object,
     is_logged_in: PropTypes.bool,
     is_logging_in: PropTypes.bool,
-    if_from_derivgo: PropTypes.bool,
+    is_from_derivgo: PropTypes.bool,
     is_virtual: PropTypes.bool,
     is_visible: PropTypes.bool,
     location: PropTypes.object,
@@ -188,7 +188,7 @@ export default connect(({ client, common, ui }) => ({
     currency: client.currency,
     is_logged_in: client.is_logged_in,
     is_logging_in: client.is_logging_in,
-    if_from_derivgo: common.if_from_derivgo,
+    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 0e55b9ffbf70..f62e6119338b 100644
--- a/packages/account/src/Sections/Security/AccountLimits/account-limits.jsx
+++ b/packages/account/src/Sections/Security/AccountLimits/account-limits.jsx
@@ -6,7 +6,7 @@ export default connect(({ client, common, ui }) => ({
     currency: client.currency,
     getLimits: client.getLimits,
     is_fully_authenticated: client.is_fully_authenticated,
-    if_from_derivgo: common.if_from_derivgo,
+    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 53412fc72e53..a308e37c844b 100644
--- a/packages/cashier/src/Components/CashierDefault/cashier-default.jsx
+++ b/packages/cashier/src/Components/CashierDefault/cashier-default.jsx
@@ -17,7 +17,7 @@ const CashierDefault = ({
     is_dark_mode_on,
     is_landing_company_loaded,
     is_mobile,
-    if_from_derivgo,
+    is_from_derivgo,
     is_payment_agent_visible_in_onboarding,
     is_switching,
     onMountCashierDefault,
@@ -155,7 +155,7 @@ const CashierDefault = ({
                         <Localize i18n_default_text='Please note that some payment methods might not be available in your country.' />
                     </Text>
                 </div>
-                {is_mobile && !if_from_derivgo && (
+                {is_mobile && !is_from_derivgo && (
                     <div
                         className='cashier-default-header-learn-more'
                         onClick={() => window.open(getStaticUrl('/payment-methods'))}
@@ -193,7 +193,7 @@ CashierDefault.propTypes = {
     is_dark_mode_on: PropTypes.bool,
     is_landing_company_loaded: PropTypes.bool,
     is_mobile: PropTypes.bool,
-    if_from_derivgo: PropTypes.bool,
+    is_from_derivgo: PropTypes.bool,
     is_payment_agent_visible_in_onboarding: PropTypes.bool,
     is_switching: PropTypes.bool,
     onMountCashierDefault: PropTypes.func,
@@ -218,7 +218,7 @@ export default connect(({ client, common, 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,
-    if_from_derivgo: common.if_from_derivgo,
+    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 26b74bf060b3..c965eb90ef67 100644
--- a/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx
+++ b/packages/cashier/src/Components/Receipt/account-transfer-receipt.jsx
@@ -11,7 +11,7 @@ const AccountTransferReceipt = ({
     disableApp,
     enableApp,
     history,
-    if_from_derivgo,
+    is_from_derivgo,
     loginid,
     receipt,
     resetAccountTransfer,
@@ -107,7 +107,7 @@ const AccountTransferReceipt = ({
                 </div>
             </div>
             <div className='account-transfer-receipt__crypto--form-submit'>
-                {!if_from_derivgo && (
+                {!is_from_derivgo && (
                     <Button
                         className='account-transfer-receipt__button'
                         has_effect
@@ -160,7 +160,7 @@ const AccountTransferReceipt = ({
 AccountTransferReceipt.propTypes = {
     disableApp: PropTypes.func,
     enableApp: PropTypes.func,
-    if_from_derivgo: PropTypes.bool,
+    is_from_derivgo: PropTypes.bool,
     loginid: PropTypes.string,
     receipt: PropTypes.object,
     resetAccountTransfer: PropTypes.func,
@@ -173,7 +173,7 @@ export default withRouter(
     connect(({ client, common, modules, ui }) => ({
         disableApp: ui.disableApp,
         enableApp: ui.enableApp,
-        if_from_derivgo: common.if_from_derivgo,
+        is_from_derivgo: common.is_from_derivgo,
         loginid: client.loginid,
         receipt: modules.cashier.account_transfer.receipt,
         resetAccountTransfer: modules.cashier.account_transfer.resetAccountTransfer,
diff --git a/packages/cashier/src/Components/Receipt/payment-agent-receipt.jsx b/packages/cashier/src/Components/Receipt/payment-agent-receipt.jsx
index efa37ff9298c..b7099f816dd4 100644
--- a/packages/cashier/src/Components/Receipt/payment-agent-receipt.jsx
+++ b/packages/cashier/src/Components/Receipt/payment-agent-receipt.jsx
@@ -13,7 +13,7 @@ const openStatement = (history, resetPaymentAgent) => {
     resetPaymentAgent();
 };
 
-const PaymentAgentReceipt = ({ currency, history, if_from_derivgo, loginid, receipt, resetPaymentAgent }) => {
+const PaymentAgentReceipt = ({ currency, history, is_from_derivgo, loginid, receipt, resetPaymentAgent }) => {
     React.useEffect(() => {
         return () => resetPaymentAgent();
     }, [resetPaymentAgent]);
@@ -107,7 +107,7 @@ const PaymentAgentReceipt = ({ currency, history, if_from_derivgo, loginid, rece
                 </div>
             )}
             <div className='cashier__form-submit'>
-                {!if_from_derivgo && (
+                {!is_from_derivgo && (
                     <Button
                         className='cashier__form-submit-button'
                         has_effect
@@ -133,7 +133,7 @@ const PaymentAgentReceipt = ({ currency, history, if_from_derivgo, loginid, rece
 PaymentAgentReceipt.propTypes = {
     currency: PropTypes.string,
     history: PropTypes.object,
-    if_from_derivgo: PropTypes.bool,
+    is_from_derivgo: PropTypes.bool,
     loginid: PropTypes.string,
     receipt: PropTypes.object,
     resetPaymentAgent: PropTypes.func,
@@ -142,7 +142,7 @@ PaymentAgentReceipt.propTypes = {
 export default withRouter(
     connect(({ client, common, modules }) => ({
         currency: client.currency,
-        if_from_derivgo: common.if_from_derivgo,
+        is_from_derivgo: common.is_from_derivgo,
         loginid: client.loginid,
         receipt: modules.cashier.payment_agent.receipt,
         resetPaymentAgent: modules.cashier.payment_agent.resetPaymentAgent,
diff --git a/packages/cashier/src/Components/Receipt/payment-agent-transfer-receipt.jsx b/packages/cashier/src/Components/Receipt/payment-agent-transfer-receipt.jsx
index 1354bbae18ad..6237ac9eee3b 100644
--- a/packages/cashier/src/Components/Receipt/payment-agent-transfer-receipt.jsx
+++ b/packages/cashier/src/Components/Receipt/payment-agent-transfer-receipt.jsx
@@ -15,7 +15,7 @@ const openStatement = (history, resetPaymentAgentTransfer) => {
 const PaymentAgentTransferReceipt = ({
     currency,
     history,
-    if_from_derivgo,
+    is_from_derivgo,
     loginid,
     receipt,
     resetPaymentAgentTransfer,
@@ -63,7 +63,7 @@ const PaymentAgentTransferReceipt = ({
             </div>
         </div>
         <div className='cashier__form-submit'>
-            {!if_from_derivgo && (
+            {!is_from_derivgo && (
                 <Button
                     className='cashier__form-submit-button'
                     has_effect
@@ -88,7 +88,7 @@ const PaymentAgentTransferReceipt = ({
 PaymentAgentTransferReceipt.propTypes = {
     currency: PropTypes.string,
     history: PropTypes.object,
-    if_from_derivgo: PropTypes.bool,
+    is_from_derivgo: PropTypes.bool,
     loginid: PropTypes.string,
     receipt: PropTypes.object,
     resetPaymentAgentTransfer: PropTypes.func,
@@ -97,7 +97,7 @@ PaymentAgentTransferReceipt.propTypes = {
 export default withRouter(
     connect(({ client, common, modules }) => ({
         currency: client.currency,
-        if_from_derivgo: common.if_from_derivgo,
+        is_from_derivgo: common.is_from_derivgo,
         loginid: client.loginid,
         receipt: modules.cashier.payment_agent_transfer.receipt,
         resetPaymentAgentTransfer: modules.cashier.payment_agent_transfer.resetPaymentAgentTransfer,
diff --git a/packages/cashier/src/Containers/cashier.jsx b/packages/cashier/src/Containers/cashier.jsx
index 6832fd6511e6..ffaefa4e36cb 100644
--- a/packages/cashier/src/Containers/cashier.jsx
+++ b/packages/cashier/src/Containers/cashier.jsx
@@ -28,7 +28,7 @@ const Cashier = ({
     is_loading,
     is_logged_in,
     is_logging_in,
-    if_from_derivgo,
+    is_from_derivgo,
     is_onramp_tab_visible,
     is_p2p_enabled,
     is_payment_agent_transfer_visible,
@@ -117,7 +117,7 @@ const Cashier = ({
             <AccountPromptDialog />
             <ErrorDialog />
             <div className='cashier'>
-                <PageOverlay header={getHeaderTitle()} onClickClose={onClickClose} is_from_app={if_from_derivgo}>
+                <PageOverlay header={getHeaderTitle()} onClickClose={onClickClose} is_from_app={is_from_derivgo}>
                     <DesktopWrapper>
                         <VerticalTab
                             alignment='center'
@@ -187,7 +187,7 @@ Cashier.propTypes = {
     is_loading: PropTypes.bool,
     is_logged_in: PropTypes.bool,
     is_logging_in: PropTypes.bool,
-    if_from_derivgo: PropTypes.bool,
+    is_from_derivgo: PropTypes.bool,
     is_onramp_tab_visible: PropTypes.bool,
     is_p2p_enabled: PropTypes.bool,
     is_payment_agent_transfer_visible: PropTypes.bool,
@@ -214,7 +214,7 @@ export default connect(({ client, common, modules, ui }) => ({
     is_loading: modules.cashier.general_store.is_loading,
     is_logged_in: client.is_logged_in,
     is_logging_in: client.is_logging_in,
-    if_from_derivgo: common.if_from_derivgo,
+    is_from_derivgo: common.is_from_derivgo,
     is_onramp_tab_visible: modules.cashier.onramp.is_onramp_tab_visible,
     is_p2p_enabled: modules.cashier.general_store.is_p2p_enabled,
     is_payment_agent_transfer_visible: modules.cashier.payment_agent_transfer.is_payment_agent_transfer_visible,
diff --git a/packages/core/src/Stores/common-store.js b/packages/core/src/Stores/common-store.js
index 2bf6320bcbb3..cc0baa6263af 100644
--- a/packages/core/src/Stores/common-store.js
+++ b/packages/core/src/Stores/common-store.js
@@ -72,7 +72,7 @@ export default class CommonStore extends BaseStore {
     }
 
     @computed
-    get if_from_derivgo() {
+    get is_from_derivgo() {
         return platforms[this.platform]?.platform_name === platforms.derivgo.platform_name;
     }
 
diff --git a/packages/trader/src/Modules/Reports/Containers/reports.jsx b/packages/trader/src/Modules/Reports/Containers/reports.jsx
index 2d3fbc2fcd5f..33b0e8a509a2 100644
--- a/packages/trader/src/Modules/Reports/Containers/reports.jsx
+++ b/packages/trader/src/Modules/Reports/Containers/reports.jsx
@@ -20,7 +20,7 @@ const Reports = ({
     history,
     is_logged_in,
     is_logging_in,
-    if_from_derivgo,
+    is_from_derivgo,
     is_visible,
     location,
     routeBackInApp,
@@ -68,7 +68,7 @@ const Reports = ({
     return (
         <FadeWrapper is_visible={is_visible} className='reports-page-wrapper' keyname='reports-page-wrapper'>
             <div className='reports'>
-                <PageOverlay header={localize('Reports')} onClickClose={onClickClose} is_from_app={if_from_derivgo}>
+                <PageOverlay header={localize('Reports')} onClickClose={onClickClose} is_from_app={is_from_derivgo}>
                     <DesktopWrapper>
                         <VerticalTab
                             alignment='center'
@@ -110,7 +110,7 @@ Reports.propTypes = {
     history: PropTypes.object,
     is_logged_in: PropTypes.bool,
     is_logging_in: PropTypes.bool,
-    if_from_derivgo: PropTypes.bool,
+    is_from_derivgo: PropTypes.bool,
     is_visible: PropTypes.bool,
     location: PropTypes.object,
     routeBackInApp: PropTypes.func,
@@ -124,7 +124,7 @@ Reports.propTypes = {
 export default connect(({ client, common, ui }) => ({
     is_logged_in: client.is_logged_in,
     is_logging_in: client.is_logging_in,
-    if_from_derivgo: common.if_from_derivgo,
+    is_from_derivgo: common.is_from_derivgo,
     is_visible: ui.is_reports_visible,
     routeBackInApp: common.routeBackInApp,
     setVisibilityRealityCheck: client.setVisibilityRealityCheck,

From 77c8fb79b00fad5f3217e203b9f49eea9a2e013a Mon Sep 17 00:00:00 2001
From: Bahar <bahar@firstsource.tech>
Date: Wed, 6 Apr 2022 10:24:16 +0800
Subject: [PATCH 7/7] fix_issue

---
 packages/account/src/Containers/account.jsx   |  4 ++++
 .../src/Sass/payment-agent-receipt.scss       | 24 ++++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/account/src/Containers/account.jsx b/packages/account/src/Containers/account.jsx
index a4f935afc961..e1b4171956f5 100644
--- a/packages/account/src/Containers/account.jsx
+++ b/packages/account/src/Containers/account.jsx
@@ -82,6 +82,7 @@ const PageOverlayWrapper = ({
 const Account = ({
     currency,
     history,
+    is_from_derivgo,
     is_logged_in,
     is_logging_in,
     is_virtual,
@@ -156,6 +157,7 @@ const Account = ({
         <FadeWrapper is_visible={is_visible} className='account-page-wrapper' keyname='account-page-wrapper'>
             <div className='account'>
                 <PageOverlayWrapper
+                    is_from_derivgo={is_from_derivgo}
                     is_appstore={is_appstore}
                     list_groups={list_groups}
                     logout={logout}
@@ -179,6 +181,7 @@ Account.propTypes = {
     is_visible: PropTypes.bool,
     location: PropTypes.object,
     logout: PropTypes.func,
+    platform: PropTypes.string,
     routes: PropTypes.arrayOf(PropTypes.object),
     should_allow_authentication: PropTypes.bool,
     toggleAccount: PropTypes.func,
@@ -192,6 +195,7 @@ export default connect(({ client, common, ui }) => ({
     is_virtual: client.is_virtual,
     is_visible: ui.is_account_settings_visible,
     logout: client.logout,
+    platform: common.platform,
     routeBackInApp: common.routeBackInApp,
     should_allow_authentication: client.should_allow_authentication,
     toggleAccount: ui.toggleAccountSettings,
diff --git a/packages/cashier/src/Sass/payment-agent-receipt.scss b/packages/cashier/src/Sass/payment-agent-receipt.scss
index 67f67c122500..708147e3e99f 100644
--- a/packages/cashier/src/Sass/payment-agent-receipt.scss
+++ b/packages/cashier/src/Sass/payment-agent-receipt.scss
@@ -7,15 +7,6 @@
             &__done-button {
                 width: 100%;
             }
-            &__form-submit-button {
-                margin: 0;
-            }
-            &__form-submit {
-                margin: 2.4rem 0 3.2rem;
-                display: grid;
-                grid-template-columns: 1fr 1fr;
-                grid-gap: 0.8rem;
-            }
             &__transferred-amount {
                 margin-top: 1.6rem;
                 margin-bottom: 0;
@@ -51,6 +42,21 @@
 
     & .cashier__form-submit {
         text-align: center;
+        justify-content: center;
+        flex-flow: row;
+        margin: 2.4rem 0 3.2rem;
+
+        &-button {
+            margin: 0;
+            max-width: 18rem;
+
+            &:first-child {
+                margin-right: 0.4rem;
+            }
+            &:last-child {
+                margin-left: 0.4rem;
+            }
+        }
     }
     &__transferred-contact {
         margin: 0.8rem 0;