From b62e08aded20b106fc16b0c83bd5544800193151 Mon Sep 17 00:00:00 2001 From: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com> Date: Wed, 21 Sep 2022 21:41:40 +0800 Subject: [PATCH] Adrienne / Hide block user dropdown when user views their own advertiser page (#6529) * Hide block user dropdown when user views their own advertiser page * Removed dropdown when user views their own ad and also removes disabled dropdown prop functionality --- .../advertiser-page-dropdown-menu.jsx | 9 ++------- .../advertiser-page/advertiser-page.jsx | 16 ++++++++++------ .../advertiser-page/advertiser-page.scss | 9 --------- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/packages/p2p/src/components/advertiser-page/advertiser-page-dropdown-menu.jsx b/packages/p2p/src/components/advertiser-page/advertiser-page-dropdown-menu.jsx index e978b95ca58a..2e2e7b23d5d6 100644 --- a/packages/p2p/src/components/advertiser-page/advertiser-page-dropdown-menu.jsx +++ b/packages/p2p/src/components/advertiser-page/advertiser-page-dropdown-menu.jsx @@ -1,13 +1,12 @@ import React from 'react'; import { observer } from 'mobx-react-lite'; -import PropTypes from 'prop-types'; import { Dropdown, Icon, Text } from '@deriv/components'; import { Localize } from 'Components/i18next'; import { useStores } from 'Stores'; import { useOnClickOutside } from '../../../../components/src/hooks'; import './advertiser-page.scss'; -const AdvertiserPageDropdownMenu = ({ is_my_advert }) => { +const AdvertiserPageDropdownMenu = () => { const dropdown_menu_ref = React.useRef(); const { advertiser_page_store } = useStores(); @@ -35,7 +34,7 @@ const AdvertiserPageDropdownMenu = ({ is_my_advert }) => { onClick={advertiser_page_store.showBlockUserModal} > { }; export default observer(AdvertiserPageDropdownMenu); - -AdvertiserPageDropdownMenu.propTypes = { - is_my_advert: PropTypes.bool, -}; diff --git a/packages/p2p/src/components/advertiser-page/advertiser-page.jsx b/packages/p2p/src/components/advertiser-page/advertiser-page.jsx index 2e9a971ba45d..b12d2dc14832 100644 --- a/packages/p2p/src/components/advertiser-page/advertiser-page.jsx +++ b/packages/p2p/src/components/advertiser-page/advertiser-page.jsx @@ -92,9 +92,11 @@ const AdvertiserPage = () => { onClick={buy_sell_store.hideAdvertiserPage} page_title={localize("Advertiser's page")} /> - - - + {!is_my_advert && ( + + + + )} { /> - - - + {!is_my_advert && ( + + + + )} diff --git a/packages/p2p/src/components/advertiser-page/advertiser-page.scss b/packages/p2p/src/components/advertiser-page/advertiser-page.scss index 7389d0241008..69105d4020b1 100644 --- a/packages/p2p/src/components/advertiser-page/advertiser-page.scss +++ b/packages/p2p/src/components/advertiser-page/advertiser-page.scss @@ -26,14 +26,6 @@ &-container { margin-top: 0; - - &--disabled { - margin-top: 0; - - span { - color: var(--text-disabled) !important; - } - } } &:hover { @@ -64,7 +56,6 @@ } &__page-return-header { - display: flex; position: relative; }