From 769efa30747b6619aa6c18b0873a2a0af53ce7d3 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Sun, 19 Jun 2022 14:52:58 +0000
Subject: [PATCH] Move the beta pill to the right side and display the pill on
 video room only (#8873)

---
 res/css/views/rooms/_RoomPreviewCard.scss      | 1 +
 src/components/views/rooms/RoomPreviewCard.tsx | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_RoomPreviewCard.scss b/res/css/views/rooms/_RoomPreviewCard.scss
index 782eb29248..3ee37e585d 100644
--- a/res/css/views/rooms/_RoomPreviewCard.scss
+++ b/res/css/views/rooms/_RoomPreviewCard.scss
@@ -74,6 +74,7 @@ limitations under the License.
 
         // XXX Remove this when video rooms leave beta
         .mx_BetaCard_betaPill {
+            margin-inline-start: auto;
             align-self: start;
         }
     }
diff --git a/src/components/views/rooms/RoomPreviewCard.tsx b/src/components/views/rooms/RoomPreviewCard.tsx
index 132ba6720e..b2d9710a7c 100644
--- a/src/components/views/rooms/RoomPreviewCard.tsx
+++ b/src/components/views/rooms/RoomPreviewCard.tsx
@@ -102,7 +102,10 @@ const RoomPreviewCard: FC<IProps> = ({ room, onJoinButtonClicked, onRejectButton
                         { inviteSender }
                     </div> : null }
                 </div>
-                <BetaPill onClick={viewLabs} tooltipTitle={_t("Video rooms are a beta feature")} />
+                { room.isElementVideoRoom()
+                    ? <BetaPill onClick={viewLabs} tooltipTitle={_t("Video rooms are a beta feature")} />
+                    : null
+                }
             </div>;
         }