From adfcaf83b3ef92173d73241e8839718a1d563058 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 12 May 2023 12:39:11 -0400
Subject: [PATCH 1/2] Merge pull request #18845 from
 Expensify/version-BUILD-37EF74A9-E881-4AAD-BEC9-E7D05FA52C26

Update version to 1.3.13-3 on main

(cherry picked from commit f52eeebe290efb641cb41f3af09fb79e0c7e0899)
---
 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 5d26b3801563..96991561c30b 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 1001031302
-        versionName "1.3.13-2"
+        versionCode 1001031303
+        versionName "1.3.13-3"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 83d797b96cf2..a895873eba44 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.13.2</string>
+	<string>1.3.13.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index fca265210fc0..b9079083e65a 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.3.13.2</string>
+	<string>1.3.13.3</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 90bb341053d5..22c988d36ead 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.13-2",
+  "version": "1.3.13-3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.13-2",
+      "version": "1.3.13-3",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 398cea88eecf..8b0fb937a7ab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.13-2",
+  "version": "1.3.13-3",
   "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 b5b35fd35dfec95227d28cfefa708a5aa25f1b19 Mon Sep 17 00:00:00 2001
From: Puneet Lath <puneet@expensify.com>
Date: Fri, 12 May 2023 12:30:01 -0400
Subject: [PATCH 2/2] Merge pull request #18842 from allroundexperts/fix-18793

fix: android app crash fix due to wrong position of LayoutAnimation
(cherry picked from commit 101a3e2e990c395879f578e520a9f60b6e95f5d4)
---
 src/pages/home/report/ReportActionCompose.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index d257e9a3de53..617fa7d60a35 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -301,6 +301,7 @@ class ReportActionCompose extends React.Component {
     }
 
     onSelectionChange(e) {
+        LayoutAnimation.configureNext(LayoutAnimation.create(50, LayoutAnimation.Types.easeInEaseOut, LayoutAnimation.Properties.opacity));
         this.setState({selection: e.nativeEvent.selection});
         this.calculateEmojiSuggestion();
         this.calculateMentionSuggestion();
@@ -511,8 +512,6 @@ class ReportActionCompose extends React.Component {
             nextState.shouldShowEmojiSuggestionMenu = !_.isEmpty(newSuggestedEmojis);
         }
 
-        LayoutAnimation.configureNext(LayoutAnimation.create(50, LayoutAnimation.Types.easeInEaseOut, LayoutAnimation.Properties.opacity));
-
         this.setState(nextState);
     }