fix(MM-61209): mention badge incorrect theme color

mattermost · Nov 4, 2024 · 0c98f9e · 0c98f9e
1 parent 7eec0ff
commit 0c98f9e
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/app/components/badge/index.tsx b/app/components/badge/index.tsx
@@ -22,7 +22,7 @@ type Props = {
 };
 
 export default function Badge({
-    borderColor,
+    borderColor: borderColorProp,
     color,
     visible = true,
     type = 'Normal',
@@ -60,9 +60,15 @@ export default function Badge({
         return null;
     }
 
-    // @ts-expect-error: backgroundColor definitely exists
-    const {backgroundColor = rest.backgroundColor || theme.mentionBg, ...restStyle} =
+    const {
+
+        // @ts-expect-error: backgroundColor & borderColor definitely exist
+        backgroundColor = rest.backgroundColor || theme.mentionBg, borderColor: styleBorderColor,
+
+        ...restStyle} =
     StyleSheet.flatten(style) || {};
+
+    const borderColor = borderColorProp || styleBorderColor || theme.mentionBg;
     const textColor = color || theme.mentionColor;
     let lineHeight = Platform.select({android: 21, ios: 16.5});
     let fontSize = 12;