Merge branch 'main' of github.com:callstack-internal/Expensify-App in…

…to fix/attempt-to-fix-cycular-dependecies-1

.github/workflows/createNewVersion.yml

@@ -156,6 +156,7 @@ jobs:
           ANDROID_MANIFEST_FILE="Android/AndroidManifest.xml"
           IOS_INFO_PLIST_FILE="iOS/Expensify/Expensify-Info.plist"
           IOS_SHARE_EXTENSION_PLIST_FILE="iOS/SmartScanExtension/Info.plist"
+          IOS_NOTIFICATION_EXTENSION_PLIST_FILE="iOS/NotificationServiceExtension/Info.plist"
           JS_CONFIG_FILE="app/config/config.json" 
           
           # Update Android HybridApp Version
@@ -167,6 +168,8 @@ jobs:
           /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $FULL_APP_VERSION" $IOS_INFO_PLIST_FILE
           /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $SHORT_APP_VERSION" $IOS_SHARE_EXTENSION_PLIST_FILE
           /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $FULL_APP_VERSION" $IOS_SHARE_EXTENSION_PLIST_FILE
+          /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $SHORT_APP_VERSION" $IOS_NOTIFICATION_EXTENSION_PLIST_FILE
+          /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $FULL_APP_VERSION" $IOS_NOTIFICATION_EXTENSION_PLIST_FILE
           
           # Update JS HybridApp Version
           sed -i .bak -E  "s/\"version\": \"([0-9\.]*)\"/\"version\": \"$FULL_APP_VERSION\"/" $JS_CONFIG_FILE
@@ -179,7 +182,8 @@ jobs:
             ./Android/AndroidManifest.xml \
             ./app/config/config.json \
             ./iOS/Expensify/Expensify-Info.plist\
-            ./iOS/SmartScanExtension/Info.plist
+            ./iOS/SmartScanExtension/Info.plist \
+            ./iOS/NotificationServiceExtension/Info.plist
           git commit -m "Update version to ${{ needs.createNewVersion.outputs.NEW_VERSION }}"
 
       - name: Update main branch

.storybook/main.ts

@@ -1,4 +1,4 @@
-import type {StorybookConfig} from '@storybook/types';
+import type {StorybookConfig} from 'storybook/internal/types';
 
 const main: StorybookConfig = {
     stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],

.storybook/preview.tsx

@@ -1,8 +1,8 @@
 import {PortalProvider} from '@gorhom/portal';
-import type {Parameters} from '@storybook/types';
 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 ComposeProviders from '@src/components/ComposeProviders';
 import HTMLEngineProvider from '@src/components/HTMLEngineProvider';
 import {LocaleContextProvider} from '@src/components/LocaleContextProvider';

android/app/build.gradle

@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009007201
-        versionName "9.0.72-1"
+        versionCode 1009007306
+        versionName "9.0.73-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"

docs/articles/new-expensify/travel/Configure-travel-policy-and-preferences.md

@@ -71,6 +71,13 @@ Flight preferences include multiple sections with different settings:
 - **Maximum price:** Set a daily price cap per car (not including taxes and fees).
 - **Out of policy reason codes:** If enabled, travelers will be asked to enter a reason code for an out-of-policy car booking. This gives them a way to provide context for why the booking is still being placed. You can also modify the reason codes by clicking Manage reason codes below the toggle.
 
+# Rail
+
+- **Maximum price:** Set a maximum price per booking or customise by rail trip duration.
+- **Highest travel class:** Set a maximum travel class per booking or customise by rail trip duration.
+- **Booking window:** Add a time limit to prevent employees from booking less than a certain number of days in advance to prohibit bookings too close to the journey time.
+- **Out-of-policy reason code for rail:** If enabled, travelers will be asked to enter a reason code for an out-of-policy rail booking. This gives them a way to provide context for why the booking is still being placed. You can also modify the reason codes by clicking Manage reason codes below the toggle.
+
 # FAQ
 
 How do travel policy rules interact with Expensify’s [approval flows](https://help.expensify.com/articles/expensify-classic/travel/Approve-travel-expenses)?

docs/assets/js/selector.js

@@ -1,5 +1,6 @@
 function syncSelectors(selectedIndex) {
     const allSelects = document.querySelectorAll('select');
+    // eslint-disable-next-line @typescript-eslint/prefer-for-of
     for (let i = 0; i < allSelects.length; i++) {
         allSelects[i].selectedIndex = selectedIndex;
     }
@@ -19,13 +20,15 @@ function selectOption(select) {
     allOptions.forEach((option) => {
         if (option.value === selectedValue) {
             const toShow = document.getElementsByClassName(option.value);
+            // eslint-disable-next-line @typescript-eslint/prefer-for-of
             for (let i = 0; i < toShow.length; i++) {
                 toShow[i].classList.remove('hidden');
             }
             return;
         }
 
         const toHide = document.getElementsByClassName(option.value);
+        // eslint-disable-next-line @typescript-eslint/prefer-for-of
         for (let i = 0; i < toHide.length; i++) {
             toHide[i].classList.add('hidden');
         }

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.72</string>
+	<string>9.0.73</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.72.1</string>
+	<string>9.0.73.6</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.72</string>
+	<string>9.0.73</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.72.1</string>
+	<string>9.0.73.6</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.72</string>
+	<string>9.0.73</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.72.1</string>
+	<string>9.0.73.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>