From 582ff90a1a8097e76bfa4bbc4e7108fb5a609947 Mon Sep 17 00:00:00 2001 From: nada-deriv Date: Thu, 11 May 2023 11:32:31 +0400 Subject: [PATCH 1/5] fix: renamed your ads are running to hide my ads --- .../p2p/src/components/my-ads/my-ads.scss | 7 ----- .../p2p/src/components/my-ads/toggle-ads.jsx | 26 ++++++++----------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/packages/p2p/src/components/my-ads/my-ads.scss b/packages/p2p/src/components/my-ads/my-ads.scss index 7e4ff9051afe..2fff5275f249 100644 --- a/packages/p2p/src/components/my-ads/my-ads.scss +++ b/packages/p2p/src/components/my-ads/my-ads.scss @@ -713,18 +713,11 @@ .toggle-ads { display: flex; align-items: center; - font-size: var(--text-size-s); justify-items: flex-start; &__message { margin-right: 1.6rem; } - &--on { - color: var(--text-profit-success); - } - &--off { - color: var(--text-less-prominent); - } } &__expand-button { diff --git a/packages/p2p/src/components/my-ads/toggle-ads.jsx b/packages/p2p/src/components/my-ads/toggle-ads.jsx index 93f44af2c04f..812c266c3c0a 100644 --- a/packages/p2p/src/components/my-ads/toggle-ads.jsx +++ b/packages/p2p/src/components/my-ads/toggle-ads.jsx @@ -1,11 +1,10 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { ToggleSwitch } from '@deriv/components'; +import { Text, ToggleSwitch } from '@deriv/components'; import { useIsMounted } from '@deriv/shared'; -import classNames from 'classnames'; import { observer } from 'mobx-react-lite'; import { requestWS } from 'Utils/websocket'; -import { localize } from 'Components/i18next'; +import { Localize } from '@deriv/translations'; import { useStores } from 'Stores'; import './my-ads.scss'; @@ -33,18 +32,15 @@ const ToggleAds = observer(() => { }; return ( -
-
- {(my_ads_store.api_error || general_store.is_listed) && !general_store.is_barred - ? localize('Your ads are running') - : localize('Your ads are paused')} -
- +
+ + + Date: Wed, 7 Jun 2023 10:49:37 +0400 Subject: [PATCH 2/5] feat: inverted toggle behaviour --- packages/p2p/src/components/my-ads/toggle-ads.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/p2p/src/components/my-ads/toggle-ads.jsx b/packages/p2p/src/components/my-ads/toggle-ads.jsx index 812c266c3c0a..19ae3a7f9df7 100644 --- a/packages/p2p/src/components/my-ads/toggle-ads.jsx +++ b/packages/p2p/src/components/my-ads/toggle-ads.jsx @@ -35,7 +35,7 @@ const ToggleAds = observer(() => {
@@ -43,7 +43,7 @@ const ToggleAds = observer(() => {
From e50f1c59748486e01bef9196900cd643e949e1d5 Mon Sep 17 00:00:00 2001 From: nada-deriv Date: Wed, 7 Jun 2023 11:55:24 +0400 Subject: [PATCH 3/5] fix: review comment --- packages/p2p/src/components/my-ads/toggle-ads.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/p2p/src/components/my-ads/toggle-ads.jsx b/packages/p2p/src/components/my-ads/toggle-ads.jsx index 19ae3a7f9df7..9fcad0555694 100644 --- a/packages/p2p/src/components/my-ads/toggle-ads.jsx +++ b/packages/p2p/src/components/my-ads/toggle-ads.jsx @@ -35,7 +35,7 @@ const ToggleAds = observer(() => {
From c1e68b86eedb7d30d720d7840c31904e90021db8 Mon Sep 17 00:00:00 2001 From: nada-deriv Date: Mon, 12 Jun 2023 11:24:34 +0400 Subject: [PATCH 4/5] fix: changed styles for disabled ads currency --- packages/p2p/src/components/my-ads/my-ads-row-renderer.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/p2p/src/components/my-ads/my-ads-row-renderer.jsx b/packages/p2p/src/components/my-ads/my-ads-row-renderer.jsx index ba2c545bc9c3..4f2b8cb92f89 100644 --- a/packages/p2p/src/components/my-ads/my-ads-row-renderer.jsx +++ b/packages/p2p/src/components/my-ads/my-ads-row-renderer.jsx @@ -51,6 +51,8 @@ const MyAdsRowRenderer = observer(({ row: advert }) => { }); const ad_pause_color = general_store.is_listed && !general_store.is_barred ? 'general' : 'less-prominent'; + const advert_active_color = + general_store.is_listed && !general_store.is_barred ? 'profit-success' : 'less-prominent'; const icon_disabled_color = (!general_store.is_listed || general_store.is_barred || !is_advert_active) && 'disabled'; const is_activate_ad_disabled = floating_rate_store.reached_target_date && enable_action_point; @@ -144,7 +146,7 @@ const MyAdsRowRenderer = observer(({ row: advert }) => { )}
- + {`${formatMoney(account_currency, amount_dealt, true)}`} {account_currency}  {is_buy_advert ? localize('Bought') : localize('Sold')} From d2f46d33f51935b7c2174d7e87bfe48087af3d1a Mon Sep 17 00:00:00 2001 From: nada-deriv Date: Mon, 12 Jun 2023 11:52:53 +0400 Subject: [PATCH 5/5] fix: style fixes --- .../components/my-ads/my-ads-row-renderer.jsx | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/p2p/src/components/my-ads/my-ads-row-renderer.jsx b/packages/p2p/src/components/my-ads/my-ads-row-renderer.jsx index 4f2b8cb92f89..b2f812ffcc22 100644 --- a/packages/p2p/src/components/my-ads/my-ads-row-renderer.jsx +++ b/packages/p2p/src/components/my-ads/my-ads-row-renderer.jsx @@ -50,9 +50,9 @@ const MyAdsRowRenderer = observer(({ row: advert }) => { market_rate: effective_rate, }); - const ad_pause_color = general_store.is_listed && !general_store.is_barred ? 'general' : 'less-prominent'; - const advert_active_color = - general_store.is_listed && !general_store.is_barred ? 'profit-success' : 'less-prominent'; + const is_advert_listed = general_store.is_listed && !general_store.is_barred; + const ad_pause_color = is_advert_listed ? 'general' : 'less-prominent'; + const icon_disabled_color = (!general_store.is_listed || general_store.is_barred || !is_advert_active) && 'disabled'; const is_activate_ad_disabled = floating_rate_store.reached_target_date && enable_action_point; @@ -63,7 +63,7 @@ const MyAdsRowRenderer = observer(({ row: advert }) => { } }; const onClickAdd = () => { - if (general_store.is_listed && !general_store.is_barred) { + if (is_advert_listed) { my_ads_store.showQuickAddModal(advert); } }; @@ -146,7 +146,11 @@ const MyAdsRowRenderer = observer(({ row: advert }) => { )}
- + {`${formatMoney(account_currency, amount_dealt, true)}`} {account_currency}  {is_buy_advert ? localize('Bought') : localize('Sold')} @@ -175,9 +179,7 @@ const MyAdsRowRenderer = observer(({ row: advert }) => { {min_order_amount_display} - {max_order_amount_display} {account_currency}