Merge branch 'main' into workspace-admin-checkbox

.github/actions/javascript/bumpVersion/index.js

@@ -298,6 +298,9 @@ function getPreviousVersion(currentVersion, level) {
         if (patch === 0) {
             return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
         }
+        if (major === 1 && minor === 3 && patch === 83) {
+            return getVersionStringFromNumber(major, minor, patch - 2, 0);
+        }
         return getVersionStringFromNumber(major, minor, patch - 1, 0);
     }
 

.github/actions/javascript/createOrUpdateStagingDeploy/index.js

@@ -998,6 +998,9 @@ function getPreviousVersion(currentVersion, level) {
         if (patch === 0) {
             return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
         }
+        if (major === 1 && minor === 3 && patch === 83) {
+            return getVersionStringFromNumber(major, minor, patch - 2, 0);
+        }
         return getVersionStringFromNumber(major, minor, patch - 1, 0);
     }
 

.github/actions/javascript/getDeployPullRequestList/index.js

@@ -961,6 +961,9 @@ function getPreviousVersion(currentVersion, level) {
         if (patch === 0) {
             return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
         }
+        if (major === 1 && minor === 3 && patch === 83) {
+            return getVersionStringFromNumber(major, minor, patch - 2, 0);
+        }
         return getVersionStringFromNumber(major, minor, patch - 1, 0);
     }
 

.github/actions/javascript/getPreviousVersion/index.js

@@ -148,6 +148,9 @@ function getPreviousVersion(currentVersion, level) {
         if (patch === 0) {
             return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
         }
+        if (major === 1 && minor === 3 && patch === 83) {
+            return getVersionStringFromNumber(major, minor, patch - 2, 0);
+        }
         return getVersionStringFromNumber(major, minor, patch - 1, 0);
     }
 

.github/libs/versionUpdater.js

@@ -118,6 +118,9 @@ function getPreviousVersion(currentVersion, level) {
         if (patch === 0) {
             return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
         }
+        if (major === 1 && minor === 3 && patch === 83) {
+            return getVersionStringFromNumber(major, minor, patch - 2, 0);
+        }
         return getVersionStringFromNumber(major, minor, patch - 1, 0);
     }
 

.github/scripts/findUnusedKeys.sh

@@ -6,7 +6,7 @@ LIB_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../../ && pwd)"
 
 readonly SRC_DIR="${LIB_PATH}/src"
 readonly STYLES_DIR="${LIB_PATH}/src/styles"
-readonly STYLES_FILE="${LIB_PATH}/src/styles/styles.js"
+readonly STYLES_FILE="${LIB_PATH}/src/styles/styles.ts"
 readonly UTILITIES_STYLES_FILE="${LIB_PATH}/src/styles/utilities"
 readonly STYLES_KEYS_FILE="${LIB_PATH}/scripts/style_keys_list_temp.txt"
 readonly UTILITY_STYLES_KEYS_FILE="${LIB_PATH}/scripts/utility_keys_list_temp.txt"
