From e7c121aff93a2965ab28e66fc0d2e3dbeab41a37 Mon Sep 17 00:00:00 2001
From: SleeplessOne1917 <abias1122@gmail.com>
Date: Tue, 27 Jun 2023 19:01:47 -0400
Subject: [PATCH 1/2] Fix subscribe and block community buttons not showing up
 on first load

---
 src/shared/components/community/sidebar.tsx | 48 ++++++++++-----------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/shared/components/community/sidebar.tsx b/src/shared/components/community/sidebar.tsx
index 733c19a..d5cf2cb 100644
--- a/src/shared/components/community/sidebar.tsx
+++ b/src/shared/components/community/sidebar.tsx
@@ -260,20 +260,18 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
   subscribe() {
     const community_view = this.props.community_view;
     return (
-      <>
-        {community_view.subscribed == "NotSubscribed" && (
-          <button
-            className="btn btn-secondary d-block mb-2 w-100"
-            onClick={linkEvent(this, this.handleFollowCommunity)}
-          >
-            {this.state.followCommunityLoading ? (
-              <Spinner />
-            ) : (
-              I18NextService.i18n.t("subscribe")
-            )}
-          </button>
-        )}
-      </>
+      community_view.subscribed === "NotSubscribed" && (
+        <button
+          className="btn btn-secondary d-block mb-2 w-100"
+          onClick={linkEvent(this, this.handleFollowCommunity)}
+        >
+          {this.state.followCommunityLoading ? (
+            <Spinner />
+          ) : (
+            I18NextService.i18n.t("subscribe")
+          )}
+        </button>
+      )
     );
   }
 
@@ -281,18 +279,16 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
     const { subscribed, blocked } = this.props.community_view;
 
     return (
-      <>
-        {subscribed == "NotSubscribed" && (
-          <button
-            className="btn btn-danger d-block mb-2 w-100"
-            onClick={linkEvent(this, this.handleBlockCommunity)}
-          >
-            {I18NextService.i18n.t(
-              blocked ? "unblock_community" : "block_community"
-            )}
-          </button>
-        )}
-      </>
+      subscribed === "NotSubscribed" && (
+        <button
+          className="btn btn-danger d-block mb-2 w-100"
+          onClick={linkEvent(this, this.handleBlockCommunity)}
+        >
+          {I18NextService.i18n.t(
+            blocked ? "unblock_community" : "block_community"
+          )}
+        </button>
+      )
     );
   }
 

From 874ae62fba7470693c3a514071111074a60db970 Mon Sep 17 00:00:00 2001
From: Alec Armbruster <35377827+alectrocute@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:08:01 -0400
Subject: [PATCH 2/2] remove hard-coded text foreground color classes (#1658)

Signed-off-by: Alec Armbruster <35377827+alectrocute@users.noreply.github.com>
---
 src/shared/components/comment/comment-node.tsx | 6 +++---
 src/shared/components/person/profile.tsx       | 4 ++--
 src/shared/components/post/post-listing.tsx    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/shared/components/comment/comment-node.tsx b/src/shared/components/comment/comment-node.tsx
index 079edec..8f689aa 100644
--- a/src/shared/components/comment/comment-node.tsx
+++ b/src/shared/components/comment/comment-node.tsx
@@ -322,7 +322,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
                 getRoleLabelPill({
                   label: I18NextService.i18n.t("op").toUpperCase(),
                   tooltip: I18NextService.i18n.t("creator"),
-                  classes: "text-bg-info text-black",
+                  classes: "text-bg-info",
                   shrink: false,
                 })}
 
@@ -330,14 +330,14 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
                 getRoleLabelPill({
                   label: I18NextService.i18n.t("mod"),
                   tooltip: I18NextService.i18n.t("mod"),
-                  classes: "text-bg-primary text-black",
+                  classes: "text-bg-primary",
                 })}
 
               {isAdmin_ &&
                 getRoleLabelPill({
                   label: I18NextService.i18n.t("admin"),
                   tooltip: I18NextService.i18n.t("admin"),
-                  classes: "text-bg-danger text-white",
+                  classes: "text-bg-danger",
                 })}
 
               {cv.creator.bot_account &&
diff --git a/src/shared/components/person/profile.tsx b/src/shared/components/person/profile.tsx
index 4a8de02..ad7c5fe 100644
--- a/src/shared/components/person/profile.tsx
+++ b/src/shared/components/person/profile.tsx
@@ -489,7 +489,7 @@ export class Profile extends Component<
                         {getRoleLabelPill({
                           label: I18NextService.i18n.t("banned"),
                           tooltip: I18NextService.i18n.t("banned"),
-                          classes: "text-bg-danger text-white",
+                          classes: "text-bg-danger",
                           shrink: false,
                         })}
                       </li>
@@ -499,7 +499,7 @@ export class Profile extends Component<
                         {getRoleLabelPill({
                           label: I18NextService.i18n.t("deleted"),
                           tooltip: I18NextService.i18n.t("deleted"),
-                          classes: "text-bg-danger text-white",
+                          classes: "text-bg-danger",
                           shrink: false,
                         })}
                       </li>
diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx
index 98c3847..eb3d0f6 100644
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@ -412,13 +412,13 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
           getRoleLabelPill({
             label: I18NextService.i18n.t("mod"),
             tooltip: I18NextService.i18n.t("mod"),
-            classes: "text-bg-primary text-black",
+            classes: "text-bg-primary",
           })}
         {this.creatorIsAdmin_ &&
           getRoleLabelPill({
             label: I18NextService.i18n.t("admin"),
             tooltip: I18NextService.i18n.t("admin"),
-            classes: "text-bg-danger text-white",
+            classes: "text-bg-danger",
           })}
         {post_view.creator.bot_account &&
           getRoleLabelPill({