Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: renamed your ads are running to hide my ads #8576

Merged
merged 10 commits into from
Jul 5, 2023
Merged

fix: renamed your ads are running to hide my ads #8576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
582ff90
fix: renamed your ads are running to hide my ads
nada-deriv May 11, 2023
e34e31b
Merge branch 'master' into nada/P2PS-609/ads-are-running-rename
nada-deriv Jun 7, 2023
aee8fc9
feat: inverted toggle behaviour
nada-deriv Jun 7, 2023
e50f1c5
fix: review comment
nada-deriv Jun 7, 2023
bb2e614
Merge branch 'master' into nada/P2PS-609/ads-are-running-rename
nada-deriv Jun 9, 2023
8936cb5
Merge branch 'master' into nada/P2PS-609/ads-are-running-rename
nada-deriv Jun 9, 2023
c1e68b8
fix: changed styles for disabled ads currency
nada-deriv Jun 12, 2023
d2f46d3
fix: style fixes
nada-deriv Jun 12, 2023
5d5d2df
Merge branch 'master' into nada/P2PS-609/ads-are-running-rename
jim-deriv Jul 5, 2023
0d76652
Merge branch 'master' into nada/P2PS-609/ads-are-running-rename
ali-hosseini-deriv Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions packages/p2p/src/components/my-ads/my-ads-row-renderer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +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 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;
Expand All @@ -61,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);
}
};
Expand Down Expand Up @@ -144,7 +146,11 @@ const MyAdsRowRenderer = observer(({ row: advert }) => {
)}
</div>
<div className='p2p-my-ads__table-row-details'>
<Text color='profit-success' line_height='m' size='xxs'>
<Text
color={is_advert_listed ? 'profit-success' : 'less-prominent'}
line_height='m'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: you can remove this line cause the default for line_height is m 👍 same with the others

Suggested change
line_height='m'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. there are other issues as well i found with this file. will do it as part of refactoring.

size='xxs'
>
{`${formatMoney(account_currency, amount_dealt, true)}`} {account_currency}&nbsp;
{is_buy_advert ? localize('Bought') : localize('Sold')}
</Text>
Expand Down Expand Up @@ -173,9 +179,7 @@ const MyAdsRowRenderer = observer(({ row: advert }) => {
{min_order_amount_display} - {max_order_amount_display} {account_currency}
</Text>
<Text
color={
general_store.is_listed && !general_store.is_barred ? 'profit-success' : 'disabled'
}
color={is_advert_listed ? 'profit-success' : 'disabled'}
line_height='m'
size='xs'
weight='bold'
Expand Down
7 changes: 0 additions & 7 deletions packages/p2p/src/components/my-ads/my-ads.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,18 +720,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 {
Expand Down
28 changes: 12 additions & 16 deletions packages/p2p/src/components/my-ads/toggle-ads.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -33,21 +32,18 @@ const ToggleAds = observer(() => {
};

return (
<div
className={classNames('toggle-ads', {
'toggle-ads--on': general_store.is_listed,
'toggle-ads--off': !general_store.is_listed || general_store.is_barred,
})}
>
<div className='toggle-ads__message'>
{(my_ads_store.api_error || general_store.is_listed) && !general_store.is_barred
? localize('Your ads are running')
: localize('Your ads are paused')}
</div>

<div className='toggle-ads'>
<Text
className='toggle-ads__message'
color={general_store.is_listed ? 'less-prominent' : 'profit-success'}
line_height='xl'
size='xs'
>
<Localize i18n_default_text='Hide my ads' />
</Text>
<ToggleSwitch
id='toggle-my-ads'
is_enabled={general_store.is_listed && !general_store.is_barred}
is_enabled={general_store.is_barred || !general_store.is_listed}
handleToggle={handleToggle}
/>
</div>
Expand Down