Resolve merge conflict by incorporating both suggestions

.github/actions/composite/buildAndroidE2EAPK/action.yml

@@ -51,14 +51,13 @@ runs:
     - uses: Expensify/App/.github/actions/composite/setupNode@main
 
     - name: Setup Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: "oracle"
         java-version: "17"
 
-    - uses: ruby/setup-ruby@v1.187.0
+    - uses: ruby/setup-ruby@v1.190.0
       with:
-        ruby-version: "2.7"
         bundler-cache: true
 
     - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef

.github/scripts/verifyRedirect.sh

@@ -32,6 +32,12 @@ while read -r line; do
     SOURCE_URL=${LINE_PARTS[0]}
     DEST_URL=${LINE_PARTS[1]}
 
+    # Make sure that the source and destination are not identical
+    if [[ "$SOURCE_URL" == "$DEST_URL" ]]; then
+        error "Source and destination URLs are identical: $SOURCE_URL"
+        exit 1
+    fi
+
     # Make sure the format of the line is as expected.
     if [[ "${#LINE_PARTS[@]}" -gt 2 ]]; then
         error "Found a line with more than one comma: $line"

.github/workflows/platformDeploy.yml

@@ -54,15 +54,14 @@ jobs:
         uses: ./.github/actions/composite/setupNode
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'oracle'
           java-version: '17'
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.187.0
+        uses: ruby/setup-ruby@v1.190.0
         with:
-          ruby-version: '2.7'
           bundler-cache: true
 
       - name: Decrypt keystore
@@ -186,9 +185,8 @@ jobs:
         uses: ./.github/actions/composite/setupNode
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.187.0
+        uses: ruby/setup-ruby@v1.190.0
         with:
-          ruby-version: '2.7'
           bundler-cache: true
 
       - name: Cache Pod dependencies

.github/workflows/testBuild.yml

@@ -81,15 +81,14 @@ jobs:
         uses: ./.github/actions/composite/setupNode
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'oracle'
           java-version: '17'
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.187.0
+        uses: ruby/setup-ruby@v1.190.0
         with:
-          ruby-version: '2.7'
           bundler-cache: true
 
       - name: Decrypt keystore
@@ -161,9 +160,8 @@ jobs:
         run: sudo xcode-select -switch /Applications/Xcode_15.2.0.app
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1.187.0
+        uses: ruby/setup-ruby@v1.190.0
         with:
-          ruby-version: '2.7'
           bundler-cache: true
 
       - name: Cache Pod dependencies

.ruby-version

@@ -0,0 +1 @@
+3.3.4

.storybook/preview.tsx

@@ -9,7 +9,6 @@ import {LocaleContextProvider} from '@src/components/LocaleContextProvider';
 import OnyxProvider from '@src/components/OnyxProvider';
 import {EnvironmentProvider} from '@src/components/withEnvironment';
 import {KeyboardStateProvider} from '@src/components/withKeyboardState';
-import {WindowDimensionsProvider} from '@src/components/withWindowDimensions';
 import ONYXKEYS from '@src/ONYXKEYS';
 import './fonts.css';
 
@@ -22,9 +21,7 @@ Onyx.init({
 
 const decorators = [
     (Story: React.ElementType) => (
-        <ComposeProviders
-            components={[OnyxProvider, LocaleContextProvider, HTMLEngineProvider, SafeAreaProvider, PortalProvider, EnvironmentProvider, KeyboardStateProvider, WindowDimensionsProvider]}
-        >
+        <ComposeProviders components={[OnyxProvider, LocaleContextProvider, HTMLEngineProvider, SafeAreaProvider, PortalProvider, EnvironmentProvider, KeyboardStateProvider]}>
             <Story />
         </ComposeProviders>
     ),

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby ">= 2.6.10"
+ruby ">= 3.3.4"
 
 gem "cocoapods", "= 1.15.2"
 gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'

Gemfile.lock

@@ -299,7 +299,7 @@ DEPENDENCIES
   xcpretty (~> 0)
 
 RUBY VERSION
-   ruby 2.6.10p210
+   ruby 3.3.4p94
 
 BUNDLED WITH
    2.4.19

README.md

@@ -142,14 +142,14 @@ You create this certificate by following the instructions in [`Configuring HTTPS
 3. Install the certificate as CA certificate from the settings. On the Android emulator, this option can be found in Settings > Security > Encryption & Credentials > Install a certificate > CA certificate.
 4. Close the emulator.
 
-Note - If you want to run app on `https://127.0.0.1:8082`, then just install the certificate and use `adb reverse tcp:8082 tcp:8082` on every startup.
+**Note:** If you want to run app on `https://127.0.0.1:8082`, then just install the certificate and use `adb reverse tcp:8082 tcp:8082` on every startup.
 
 #### Android Flow
 1. Run `npm run setupNewDotWebForEmulators android`
 2. Select the emulator you want to run if prompted. (If single emulator is available, then it will open automatically)
 3. Let the script execute till the message `🎉 Done!`.
 
-Note - If you want to run app on `https://dev.new.expensify.com:8082`, then just do the Android flow and use `npm run startAndroidEmulator` to start the Android Emulator every time (It will configure the emulator).
+**Note:** If you want to run app on `https://dev.new.expensify.com:8082`, then just do the Android flow and use `npm run startAndroidEmulator` to start the Android Emulator every time (It will configure the emulator).
 
 
 Possible Scenario:
@@ -392,7 +392,7 @@ In most cases, the code written for this repo should be platform-independent. In
 - Web => `index.website.js`
 - Desktop => `index.desktop.js`
 
-Note that `index.js` should be the default and only platform-specific implementations should be done in their respective files. i.e: If you have mobile-specific implementation in `index.native.js`, then the desktop/web implementation can be contained in a shared `index.js`.
+**Note:** `index.js` should be the default and only platform-specific implementations should be done in their respective files. i.e: If you have mobile-specific implementation in `index.native.js`, then the desktop/web implementation can be contained in a shared `index.js`.
 
 `index.ios.js` and `index.android.js` are used when the app is running natively on respective platforms. These files are not used when users access the app through mobile browsers, but `index.website.js` is used instead. `index.native.js` are for both iOS and Android native apps. `index.native.js` should not be included in the same module as `index.ios.js` or `index.android.js`.
 

__mocks__/react-native.ts

@@ -26,7 +26,6 @@ jest.doMock('react-native', () => {
     type ReactNativeMock = typeof ReactNative & {
         NativeModules: typeof ReactNative.NativeModules & {
             BootSplash: {
-                getVisibilityStatus: typeof BootSplash.getVisibilityStatus;
                 hide: typeof BootSplash.hide;
                 logoSizeRatio: number;
                 navigationBarHeight: number;
@@ -46,7 +45,6 @@ jest.doMock('react-native', () => {
             NativeModules: {
                 ...ReactNative.NativeModules,
                 BootSplash: {
-                    getVisibilityStatus: jest.fn(),
                     hide: jest.fn(),
                     logoSizeRatio: 1,
                     navigationBarHeight: 0,

android/app/build.gradle

@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009002800
-        versionName "9.0.28-0"
+        versionCode 1009002906
+        versionName "9.0.29-6"
         // 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"