merge main

Author: s77rt

.github/workflows/cherryPick.yml

@@ -254,10 +254,11 @@ jobs:
           status: custom
           custom_payload: |
             {
-              "channel": "#deployer",
-              "attachments": [{
-                "color": "#DB4545",
-                "text": "🚨 Cherry-pick to ${{ inputs.TARGET }} has conflicts and requires manual resolution.\nOriginal PR: ${{ inputs.PULL_REQUEST_URL }}\nConflict PR: ${{ steps.createPullRequest.outputs.PR_URL }}"
+              channel: '#deployer',
+              attachments: [{
+                color: "#DB4545",
+                pretext: `<!subteam^S4TJJ3PSL>`,
+                text: "🚨 Cherry-pick to ${{ inputs.TARGET }} has conflicts and requires manual resolution.\nOriginal PR: ${{ inputs.PULL_REQUEST_URL }}\nConflict PR: ${{ steps.createPullRequest.outputs.PR_URL }}"
               }]
             }
         env:

.github/workflows/deploy.yml

@@ -341,7 +341,7 @@ jobs:
     needs: prep
     runs-on: macos-15-xlarge
     env:
-      DEVELOPER_DIR: /Applications/Xcode_16.2.0.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.4.0.app/Contents/Developer
       SHOULD_BUILD_APP: ${{ github.ref == 'refs/heads/staging' || fromJSON(needs.prep.outputs.IS_CHERRY_PICK) }}
     steps:
       - name: Checkout

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009019400
-        versionName "9.1.94-0"
+        versionCode 1009019402
+        versionName "9.1.94-2"
         // 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

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.94.0</string>
+	<string>9.1.94.2</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.94</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.94.0</string>
+	<string>9.1.94.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.94</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.94.0</string>
+	<string>9.1.94.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.1.94-0",
+  "version": "9.1.94-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -46,7 +46,7 @@
     "test:debug": "TZ=utc NODE_OPTIONS='--inspect-brk --experimental-vm-modules' jest --runInBand",
     "perf-test": "NODE_OPTIONS=--experimental-vm-modules npx reassure",
     "typecheck": "NODE_OPTIONS=--max_old_space_size=8192 tsc",
-    "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=260 --cache --cache-location=node_modules/.cache/eslint",
+    "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=259 --cache --cache-location=node_modules/.cache/eslint",
     "lint-changed": "NODE_OPTIONS=--max_old_space_size=8192 ./scripts/lintChanged.sh",
     "lint-watch": "npx eslint-watch --watch --changed",
     "shellcheck": "./scripts/shellCheck.sh",

package-lock.json

@@ -1,6 +1,5 @@
-import {useNavigation, useRoute} from '@react-navigation/native';
 import type {ReactNode} from 'react';
-import React, {Fragment, useEffect, useState} from 'react';
+import React, {Fragment, useState} from 'react';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {getCurrencySymbol} from '@libs/CurrencyUtils';
@@ -38,38 +37,15 @@ type CurrencyPickerProps = {
 
     /** Should show the full page offline view (whenever the user is offline) */
     shouldShowFullPageOfflineView?: boolean;
-
-    /** Should sync picker visibility with navigation params (for modal state restoration) */
-    shouldSyncPickerVisibilityWithNavigation?: boolean;
-
-    /** Should save currency value in navigation params */
-    shouldSaveCurrencyInNavigation?: boolean;
 };
 
-function CurrencyPicker({
-    label,
-    value,
-    errorText,
-    headerContent,
-    excludeCurrencies,
-    disabled = false,
-    shouldShowFullPageOfflineView = false,
-    shouldSyncPickerVisibilityWithNavigation = false,
-    shouldSaveCurrencyInNavigation = false,
-    onInputChange = () => {},
-}: CurrencyPickerProps) {
+function CurrencyPicker({label, value, errorText, headerContent, excludeCurrencies, disabled = false, shouldShowFullPageOfflineView = false, onInputChange = () => {}}: CurrencyPickerProps) {
     const {translate} = useLocalize();
-    const route = useRoute();
-    const navigation = useNavigation();
-    const isPickerVisibleParam = route.params && 'isPickerVisible' in route.params && route.params.isPickerVisible === 'true';
-    const [isPickerVisible, setIsPickerVisible] = useState(isPickerVisibleParam ?? false);
+    const [isPickerVisible, setIsPickerVisible] = useState(false);
     const styles = useThemeStyles();
 
     const hidePickerModal = () => {
         setIsPickerVisible(false);
-        if (shouldSaveCurrencyInNavigation) {
-            Navigation.setParams({currency: value});
-        }
     };
 
     const updateInput = (item: CurrencyListItem) => {
@@ -79,13 +55,6 @@ function CurrencyPicker({
 
     const BlockingComponent = shouldShowFullPageOfflineView ? FullPageOfflineBlockingView : Fragment;
 
-    useEffect(() => {
-        if (!shouldSyncPickerVisibilityWithNavigation) {
-            return;
-        }
-        Navigation.setParams({isPickerVisible: String(isPickerVisible)});
-    }, [isPickerVisible, navigation, shouldSyncPickerVisibilityWithNavigation]);
-
     return (
         <>
             <MenuItemWithTopDescription