From 92f8c442c9fc0c0ceddd2489e12de27d67862c69 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 15 Jun 2023 18:19:21 -0400
Subject: [PATCH 1/2] Merge pull request #20876 from
Expensify/version-BUILD-134320EE-5E80-4D3B-A3B5-AC69AAD0DDD8
Update version to 1.3.28-5 on main
(cherry picked from commit c4ef02bec96b996600393e53e27955d2f2ba12cd)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/Info.plist | 2 +-
package-lock.json | 4 ++--
package.json | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index e46080882ad..b24050727c0 100644
--- 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
index ec7a607d688..7615c1afdbf 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -32,7 +32,7 @@
CFBundleVersion
- 1.3.28.3
+ 1.3.28.5
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 2e332d335ec..a614839d7a4 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.3.28.3
+ 1.3.28.5
diff --git a/package-lock.json b/package-lock.json
index d6ee58ed16b..6e8432ecb68 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.3.28-3",
+ "version": "1.3.28-5",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.3.28-3",
+ "version": "1.3.28-5",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 20703ad2b79..fa0d2030582 100644
--- 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.",
From 2dfe139eeaf21ca49c39696ae44f5a80c1678657 Mon Sep 17 00:00:00 2001
From: Marc Glasser
Date: Thu, 15 Jun 2023 11:45:22 -1000
Subject: [PATCH 2/2] Merge pull request #20845 from
tienifr/fix/20819-wrong-text-color-our-mention
Fix: Wrong text color for our mention
(cherry picked from commit 9fda6a55bb5f8997863dd6a6c994934bf36eaad9)
---
.../HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js
index a77c425c0ed..6d4ab03b5e5 100644
--- 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)}
>