From 4ef8247985f05945aca78cc17e5ea0b90471398b Mon Sep 17 00:00:00 2001 From: saltrafael Date: Wed, 9 Jun 2021 08:21:05 -0300 Subject: [PATCH] remove redundancy when buttons are already on page --- ui/component/claimMenuList/view.jsx | 33 +++++++++++++++++------------ ui/page/channel/view.jsx | 3 ++- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ui/component/claimMenuList/view.jsx b/ui/component/claimMenuList/view.jsx index 91953443b..daa4638cd 100644 --- a/ui/component/claimMenuList/view.jsx +++ b/ui/component/claimMenuList/view.jsx @@ -48,6 +48,7 @@ type Props = { isSubscribed: boolean, doChannelSubscribe: (SubscriptionArgs) => void, doChannelUnsubscribe: (SubscriptionArgs) => void, + isChannelPage: boolean, }; function ClaimMenuList(props: Props) { @@ -76,6 +77,7 @@ function ClaimMenuList(props: Props) { isSubscribed, doChannelSubscribe, doChannelUnsubscribe, + isChannelPage = false, } = props; const incognito = channelUri && !(channelUri.includes('@')); const signingChannel = claim && (claim.signing_channel || claim); @@ -186,7 +188,7 @@ function ClaimMenuList(props: Props) { - {!incognito && (!claimIsMine ? ( + {!incognito && (!claimIsMine ? (!isChannelPage &&
@@ -201,12 +203,15 @@ function ClaimMenuList(props: Props) {
))} - -
- - {__('Support')} -
-
+ + {!isChannelPage && ( + +
+ + {__('Support')} +
+
+ )} {hasExperimentalUi && ( <> @@ -289,12 +294,14 @@ function ClaimMenuList(props: Props) { ) : ( <> - -
- - {__('Edit')} -
-
+ {!isChannelPage && ( + +
+ + {__('Edit')} +
+
+ )} {showDelete && ( diff --git a/ui/page/channel/view.jsx b/ui/page/channel/view.jsx index 8abb905a6..e7238c226 100644 --- a/ui/page/channel/view.jsx +++ b/ui/page/channel/view.jsx @@ -191,7 +191,8 @@ function ChannelPage(props: Props) { {!channelIsBlackListed && } {!(isBlocked || isMuted) && } {!(isBlocked || isMuted) && (!channelIsBlackListed || isSubscribed) && } - + {/* TODO: add channel collections */} + {cover && }