Skip to content
This repository was archived by the owner on Oct 4, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 1 addition & 6 deletions packages/mobile/src/components/feed-tip-tile/FeedTipTile.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { useCallback, useEffect } from 'react'

import type { User } from '@audius/common'
import { FeatureFlags } from '@audius/common'
import { getAccountUser } from 'audius-client/src/common/store/account/selectors'
import { getUsers } from 'audius-client/src/common/store/cache/users/selectors'
import {
Expand All @@ -14,7 +13,6 @@ import { View } from 'react-native'
import IconRemove from 'app/assets/images/iconRemove.svg'
import { Tile } from 'app/components/core'
import { useDispatchWeb } from 'app/hooks/useDispatchWeb'
import { useFeatureFlag } from 'app/hooks/useRemoteConfig'
import { useSelectorWeb } from 'app/hooks/useSelectorWeb'
import { MessageType } from 'app/message/types'
import {
Expand Down Expand Up @@ -72,9 +70,6 @@ export const FeedTipTile = () => {
const usersMap = useSelectorWeb((state) =>
getUsers(state, { ids: tipToDisplay ? tipperIds : [] })
)
const { isEnabled: isTippingEnabled } = useFeatureFlag(
FeatureFlags.TIPPING_ENABLED
)

useEffect(() => {
const fetchRecentTipsAsync = async () => {
Expand Down Expand Up @@ -102,7 +97,7 @@ export const FeedTipTile = () => {
}
}, [dispatchWeb, account, tipToDisplay])

if (!isTippingEnabled || !showTip) {
if (!showTip) {
return null
}

Expand Down
127 changes: 0 additions & 127 deletions packages/mobile/src/screens/profile-screen/ExpandableBio.tsx

This file was deleted.

76 changes: 0 additions & 76 deletions packages/mobile/src/screens/profile-screen/ProfileBadge.tsx

This file was deleted.

81 changes: 0 additions & 81 deletions packages/mobile/src/screens/profile-screen/ProfileHeader.tsx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,13 @@ const SupportingSectionTitle = () => {
}

export const ExpandedSection = () => {
const { supporting_count, user_id } = useSelectProfile(['supporting_count'])
const { supporting_count, user_id, current_user_followee_follow_count } =
useSelectProfile([
'supporting_count',
'user_id',

'current_user_followee_follow_count'
])
const accountId = useSelectorWeb(getUserId)
const isOwner = user_id === accountId

Expand All @@ -66,7 +72,9 @@ export const ExpandedSection = () => {
<SocialsAndSites />
<View style={{ flexDirection: 'row', marginVertical: spacing(2) }}>
<ProfileTierTile />
{isOwner ? null : <ProfileMutualsButton />}
{isOwner || current_user_followee_follow_count === 0 ? null : (

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nice

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

yeah! checked with julian on it too. 2 birds

<ProfileMutualsButton />
)}
</View>
{supporting_count > 0 ? (
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ const useStyles = makeStyles(({ palette, spacing }) => ({
bottomDivider: { marginTop: spacing(2), marginHorizontal: -12 }
}))

type ProfileHeaderV2Props = {
type ProfileHeaderProps = {
scrollY: Animated.Value
}

export const ProfileHeaderV2 = (props: ProfileHeaderV2Props) => {
export const ProfileHeader = (props: ProfileHeaderProps) => {
const { scrollY } = props
const styles = useStyles()
const profile = useSelectProfileRoot(['user_id', 'does_current_user_follow'])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const ProfileMutualsButton = () => {
return (
<Tile
styles={{ root: styles.root, tile: styles.tile, content: styles.content }}
onPress={current_user_followee_follow_count > 0 ? handlePress : undefined}
onPress={handlePress}
>
<IconFollowing
height={20}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './ProfileHeader'

This file was deleted.

Loading