Merge branch 'master' into improve-private-list-deleted-content

OdyseeTeam · Dec 18, 2023 · 2e892af · 2e892af
2 parents afc65c1 + c2604e3
commit 2e892af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/ui/component/claimMenuList/index.js b/ui/component/claimMenuList/index.js
@@ -48,7 +48,8 @@ const select = (state, props) => {
   };
   const claim = selectClaimForUri(state, uri, false) || placeholderForDeletedClaim;
   const collectionId = props.collectionId;
-  const repostedClaim = claim && claim.reposted_claim;
+  const repostedClaim = claim?.reposted_claim;
+  const isRepost = Boolean(claim?.reposted_claim || claim?.value?.claim_hash);
   const contentClaim = repostedClaim || claim;
   const contentSigningChannel = contentClaim && contentClaim.signing_channel;
   const contentPermanentUri = contentClaim && contentClaim.permanent_url;
@@ -63,7 +64,7 @@ const select = (state, props) => {
 
   return {
     claim,
-    repostedClaim,
+    isRepost,
     contentClaim,
     contentSigningChannel,
     contentChannelUri,

diff --git a/ui/component/claimMenuList/view.jsx b/ui/component/claimMenuList/view.jsx
@@ -31,7 +31,7 @@ type SubscriptionArgs = {
 type Props = {
   uri: string,
   claim: Claim,
-  repostedClaim: ?Claim,
+  isRepost: boolean,
   contentClaim: ?Claim,
   contentSigningChannel: ?Claim,
   contentChannelUri: string,
@@ -79,7 +79,7 @@ function ClaimMenuList(props: Props) {
   const {
     uri,
     claim,
-    repostedClaim,
+    isRepost,
     contentClaim,
     contentSigningChannel,
     contentChannelUri,
@@ -133,7 +133,7 @@ function ClaimMenuList(props: Props) {
   const isChannel = !incognitoClaim && !contentSigningChannel;
   const { channelName } = parseURI(contentChannelUri);
   const showDelete = claimIsMine || (fileInfo && (fileInfo.written_bytes > 0 || fileInfo.blobs_completed > 0));
-  const subscriptionLabel = repostedClaim
+  const subscriptionLabel = isRepost
     ? isSubscribed
       ? __('Unfollow @%channelName%', { channelName })
       : __('Follow @%channelName%', { channelName })
@@ -215,7 +215,7 @@ function ClaimMenuList(props: Props) {
   */
 
   function handleDelete() {
-    if (!repostedClaim && !isChannel) {
+    if (!isRepost && !isChannel) {
       openModal(MODALS.CONFIRM_FILE_REMOVE, { uri, doGoBack: false });
     } else {
       openModal(MODALS.CONFIRM_CLAIM_REVOKE, { claim, cb: isChannel && (() => replace(`/$/${PAGES.CHANNELS}`)) });
@@ -573,7 +573,7 @@ function ClaimMenuList(props: Props) {
                           </div>
                         </MenuItem>
                       ) */}
-                          {!repostedClaim && (
+                          {!isRepost && (
                             <MenuItem className="comment__menu-option" onSelect={handleEdit}>
                               <div className="menu__link">
                                 <Icon aria-hidden icon={ICONS.EDIT} />