merge main

.github/workflows/e2ePerformanceTests.yml

@@ -200,9 +200,10 @@ jobs:
         if: failure()
         run: |
           echo ${{ steps.schedule-awsdf-main.outputs.data }}
-          cat "./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/Test spec output.txt"
           unzip "Customer Artifacts.zip" -d mainResults
-          cat ./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/debug.log
+          cat "./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/logcat.txt" || true
+          cat ./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/debug.log || true
+          cat "./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/Test spec output.txt" || true
 
       - name: Unzip AWS Device Farm results
         if: ${{ always() }}

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001043707
-        versionName "1.4.37-7"
+        versionCode 1001043800
+        versionName "1.4.38-0"
     }
 
     flavorDimensions "default"

babel.config.js

@@ -1,5 +1,7 @@
 require('dotenv').config();
 
+const IS_E2E_TESTING = process.env.E2E_TESTING === 'true';
+
 const defaultPresets = ['@babel/preset-react', '@babel/preset-env', '@babel/preset-flow', '@babel/preset-typescript'];
 const defaultPlugins = [
     // Adding the commonjs: true option to react-native-web plugin can cause styling conflicts
@@ -72,7 +74,8 @@ const metro = {
     ],
     env: {
         production: {
-            plugins: [['transform-remove-console', {exclude: ['error', 'warn']}]],
+            // Keep console logs for e2e tests
+            plugins: IS_E2E_TESTING ? [] : [['transform-remove-console', {exclude: ['error', 'warn']}]],
         },
     },
 };

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.37</string>
+	<string>1.4.38</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.37.7</string>
+	<string>1.4.38.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.37</string>
+	<string>1.4.38</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.37.7</string>
+	<string>1.4.38.0</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.37</string>
+	<string>1.4.38</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.37.7</string>
+	<string>1.4.38.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.37-7",
+  "version": "1.4.38-0",
   "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/pages/iou/request/step/IOURequestStepTag.js

@@ -69,7 +69,7 @@ function IOURequestStepTag({
     const updateTag = (selectedTag) => {
         const isSelectedTag = selectedTag.searchText === tag;
         const updatedTag = !isSelectedTag ? selectedTag.searchText : '';
-        if (isSplitBill) {
+        if (isSplitBill && isEditing) {
             IOU.setDraftSplitTransaction(transactionID, {tag: selectedTag.searchText});
             navigateBack();
             return;

src/pages/iou/request/step/IOURequestStepWaypoint.js

@@ -113,8 +113,8 @@ function IOURequestStepWaypoint({
 
     const locationBias = useLocationBias(allWaypoints, userLocation);
     const waypointAddress = lodashGet(currentWaypoint, 'address', '');
-    // Hide the menu when there is only start and finish waypoint
-    const shouldShowThreeDotsButton = waypointCount > 2;
+    // Hide the menu when there is only start and finish waypoint or the current waypoint is empty
+    const shouldShowThreeDotsButton = waypointCount > 2 && waypointAddress;
     const shouldDisableEditor =
         isFocused &&
         (Number.isNaN(parsedWaypointIndex) || parsedWaypointIndex < 0 || parsedWaypointIndex > waypointCount || (filledWaypointCount < 2 && parsedWaypointIndex >= waypointCount));

tests/perf-test/SearchPage.perf-test.js

@@ -103,7 +103,7 @@ function SearchPageWrapper(args) {
     );
 }
 
-test('[Search Page] should interact when text input changes', async () => {
+test.skip('[Search Page] should interact when text input changes', async () => {
     const {addListener} = TestHelper.createAddListenerMock();
 
     const scenario = async () => {
@@ -130,7 +130,7 @@ test('[Search Page] should interact when text input changes', async () => {
         .then(() => measurePerformance(<SearchPageWrapper navigation={navigation} />, {scenario}));
 });
 
-test('[Search Page] should render options list', async () => {
+test.skip('[Search Page] should render options list', async () => {
     const {triggerTransitionEnd, addListener} = TestHelper.createAddListenerMock();
     const smallMockedPersonalDetails = getMockedPersonalDetails(5);
 
@@ -156,7 +156,7 @@ test('[Search Page] should render options list', async () => {
         .then(() => measurePerformance(<SearchPageWrapper navigation={navigation} />, {scenario}));
 });
 
-test('[Search Page] should search in options list', async () => {
+test.skip('[Search Page] should search in options list', async () => {
     const {triggerTransitionEnd, addListener} = TestHelper.createAddListenerMock();
 
     const scenario = async () => {
@@ -183,7 +183,7 @@ test('[Search Page] should search in options list', async () => {
         .then(() => measurePerformance(<SearchPageWrapper navigation={navigation} />, {scenario}));
 });
 
-test('[Search Page] should click on list item', async () => {
+test.skip('[Search Page] should click on list item', async () => {
     const {triggerTransitionEnd, addListener} = TestHelper.createAddListenerMock();
 
     const scenario = async () => {