@@ -210,7 +210,12 @@ find_theme_style_and_store_keys() {
     fi
 
     # Check if we are inside an arrow function
-    if [[ "$line" =~ ^[[:space:]]*([a-zA-Z0-9_-])+:[[:space:]]*\(.*\)[[:space:]]*'=>'[[:space:]]*\(\{ || "$line" =~ ^[[:space:]]*(const|let|var)[[:space:]]+([a-zA-Z0-9_-]+)[[:space:]]*=[[:space:]]*\(.*\)[[:space:]]*'=>' ]]; then
+    if [[ "$line" =~ ^[[:space:]]*([a-zA-Zgv 0-9_-])+:[[:space:]]*\(.*\)[[:space:]]*'=>'[[:space:]]*\(\{ || "$line" =~ ^[[:space:]]*([a-zA-Zgv 0-9_-])+:[[:space:]]*\(.*\)[[:space:]]*'=>' ]]; then
+      inside_arrow_function=true
+      continue
+    fi
+
+    if [[ "$line" =~ ^[[:space:]]*(const|let|var)[[:space:]]+([a-zA-Z0-9_-]+)[[:space:]]*=[[:space:]]*\(.*\)[[:space:]]*'=>' ]]; then
       inside_arrow_function=true
       continue
     fi
@@ -348,7 +353,7 @@ echo "🔍 Looking for styles."
 find_utility_styles_store_prefix
 find_utility_usage_as_styles
 
-# Find and store keys from styles.js
+# Find and store keys from styles.ts
 find_styles_object_and_store_keys "$STYLES_FILE"
 find_styles_functions_and_store_keys "$STYLES_FILE"
 collect_theme_keys_from_styles "$STYLES_FILE"

.github/workflows/cherryPick.yml

@@ -11,7 +11,7 @@ jobs:
   validateActor:
     runs-on: ubuntu-latest
     outputs:
-      IS_DEPLOYER: ${{ fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) || github.actor == 'OSBotify' }}
+      IS_DEPLOYER: ${{ fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) || github.actor == 'OSBotify' || github.actor == 'os-botify[bot]' }}
     steps:
       - name: Check if user is deployer
         id: isDeployer

.github/workflows/e2ePerformanceTests.yml

@@ -191,14 +191,15 @@ jobs:
         if: ${{ always() && runner.debug != null && fromJSON(runner.debug) }}
         run: cat "./Host_Machine_Files/\$WORKING_DIRECTORY/debug.log"
 
-      - name: Check if test failed, if so post the results and add the DeployBlocker label
-        run: |
-          if grep -q '🔴' ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md; then
-            gh pr edit ${{ inputs.PR_NUMBER }} --add-label DeployBlockerCash
-            gh pr comment ${{ inputs.PR_NUMBER }} -F ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md
-            gh pr comment ${{ inputs.PR_NUMBER }} -b "@Expensify/mobile-deployers 📣 Please look into this performance regression as it's a deploy blocker."
-          else
-            echo '✅ no performance regression detected'
-          fi
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
+# TODO: Once tests are more reliable we should uncomment this
+#      - name: Check if test failed, if so post the results and add the DeployBlocker label
+#        run: |
+#          if grep -q '🔴' ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md; then
+#            gh pr edit ${{ inputs.PR_NUMBER }} --add-label DeployBlockerCash
+#            gh pr comment ${{ inputs.PR_NUMBER }} -F ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md
+#            gh pr comment ${{ inputs.PR_NUMBER }} -b "@Expensify/mobile-deployers 📣 Please look into this performance regression as it's a deploy blocker."
+#          else
+#            echo '✅ no performance regression detected'
+#          fi
+#        env:
+#          GITHUB_TOKEN: ${{ github.token }}

.github/workflows/platformDeploy.yml

@@ -16,7 +16,7 @@ jobs:
   validateActor:
     runs-on: ubuntu-latest
     outputs:
-      IS_DEPLOYER: ${{ fromJSON(steps.isUserDeployer.outputs.IS_DEPLOYER) || github.actor == 'OSBotify' }}
+      IS_DEPLOYER: ${{ fromJSON(steps.isUserDeployer.outputs.IS_DEPLOYER) || github.actor == 'OSBotify' || github.actor == 'os-botify[bot]' }}
     steps:
       - name: Check if user is deployer
         id: isUserDeployer

.well-known/apple-app-site-association

@@ -79,6 +79,10 @@
                     {
                         "/": "/search/*",
                         "comment": "Search"
+                    },
+                    {
+                        "/": "/money2020/*",
+                        "comment": "Money 2020"
                     }
                 ]
             }

README.md

@@ -3,7 +3,7 @@
         <img src="https://raw.githubusercontent.com/Expensify/App/main/web/favicon.png" width="64" height="64" alt="New Expensify Icon">
     </a>
     <h1>
-        <a href="https://new.expensify.com/">
+        <a href="https://new.expensify.com">
             New Expensify
         </a>
     </h1>

__mocks__/react-native.js

@@ -28,6 +28,7 @@ jest.doMock('react-native', () => {
                 BootSplash: {
                     getVisibilityStatus: jest.fn(),
                     hide: jest.fn(),
+                    logoSizeRatio: 1,
                     navigationBarHeight: 0,
                 },
                 StartupTimer: {stop: jest.fn()},

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001038301
-        versionName "1.3.83-1"
+        versionCode 1001038402
+        versionName "1.3.84-2"
     }
 
     flavorDimensions "default"

android/app/src/main/AndroidManifest.xml

@@ -70,6 +70,7 @@
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/request"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/new"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/search"/>
+                <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/money2020"/>
 
                 <!-- Staging URLs -->
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
@@ -87,6 +88,7 @@
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/request"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/new"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/search"/>
+                <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/money2020"/>
             </intent-filter>
         </activity>
 

android/app/src/main/java/com/expensify/chat/bootsplash/BootSplashDialog.java

@@ -6,6 +6,7 @@
 import android.view.Window;
 import android.view.WindowManager.LayoutParams;
 import androidx.annotation.NonNull;
+import com.expensify.chat.R;
 
 public class BootSplashDialog extends Dialog {
 
@@ -26,6 +27,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
     if (window != null) {
       window.setLayout(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+
+      if (BootSplashModule.isSamsungOneUI4()) {
+        window.setBackgroundDrawableResource(R.drawable.bootsplash_samsung_oneui_4);
+      }
     }
 
     super.onCreate(savedInstanceState);

android/app/src/main/java/com/expensify/chat/bootsplash/BootSplashModule.java

@@ -23,6 +23,7 @@
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.PixelUtil;
+import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Timer;
@@ -47,6 +48,19 @@ public String getName() {
     return NAME;
   }
 
+  // From https://stackoverflow.com/a/61062773
+  public static boolean isSamsungOneUI4() {
+    String name = "SEM_PLATFORM_INT";
+
+    try {
+      Field field = Build.VERSION.class.getDeclaredField(name);
+      int version = (field.getInt(null) - 90000) / 10000;
+      return version == 4;
+    } catch (Exception ignored) {
+      return false;
+    }
+  }
+
   @Override
   public Map<String, Object> getConstants() {
     final HashMap<String, Object> constants = new HashMap<>();
@@ -61,6 +75,7 @@ public Map<String, Object> getConstants() {
             ? Math.round(PixelUtil.toDIPFromPixel(resources.getDimensionPixelSize(heightResId)))
             : 0;
 
+    constants.put("logoSizeRatio", isSamsungOneUI4() ? 0.5 : 1);
     constants.put("navigationBarHeight", height);
     return constants;
   }

android/app/src/main/res/drawable/bootsplash_samsung_oneui_4.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:opacity="opaque">
+    <item android:gravity="fill">
+        <color android:color="?attr/windowSplashScreenBackground" />
+    </item>
+
+    <!-- There's an issue with logo size on Samsung OneUI v4
+         We need to render it 2 times smaller (288 / 2 = 144) -->
+    <item
+        tools:ignore="UnusedAttribute"
+        android:drawable="?windowSplashScreenAnimatedIcon"
+        android:gravity="center"
+        android:width="144dp"
+        android:height="144dp" />
+</layer-list>

android/app/src/main/res/values/styles.xml

@@ -72,7 +72,7 @@
 
     <style name="BootTheme" parent="Theme.SplashScreen">
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="windowSplashScreenAnimatedIcon">@mipmap/bootsplash_logo</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/bootsplash_logo</item>
         <item name="windowSplashScreenBackground">@color/bootsplash_background</item>
     </style>