Merge branch 'main' into @zfurtak/selectionlist-refactor

Author: zfurtak

.github/workflows/remote-build-android.yml

@@ -2,6 +2,11 @@ name: Remote Build Android
 
 on:
   workflow_dispatch:
+    inputs:
+      mobile_expensify_pr:
+        description: 'Mobile-Expensify PR number to use for hybrid build'
+        required: false
+        type: string
   push:
     branches-ignore: [staging, production, cherry-pick-*]
     paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
@@ -35,6 +40,14 @@ jobs:
         with:
           IS_HYBRID_BUILD: ${{ matrix.is_hybrid_build && 'true' || 'false' }}
 
+      - name: Checkout specific Mobile-Expensify PR
+        if: ${{ matrix.is_hybrid_build && github.event.inputs.mobile_expensify_pr }}
+        run: |
+          cd Mobile-Expensify
+          git fetch origin pull/${{ github.event.inputs.mobile_expensify_pr }}/head:pr-${{ github.event.inputs.mobile_expensify_pr }}
+          git checkout pr-${{ github.event.inputs.mobile_expensify_pr }}
+          echo "Checked out Mobile-Expensify PR #${{ github.event.inputs.mobile_expensify_pr }}"
+
       - name: RNEF Remote Build - Android
         # rnef v2
         uses: callstackincubator/android@d9a81f860e436ff2971323990244e32830dcabd1

.github/workflows/remote-build-ios.yml

@@ -2,6 +2,11 @@ name: Remote Build iOS
 
 on:
   workflow_dispatch:
+    inputs:
+      mobile_expensify_pr:
+        description: 'Mobile-Expensify PR number to use for hybrid build'
+        required: false
+        type: string
   push:
     branches-ignore: [staging, production, cherry-pick-*]
     paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
@@ -39,6 +44,14 @@ jobs:
         with:
           IS_HYBRID_BUILD: ${{ matrix.is_hybrid_build && 'true' || 'false' }}
 
+      - name: Checkout specific Mobile-Expensify PR
+        if: ${{ matrix.is_hybrid_build && github.event.inputs.mobile_expensify_pr }}
+        run: |
+          cd Mobile-Expensify
+          git fetch origin pull/${{ github.event.inputs.mobile_expensify_pr }}/head:pr-${{ github.event.inputs.mobile_expensify_pr }}
+          git checkout pr-${{ github.event.inputs.mobile_expensify_pr }}
+          echo "Checked out Mobile-Expensify PR #${{ github.event.inputs.mobile_expensify_pr }}"
+
       - name: RNEF Remote Build - iOS
         # rnef v2
         uses: callstackincubator/ios@7847e0676242cefa801cba8ede6736140b7bae91 

.storybook/preview.tsx

@@ -3,12 +3,12 @@ import React from 'react';
 import Onyx from 'react-native-onyx';
 import {SafeAreaProvider} from 'react-native-safe-area-context';
 import type {Parameters} from 'storybook/internal/types';
+import {EnvironmentProvider} from '@components/EnvironmentContext';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import {SearchContextProvider} from '@components/Search/SearchContext';
 import ComposeProviders from '@src/components/ComposeProviders';
 import HTMLEngineProvider from '@src/components/HTMLEngineProvider';
 import {LocaleContextProvider} from '@src/components/LocaleContextProvider';
-import {EnvironmentProvider} from '@src/components/withEnvironment';
 import {KeyboardStateProvider} from '@src/components/withKeyboardState';
 import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009020102
-        versionName "9.2.1-2"
+        versionCode 1009020118
+        versionName "9.2.1-18"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -63,6 +63,7 @@
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/r"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/a"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/settings"/>
+                <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/workspaces"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/details"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/v"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/bank-account"/>
@@ -86,6 +87,7 @@
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/a"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/settings"/>
+                <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/workspaces"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/details"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/v"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/bank-account"/>