From ee8df5c52a70cbb548cc1f5e38aeb2b7292dc9e8 Mon Sep 17 00:00:00 2001 From: Dharit Tantiviramanond Date: Mon, 22 Jul 2024 15:15:59 -0400 Subject: [PATCH 1/3] [QA-1463] Change order of mobile action buttons --- .../src/components/details-tile/DetailsTileActionButtons.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx index 2b9b1056406..7b749f7d7e4 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx @@ -178,10 +178,10 @@ export const DetailsTileActionButtons = ({ return ( - {hideShare ? null : shareButton} {isOwner && !ddexApp ? editButton : hideRepost ? null : repostButton} {isOwner || hideFavorite ? null : favoriteButton} {isOwner && !isPublished ? publishButton : null} + {hideShare ? null : shareButton} {hideOverflow ? null : overflowMenu} ) From 15dbde97cdd537436391006ff6c7adfbb514cbaa Mon Sep 17 00:00:00 2001 From: Dharit Tantiviramanond Date: Mon, 22 Jul 2024 15:20:16 -0400 Subject: [PATCH 2/3] fixup! [QA-1463] Change order of mobile action buttons --- .../src/components/details-tile/DetailsTileActionButtons.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx index 7b749f7d7e4..21e64ebd56b 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx @@ -178,10 +178,11 @@ export const DetailsTileActionButtons = ({ return ( - {isOwner && !ddexApp ? editButton : hideRepost ? null : repostButton} + {!isOwner && !ddexApp && !hideRepost ? repostButton : null} {isOwner || hideFavorite ? null : favoriteButton} - {isOwner && !isPublished ? publishButton : null} {hideShare ? null : shareButton} + {isOwner && !ddexApp ? editButton : null} + {isOwner && !isPublished ? publishButton : null} {hideOverflow ? null : overflowMenu} ) From f320a48a999c314eb59b0fc5faa2816e9e074946 Mon Sep 17 00:00:00 2001 From: Dharit Tantiviramanond Date: Mon, 22 Jul 2024 15:21:27 -0400 Subject: [PATCH 3/3] fixup! fixup! [QA-1463] Change order of mobile action buttons --- .../src/components/details-tile/DetailsTileActionButtons.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx index 21e64ebd56b..6f11fe28099 100644 --- a/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx +++ b/packages/mobile/src/components/details-tile/DetailsTileActionButtons.tsx @@ -178,7 +178,7 @@ export const DetailsTileActionButtons = ({ return ( - {!isOwner && !ddexApp && !hideRepost ? repostButton : null} + {isOwner || ddexApp || hideRepost ? null : repostButton} {isOwner || hideFavorite ? null : favoriteButton} {hideShare ? null : shareButton} {isOwner && !ddexApp ? editButton : null}