From 0e4c611e6c723c3530c5720c0c6c9faefa180d0a Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 5 Nov 2021 12:40:14 -0700
Subject: [PATCH 1/2] Merge pull request #6254 from
 Expensify/version-BUILD-35283908f5936724d00ac6a718884a73daf1db50

(cherry picked from commit 8b477cbb902a6a0f0e3e554ef49e009ad622890f)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 2 +-
 package.json                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index dfae32ab77f1..27b562cc9504 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -149,8 +149,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001011401
-        versionName "1.1.14-1"
+        versionCode 1001011402
+        versionName "1.1.14-2"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 0f590e75226d..9d73d0919834 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.14.1</string>
+	<string>1.1.14.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 882407fb77f8..45d472b8c951 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.1.14.1</string>
+	<string>1.1.14.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 9cd4a989a8ba..6e97be92c972 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.14-1",
+  "version": "1.1.14-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9e286b5eeb99..78365ada8472 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.14-1",
+  "version": "1.1.14-2",
   "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 e03d621cac6a40ea88278439690d368efe244296 Mon Sep 17 00:00:00 2001
From: Chirag Chandrakant Salian <chirag@expensify.com>
Date: Fri, 5 Nov 2021 12:37:39 -0700
Subject: [PATCH 2/2] Merge pull request #6252 from
 Expensify/chirag-removing-draftComments-param

Removing draft comments param

(cherry picked from commit 35283908f5936724d00ac6a718884a73daf1db50)
---
 src/pages/home/sidebar/SidebarLinks.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index 7320895074ee..e54a0fcceadf 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -97,7 +97,6 @@ class SidebarLinks extends React.Component {
         const sidebarOptions = getSidebarOptions(
             props.reports,
             props.personalDetails,
-            props.draftComments,
             activeReportID,
             props.priorityMode,
             props.betas,
@@ -275,9 +274,6 @@ export default compose(
         reports: {
             key: ONYXKEYS.COLLECTION.REPORT,
         },
-        draftComments: {
-            key: ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT,
-        },
         personalDetails: {
             key: ONYXKEYS.PERSONAL_DETAILS,
         },