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

Blocked user count not appearing in my profile #6446

Merged
merged 2 commits into from
Sep 13, 2022
Merged

Blocked user count not appearing in my profile #6446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b88937a
fixed bugs for blocked user count in my profile
ameerul-deriv Sep 12, 2022
186d002
reverted changes from my profile and change my profile name
ameerul-deriv Sep 13, 2022
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-profile/my-profile-stats/my-profile-name/my-profile-name.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import MyProfilePrivacy from '../my-profile-privacy';
import StarRating from 'Components/star-rating';
import RecommendedBy from 'Components/recommended-by';
import BlockUserCount from 'Components/advertiser-page/block-user/block-user-count';
import classNames from 'classnames';

const MyProfileName = () => {
const { general_store, my_profile_store } = useStores();
Expand Down Expand Up @@ -82,11 +83,6 @@ const MyProfileName = () => {
recommended_count={recommended_count}
/>
</div>
<DesktopWrapper>
<div className='my-profile-name--rating__row'>
<BlockUserCount />
</div>
</DesktopWrapper>
</React.Fragment>
) : (
<div className='my-profile-name--rating__row'>
Expand All @@ -96,6 +92,9 @@ const MyProfileName = () => {
</div>
)}
<DesktopWrapper>
<div className='my-profile-name--rating__row'>
<BlockUserCount />
</div>
<Text
className='my-profile-name--rating__row'
color='less-prominent'
Expand All @@ -112,7 +111,12 @@ const MyProfileName = () => {
</Text>
</DesktopWrapper>
<MobileWrapper>
<div className='my-profile-name--row'>
<div
className={classNames('my-profile-name--row', {
'my-profile-name--row--rated': rating_average,
'my-profile-name--row--no-rating': !rating_average,
})}
>
<div className='my-profile-name--rating__row'>
<BlockUserCount />
</div>
Expand Down
13 changes: 11 additions & 2 deletions packages/p2p/src/components/my-profile/my-profile-stats/my-profile-name/my-profile-name.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,17 @@
&--row {
display: flex;
flex-direction: row;
@include mobile {
margin-top: 1rem;

&--no-rating {
@include mobile {
margin-left: 0.7rem;
}
}

&--rated {
@include mobile {
margin-top: 1rem;
}
}
}
}