From 0570497632dea950d5a39ddead62c71ddd9a51b7 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 6 Feb 2023 09:48:52 -0500
Subject: [PATCH 1/2] Merge pull request #14860 from
 Expensify/version-BUILD-87797546-B3EC-4CD1-B9F6-22D6912DF842

Update version to 1.2.65-1 on main

(cherry picked from commit 43324455cadce598a577cb9e6625ff242a0064a2)
---
 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 74f23aac9bd4..bfa2cfa20dac 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 1001026500
-        versionName "1.2.65-0"
+        versionCode 1001026501
+        versionName "1.2.65-1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 998254346260..6df427736e0a 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.65.0</string>
+	<string>1.2.65.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index aaba4d654499..aa6cb237cad7 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.65.0</string>
+	<string>1.2.65.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index d6cfe6c4cc2d..0be93c57ce10 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.2.65-0",
+  "version": "1.2.65-1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.2.65-0",
+      "version": "1.2.65-1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 5384197804c9..3db508d9cbf4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.65-0",
+  "version": "1.2.65-1",
   "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 27a4dfa42c8285665b3ffdb0987afce0445f4b99 Mon Sep 17 00:00:00 2001
From: Paulo Gaspar Sena do Vale <paulogaspar404@gmail.com>
Date: Mon, 6 Feb 2023 11:42:59 -0300
Subject: [PATCH 2/2] Merge pull request #14856 from
 Expensify/vit-revertOptionListChange

Check whether option row changed focus before re-rendering

(cherry picked from commit 74400c30c77ec01dd63a6701c67a3b6120c543ce)
---
 src/components/OptionRow.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
index 3bae8f976fd6..96bcb1b730b7 100644
--- a/src/components/OptionRow.js
+++ b/src/components/OptionRow.js
@@ -92,6 +92,7 @@ class OptionRow extends Component {
             || this.props.showSelectedState !== nextProps.showSelectedState
             || this.props.showTitleTooltip !== nextProps.showTitleTooltip
             || !_.isEqual(this.props.option.icons, nextProps.option.icons)
+            || this.props.optionIsFocused !== nextProps.optionIsFocused
             || this.props.option.text !== nextProps.option.text
             || this.props.option.alternateText !== nextProps.option.alternateText
             || this.props.option.descriptiveText !== nextProps.option.descriptiveText