Merge pull request #9074 from Expensify/update-staging-from-main

Update version to 1.1.63-2 on staging

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001016301
-        versionName "1.1.63-1"
+        versionCode 1001016302
+        versionName "1.1.63-2"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.63.1</string>
+	<string>1.1.63.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.63.1</string>
+	<string>1.1.63.2</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.63-1",
+  "version": "1.1.63-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.",

src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer/index.js

@@ -31,7 +31,9 @@ class PreRenderer extends React.Component {
         const node = this.ref.getScrollableNode();
         const horizontalOverflow = node.scrollWidth > node.offsetWidth;
 
-        if ((event.currentTarget === node) && horizontalOverflow) {
+        // Account for vertical scrolling variation when horizontally scrolling via touchpad by checking a large delta.
+        const isVerticalScrolling = Math.abs(event.deltaY) > 3; // This is for touchpads sensitive
+        if ((event.currentTarget === node) && horizontalOverflow && !isVerticalScrolling) {
             node.scrollLeft += event.deltaX;
             event.preventDefault();
             event.stopPropagation();