From 11d5468ec94325a2ae19ef583c73b6803ed66361 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 4 Jul 2022 03:54:08 -0700
Subject: [PATCH 1/2] Merge pull request #9691 from
 Expensify/version-BUILD-893DED80-3DD9-4F1B-95B2-0F5C557B5280

Update version to 1.1.79-13 on main

(cherry picked from commit 6235c3e56e599d753b44f9bb2dbf34bc546c9ec4)
---
 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 2192a421a47c..1a22f0e06bb8 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001017912
-        versionName "1.1.79-12"
+        versionCode 1001017913
+        versionName "1.1.79-13"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 1884ecd314a4..51345669e84f 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.79.12</string>
+	<string>1.1.79.13</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 911403fbb98b..85f78c0934c8 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.79.12</string>
+	<string>1.1.79.13</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 3b27a646108f..9c5079c08c9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.79-12",
+  "version": "1.1.79-13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7ea2e161bc31..bf279f1e3c75 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.79-12",
+  "version": "1.1.79-13",
   "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 3922461bb8bf8a688d85b3fc17eb4fb5d2470300 Mon Sep 17 00:00:00 2001
From: Jules Rosser <jules@expensify.com>
Date: Mon, 4 Jul 2022 11:45:11 +0100
Subject: [PATCH 2/2] Merge pull request #9690 from
 Expensify/revert-9674-Rory-FixScrollToIndex

Revert "Fix off-by-one error in scrollToIndex"

(cherry picked from commit 6ebe68d8ec06c3d263b8602e2268992b950275c6)
---
 src/components/OptionsSelector.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/OptionsSelector.js b/src/components/OptionsSelector.js
index 3f035e6541ba..aa629b49ca4a 100755
--- a/src/components/OptionsSelector.js
+++ b/src/components/OptionsSelector.js
@@ -231,7 +231,7 @@ class OptionsSelector extends Component {
             focusedIndex: newFocusedIndex,
         });
 
-        if (newOptions.length < newFocusedIndex) {
+        if (newOptions.length <= newFocusedIndex) {
             return;
         }
         this.scrollToIndex(newFocusedIndex);