Merge remote-tracking branch 'exfy/main' into fix-mark-as-paid-double-trigger

getusha · getusha · commit 45e85e5c5ff7 · 2025-08-05T16:42:39.000+03:00
diff --git a/Mobile-Expensify b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 3ddc4b034646a3a3dfd1393f29a6fd9bc3c339c4
+Subproject commit 63c05eecd00ef5ca4b2042dc084286fcd7231db6
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009018902
-        versionName "9.1.89-2"
+        versionCode 1009018903
+        versionName "9.1.89-3"
         // 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"
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
diff --git a/desktop/package.json b/desktop/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "electron-context-menu": "^2.3.0",
     "electron-log": "^4.4.8",
-    "electron-updater": "^6.6.5",
+    "electron-updater": "^6.6.6",
     "mime-types": "^2.1.35",
     "node-machine-id": "^1.1.12"
   },
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.89.2</string>
+	<string>9.1.89.3</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.89</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.89.2</string>
+	<string>9.1.89.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.89</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.89.2</string>
+	<string>9.1.89.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.1.89-2",
+  "version": "9.1.89-3",
   "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.",
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -9818,10 +9818,6 @@ function canLeaveChat(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, isRe
         return true;
     }
 
-    if (isMoneyRequestReport(report) && currentUserAccountID !== report?.managerID && currentUserAccountID !== report?.ownerAccountID && !isPolicyAdminPolicyUtils(policy)) {
-        return true;
-    }
-
     if (isPublicRoom(report) && isAnonymousUserSession()) {
         return false;
     }
diff --git a/tests/perf-test/ReportActionCompose.perf-test.tsx b/tests/perf-test/ReportActionCompose.perf-test.tsx
@@ -21,14 +21,19 @@ jest.mock('@gorhom/portal');
 jest.mock('react-native-reanimated', () => ({
     ...jest.requireActual<typeof Animated>('react-native-reanimated/mock'),
     useAnimatedRef: jest.fn(),
-    LayoutAnimationConfig: () => {
-        return ({children}: {children: React.ReactNode}) => children;
-    },
+    LayoutAnimationConfig: ({children}: {children: React.ReactNode}) => children,
+    Keyframe: jest.fn().mockImplementation(() => ({
+        duration: jest.fn().mockReturnThis(),
+        delay: jest.fn().mockReturnThis(),
+        easing: jest.fn().mockReturnThis(),
+        withCallback: jest.fn().mockReturnThis(),
+    })),
 }));
 
 jest.mock('../../src/libs/Navigation/Navigation', () => ({
     navigate: jest.fn(),
     getReportRHPActiveRoute: jest.fn(),
+    isTopmostRouteModalScreen: jest.fn(() => false),
 }));
 
 jest.mock('@react-navigation/native', () => {
diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
@@ -4550,80 +4550,6 @@ describe('ReportUtils', () => {
 
             expect(canLeaveChat(report, reportPolicy)).toBe(true);
         });
-
-        describe('when the report is a money report', () => {
-            it('should return false for the owner of the report', async () => {
-                const report: Report = {
-                    ...createRandomReport(1),
-                    chatType: undefined,
-                    type: CONST.REPORT.TYPE.IOU,
-                    ownerAccountID: currentUserAccountID,
-                };
-
-                await Onyx.set(ONYXKEYS.SESSION, {email: currentUserEmail, accountID: currentUserAccountID});
-
-                const reportPolicy: Policy = {
-                    ...createRandomPolicy(1),
-                    role: CONST.POLICY.ROLE.USER,
-                };
-
-                expect(canLeaveChat(report, reportPolicy)).toBe(false);
-            });
-
-            it('should return false for the manager of the report', async () => {
-                const report: Report = {
-                    ...createRandomReport(1),
-                    chatType: undefined,
-                    type: CONST.REPORT.TYPE.IOU,
-                    managerID: currentUserAccountID,
-                };
-
-                await Onyx.set(ONYXKEYS.SESSION, {email: currentUserEmail, accountID: currentUserAccountID});
-
-                const reportPolicy: Policy = {
-                    ...createRandomPolicy(1),
-                    role: CONST.POLICY.ROLE.USER,
-                };
-
-                expect(canLeaveChat(report, reportPolicy)).toBe(false);
-            });
-
-            it('should return false for the admin of the policy', async () => {
-                const report: Report = {
-                    ...createRandomReport(1),
-                    chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
-                    type: CONST.REPORT.TYPE.EXPENSE,
-                };
-
-                await Onyx.set(ONYXKEYS.SESSION, {email: currentUserEmail, accountID: currentUserAccountID});
-
-                const reportPolicy: Policy = {
-                    ...createRandomPolicy(1),
-                    role: CONST.POLICY.ROLE.ADMIN,
-                };
-
-                expect(canLeaveChat(report, reportPolicy)).toBe(false);
-            });
-
-            it('should return true for the invited user', async () => {
-                const report: Report = {
-                    ...createRandomReport(1),
-                    chatType: undefined,
-                    type: CONST.REPORT.TYPE.IOU,
-                    ownerAccountID: 1,
-                    managerID: 2,
-                };
-
-                await Onyx.set(ONYXKEYS.SESSION, {email: currentUserEmail, accountID: currentUserAccountID});
-
-                const reportPolicy: Policy = {
-                    ...createRandomPolicy(1),
-                    role: CONST.POLICY.ROLE.USER,
-                };
-
-                expect(canLeaveChat(report, reportPolicy)).toBe(true);
-            });
-        });
     });
 
     describe('canJoinChat', () => {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "new.expensify",`
`3`		`- "version": "9.1.89-2",`
	`3`	`+ "version": "9.1.89-3",`
`4`	`4`	`"author": "Expensify, Inc.",`
`5`	`5`	`"homepage": "https://new.expensify.com",`
`6`	`6`	`"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",`
Original file line number	Diff line number	Diff line change
`@@ -9818,10 +9818,6 @@ function canLeaveChat(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, isRe`
`9818`	`9818`	`return true;`
`9819`	`9819`	`}`
`9820`	`9820`
`9821`		`- if (isMoneyRequestReport(report) && currentUserAccountID !== report?.managerID && currentUserAccountID !== report?.ownerAccountID && !isPolicyAdminPolicyUtils(policy)) {`
`9822`		`- return true;`
`9823`		`- }`
`9824`		`-`
`9825`	`9821`	`if (isPublicRoom(report) && isAnonymousUserSession()) {`
`9826`	`9822`	`return false;`
`9827`	`9823`	`}`