Merge pull request #63 from amina-deriv/84051/language_and_theme_opti…

…ons_should_be_deleted_from_setting_footer_in_Dtrader_page Amina/84051_language and theme options should be deleted from setting footer in dtrader page
jim-deriv · Dec 23, 2022 · a34373d · a34373d
2 parents 36b4ee6 + 8753904
commit a34373d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/packages/core/src/App/Components/Layout/Footer/toggle-settings.jsx b/packages/core/src/App/Components/Layout/Footer/toggle-settings.jsx
@@ -5,7 +5,6 @@ import Loadable from 'react-loadable';
 import { Icon, Modal, Popover, VerticalTab, UILoader } from '@deriv/components';
 import { localize } from '@deriv/translations';
 import 'Sass/app/modules/settings.scss';
-import { PlatformContext } from '@deriv/shared';
 
 const ThemeSetting = Loadable({
     loader: () =>
@@ -23,8 +22,7 @@ const LanguageSettingContainer = Loadable({
     loading: UILoader,
 });
 
-const ModalContent = ({ settings_extension }) => {
-    const { is_pre_appstore } = React.useContext(PlatformContext);
+const ModalContent = ({ settings_extension, is_pre_appstore }) => {
     const content = [];
     if (is_pre_appstore) {
         content.push(...(settings_extension || []));
@@ -47,7 +45,14 @@ const ModalContent = ({ settings_extension }) => {
     return <VerticalTab alignment='center' classNameHeader='modal__tab-header' id='modal' list={content} />;
 };
 
-const ToggleSettings = ({ enableApp, is_settings_visible, disableApp, toggleSettings, settings_extension }) => {
+const ToggleSettings = ({
+    enableApp,
+    is_settings_visible,
+    disableApp,
+    toggleSettings,
+    settings_extension,
+    is_pre_appstore,
+}) => {
     const toggle_settings_class = classNames('ic-settings', 'footer__link', {
         'ic-settings--active': is_settings_visible,
     });
@@ -74,7 +79,7 @@ const ToggleSettings = ({ enableApp, is_settings_visible, disableApp, toggleSett
                 height='616px'
                 width='736px'
             >
-                <ModalContent settings_extension={settings_extension} />
+                <ModalContent settings_extension={settings_extension} is_pre_appstore={is_pre_appstore} />
             </Modal>
         </React.Fragment>
     );
@@ -86,6 +91,7 @@ ToggleSettings.propTypes = {
     is_settings_visible: PropTypes.bool,
     settings_extension: PropTypes.array,
     toggleSettings: PropTypes.func,
+    is_pre_appstore: PropTypes.bool,
 };
 
 export { ToggleSettings };
diff --git a/packages/core/src/App/Containers/Layout/default-footer.jsx b/packages/core/src/App/Containers/Layout/default-footer.jsx
@@ -43,6 +43,7 @@ const Footer = ({
     toggleSettingsModal,
     settings_extension,
     landing_company_shortcode,
+    is_pre_appstore,
 }) => {
     let footer_extensions_left = [];
     let footer_extensions_right = [];
@@ -84,6 +85,7 @@ const Footer = ({
                     disableApp={disableApp}
                     enableApp={enableApp}
                     settings_extension={settings_extension}
+                    is_pre_appstore={is_pre_appstore}
                 />
                 <ToggleFullScreen />
             </div>
@@ -105,6 +107,7 @@ Footer.propTypes = {
     disableApp: PropTypes.func,
     enableApp: PropTypes.func,
     footer_extensions: PropTypes.array,
+    is_pre_appstore: PropTypes.bool,
 };
 
 export default withRouter(
@@ -122,5 +125,6 @@ export default withRouter(
         landing_company_shortcode: client.landing_company_shortcode,
         disableApp: ui.disableApp,
         toggleSettingsModal: ui.toggleSettingsModal,
+        is_pre_appstore: client.is_pre_appstore,
     }))(Footer)
 );
diff --git a/packages/core/src/App/Containers/Layout/trading-hub-footer.jsx b/packages/core/src/App/Containers/Layout/trading-hub-footer.jsx
@@ -49,6 +49,7 @@ const TradingHubFooter = ({
     settings_extension,
     setDarkMode,
     is_dark_mode,
+    is_pre_appstore,
 }) => {
     let footer_extensions_left = [];
     let footer_extensions_right = [];
@@ -108,6 +109,7 @@ const TradingHubFooter = ({
                         disableApp={disableApp}
                         enableApp={enableApp}
                         settings_extension={settings_extension}
+                        is_pre_appstore={is_pre_appstore}
                     />
                 )}
                 <ToggleFullScreen />
@@ -132,6 +134,7 @@ TradingHubFooter.propTypes = {
     footer_extensions: PropTypes.array,
     is_dark_mode: PropTypes.bool,
     setDarkMode: PropTypes.func,
+    is_pre_appstore: PropTypes.bool,
 };
 
 export default withRouter(
@@ -151,5 +154,6 @@ export default withRouter(
         toggleSettingsModal: ui.toggleSettingsModal,
         is_dark_mode: ui.is_dark_mode_on,
         setDarkMode: ui.setDarkMode,
+        is_pre_appstore: client.is_pre_appstore,
     }))(TradingHubFooter)
 );