Merge pull request #20877 from Expensify/OSBotify-cherry-pick-staging…

…-20845 🍒 Cherry pick PR #20845 to staging 🍒
Expensify · Jun 15, 2023 · dbf1a69 · dbf1a69
2 parents 7ddf35b + 2dfe139
commit dbf1a69
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001032803
-        versionName "1.3.28-3"
+        versionCode 1001032805
+        versionName "1.3.28-5"
     }
 
     splits {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.28.3</string>
+	<string>1.3.28.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.28.3</string>
+	<string>1.3.28.5</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.28-3",
+  "version": "1.3.28-5",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js
@@ -42,8 +42,7 @@ function MentionUserRenderer(props) {
                     // eslint-disable-next-line react/jsx-props-no-spreading
                     {...defaultRendererProps}
                     href={ROUTES.getDetailsRoute(loginWithoutLeadingAt)}
-                    color={StyleUtils.getMentionTextColor(isOurMention)}
-                    style={[_.omit(props.style, 'color'), StyleUtils.getMentionStyle(isOurMention)]}
+                    style={[_.omit(props.style, 'color'), StyleUtils.getMentionStyle(isOurMention), {color: StyleUtils.getMentionTextColor(isOurMention)}]}
                     onPress={() => showUserDetails(loginWithoutLeadingAt)}
                 >
                     <TNodeChildrenRenderer tnode={props.tnode} />