From 169afe38327b67ad8f0ccbeb9a8c3d26569fcc7f Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 28 Feb 2023 21:45:42 -0500
Subject: [PATCH 1/2] Merge pull request #15587 from
 Expensify/version-BUILD-482E6BF9-387B-409C-ADCF-F65045FDEB7D

Update version to 1.2.77-4 on main

(cherry picked from commit 44c19cbd1891a255394f984bab4b815c580c9e13)
---
 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 6e6cd4e4fbfa..90919fdbf6a8 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001027703
-        versionName "1.2.77-3"
+        versionCode 1001027704
+        versionName "1.2.77-4"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 461bf294159b..4a79074f3e22 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.77.3</string>
+	<string>1.2.77.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 6293fdc8b953..680745dcee4e 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.77.3</string>
+	<string>1.2.77.4</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index ec510ebf8ff3..58653dd9cdd8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.2.77-3",
+  "version": "1.2.77-4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.2.77-3",
+      "version": "1.2.77-4",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 58e83436f567..cd7c578edf64 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.77-3",
+  "version": "1.2.77-4",
   "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 b78d8d9a79570aecf905e80bf38a87ac8f6d8310 Mon Sep 17 00:00:00 2001
From: Aldo Canepa Garay <87341702+aldo-expensify@users.noreply.github.com>
Date: Tue, 28 Feb 2023 17:06:08 -0800
Subject: [PATCH 2/2] Merge pull request #15578 from
 Expensify/yuwen-decodeDollaz

Decode transaction messages because they may have HTML Entities

(cherry picked from commit c35f7775f3b6657329d7c9368ba67bb807caa2e4)
---
 src/components/ReportTransaction.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ReportTransaction.js b/src/components/ReportTransaction.js
index be53b11c742e..5586f5e67c24 100644
--- a/src/components/ReportTransaction.js
+++ b/src/components/ReportTransaction.js
@@ -1,6 +1,7 @@
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
 import {View} from 'react-native';
+import Str from 'expensify-common/lib/str';
 import styles from '../styles/styles';
 import CONST from '../CONST';
 import * as IOU from '../libs/actions/IOU';
@@ -76,7 +77,7 @@ class ReportTransaction extends Component {
                         wrapperStyles={[styles.reportTransactionWrapper]}
                     >
                         <Text style={[styles.chatItemMessage]}>
-                            {this.props.action.message[0].text}
+                            {Str.htmlDecode(this.props.action.message[0].html)}
                         </Text>
                     </ReportActionItemSingle>
                     {this.props.canBeRejected && (
