Merge branch 'main' of github.com:margelo/expensify-app-fork into osp…

…/separate-test-runs

.eslintrc.js

@@ -116,7 +116,7 @@ module.exports = {
                     },
                     {
                         selector: ['parameter', 'method'],
-                        format: ['camelCase'],
+                        format: ['camelCase', 'PascalCase'],
                     },
                 ],
                 '@typescript-eslint/ban-types': [

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

@@ -298,9 +298,6 @@ 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,9 +998,6 @@ 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,9 +961,6 @@ 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,9 +148,6 @@ 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,9 +118,6 @@ 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/workflows/platformDeploy.yml

@@ -104,6 +104,13 @@ jobs:
           name: android-sourcemap
           path: android/app/build/generated/sourcemaps/react/release/*.map
 
+      - name: Upload Android version to GitHub artifacts
+        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: app-production-release.aab
+          path: android/app/build/outputs/bundle/productionRelease/app-production-release.aab
+
       - name: Upload Android version to Browser Stack
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: curl -u "$BROWSERSTACK" -X POST "https://api-cloud.browserstack.com/app-live/upload" -F "file=@./android/app/build/outputs/bundle/productionRelease/app-production-release.aab"
@@ -238,6 +245,13 @@ jobs:
           name: ios-sourcemap
           path: main.jsbundle.map
 
+      - name: Upload iOS version to GitHub artifacts
+        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: New Expensify.ipa
+          path: /Users/runner/work/App/App/New Expensify.ipa
+
       - name: Upload iOS version to Browser Stack
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: curl -u "$BROWSERSTACK" -X POST "https://api-cloud.browserstack.com/app-live/upload" -F "file=@/Users/runner/work/App/App/New Expensify.ipa"

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

@@ -80,6 +80,10 @@
                         "/": "/search/*",
                         "comment": "Search"
                     },
+                    {
+                        "/": "/send/*",
+                        "comment": "Send money"
+                    },
                     {
                         "/": "/money2020/*",
                         "comment": "Money 2020"

__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 1001038401
-        versionName "1.3.84-1"
+        versionCode 1001038601
+        versionName "1.3.86-1"
     }
 
     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="/send"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/money2020"/>
 
                 <!-- Staging URLs -->
@@ -88,6 +89,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="/send"/>
                 <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>
 

docs/Gemfile.lock

@@ -256,6 +256,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-darwin-20
   x86_64-darwin-21
 

docs/_sass/_main.scss

@@ -371,9 +371,26 @@ button {
             flex-wrap: wrap;
         }
 
+        h1 {
+            font-size: 1.5em;
+            padding: 20px 0 12px 0;
+        }
+
+        h2 {
+            font-size: 1.125em;
+            font-weight: 500;
+            font-family: "ExpensifyNewKansas", "Helvetica Neue", "Helvetica", Arial, sans-serif;
+        }
+
+        h3 {
+            font-size: 1em;
+            font-family: "ExpensifyNeue", "Helvetica Neue", "Helvetica", Arial, sans-serif;
+        }
+
         h2,
         h3 {
-            font-family: "ExpensifyNewKansas", "Helvetica Neue", "Helvetica", Arial, sans-serif;
+            margin: 0;
+            padding: 12px 0 12px 0;
         }
 
         blockquote {