From ccadcaad092b03f432f9319217b1672aa243ebbf Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 1 Jul 2022 13:08:49 -0700
Subject: [PATCH 1/2] Merge pull request #9675 from
 Expensify/version-BUILD-FD0A3BFC-A7C0-40F3-A527-3C06CCE2CFA6

Update version to 1.1.79-11 on main

(cherry picked from commit 53c70a2eafe3144fbde7d4b0073e738523894356)
---
 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 b8f6bbe5d400..96babd518cc9 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 1001017909
-        versionName "1.1.79-9"
+        versionCode 1001017911
+        versionName "1.1.79-11"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 59cc47492dd1..6feafc542f16 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.79.9</string>
+	<string>1.1.79.11</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index bb334cb35d05..db6dc5426183 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.9</string>
+	<string>1.1.79.11</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index dbe262a84330..b3b7f9283536 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.79-9",
+  "version": "1.1.79-11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f1df3c0568b4..df40e21dac42 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.79-9",
+  "version": "1.1.79-11",
   "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 012284c7da8ca43ff337691c246daac546b9d5fc Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Fri, 1 Jul 2022 16:01:47 -0400
Subject: [PATCH 2/2] Merge pull request #9674 from
 Expensify/Rory-FixScrollToIndex

Fix off-by-one error in scrollToIndex

(cherry picked from commit 629964699f482da9cfc2755118fea4ab9479fcda)
---
 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 916e41005459..cba680cc6f4b 100755
--- a/src/components/OptionsSelector.js
+++ b/src/components/OptionsSelector.js
@@ -226,7 +226,7 @@ class OptionsSelector extends Component {
             focusedIndex: newFocusedIndex,
         });
 
-        if (newOptions.length <= newFocusedIndex) {
+        if (newOptions.length < newFocusedIndex) {
             return;
         }
         this.scrollToIndex(newFocusedIndex);