Merge pull request #87660 from hungvu193/fix-664420-part3

Author: dangrous

src/libs/SubscriptionUtils.ts

@@ -529,8 +529,8 @@ function shouldRestrictUserBillableActions(
     return false;
 }
 
-function shouldCalculateBillNewDot(canDowngrade: boolean | undefined, policies: OnyxCollection<Policy>): boolean {
-    return (canDowngrade ?? false) && getOwnedPaidPolicies(policies, deprecatedCurrentUserAccountID).length === 1;
+function shouldCalculateBillNewDot(currentUserAccountID: number, canDowngrade: boolean | undefined, policies: OnyxCollection<Policy>): boolean {
+    return (canDowngrade ?? false) && getOwnedPaidPolicies(policies, currentUserAccountID).length === 1;
 }
 
 function getSubscriptionPrice(

src/pages/workspace/WorkspaceOverviewPage.tsx

@@ -340,7 +340,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa
             return;
         }
 
-        if (shouldCalculateBillNewDot(canDowngrade, policies)) {
+        if (shouldCalculateBillNewDot(currentUserPersonalDetails.accountID, canDowngrade, policies)) {
             setIsDeletingPaidWorkspace(true);
             calculateBillNewDot();
             return;
@@ -460,7 +460,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa
                 onSelected: onDeleteWorkspace,
                 disabled: isLoadingBill,
                 shouldShowLoadingSpinnerIcon: isLoadingBill,
-                shouldCloseModalOnSelect: !shouldCalculateBillNewDot(account?.canDowngrade, policies) || wouldBlockDeletion,
+                shouldCloseModalOnSelect: !shouldCalculateBillNewDot(currentUserPersonalDetails.accountID, account?.canDowngrade, policies) || wouldBlockDeletion,
             });
         }
         const isCurrentUserAdmin = policy?.employeeList?.[currentUserPersonalDetails?.login ?? '']?.role === CONST.POLICY.ROLE.ADMIN;

src/pages/workspace/WorkspacesListPage.tsx

@@ -307,7 +307,7 @@ function WorkspacesListPage() {
         return translate('common.leaveWorkspaceConfirmation');
     };
 
-    const shouldCalculateBillNewDot: boolean = shouldCalculateBillNewDotFn(account?.canDowngrade, policies);
+    const shouldCalculateBillNewDot: boolean = shouldCalculateBillNewDotFn(currentUserPersonalDetails.accountID, account?.canDowngrade, policies);
 
     const resetLoadingSpinnerIconIndex = () => {
         setLoadingSpinnerIconIndex(null);

tests/unit/SubscriptionUtilsTest.ts

@@ -1348,9 +1348,9 @@ describe('SubscriptionUtils', () => {
                 },
             };
             // Test with canDowngrade as false (explicitly)
-            expect(shouldCalculateBillNewDot(false, policies)).toBeFalsy();
+            expect(shouldCalculateBillNewDot(testUserAccountID, false, policies)).toBeFalsy();
             // Test with canDowngrade as undefined (defaults to false in the function signature)
-            expect(shouldCalculateBillNewDot(undefined, policies)).toBeFalsy();
+            expect(shouldCalculateBillNewDot(testUserAccountID, undefined, policies)).toBeFalsy();
         });
 
         it('should return false if the user owns zero paid policies', () => {
@@ -1362,7 +1362,7 @@ describe('SubscriptionUtils', () => {
                     type: CONST.POLICY.TYPE.PERSONAL,
                 },
             };
-            expect(shouldCalculateBillNewDot(true, policies)).toBeFalsy();
+            expect(shouldCalculateBillNewDot(testUserAccountID, true, policies)).toBeFalsy();
         });
 
         it('should return false if the user owns more than one paid policy', () => {
@@ -1378,7 +1378,7 @@ describe('SubscriptionUtils', () => {
                     type: CONST.POLICY.TYPE.TEAM,
                 },
             };
-            expect(shouldCalculateBillNewDot(true, policies)).toBeFalsy();
+            expect(shouldCalculateBillNewDot(testUserAccountID, true, policies)).toBeFalsy();
         });
 
         it('should return true if canDowngrade is true and the user owns exactly one paid policy', () => {
@@ -1395,7 +1395,7 @@ describe('SubscriptionUtils', () => {
                     type: CONST.POLICY.TYPE.PERSONAL,
                 },
             };
-            expect(shouldCalculateBillNewDot(true, policies)).toBeTruthy();
+            expect(shouldCalculateBillNewDot(testUserAccountID, true, policies)).toBeTruthy();
         });
 
         it('should return false if the user owns exactly one paid policy but is not the owner', () => {
@@ -1408,7 +1408,7 @@ describe('SubscriptionUtils', () => {
                     type: CONST.POLICY.TYPE.CORPORATE,
                 },
             };
-            expect(shouldCalculateBillNewDot(true, policies)).toBeFalsy();
+            expect(shouldCalculateBillNewDot(testUserAccountID, true, policies)).toBeFalsy();
         });
 
         it('should return true if canDowngrade is true and the single paid policy is a team policy', () => {
@@ -1419,7 +1419,7 @@ describe('SubscriptionUtils', () => {
                     type: CONST.POLICY.TYPE.TEAM,
                 },
             };
-            expect(shouldCalculateBillNewDot(true, policies)).toBeTruthy();
+            expect(shouldCalculateBillNewDot(testUserAccountID, true, policies)).toBeTruthy();
         });
 
         it('should return true if canDowngrade is true and the single paid policy is a corporate policy', () => {
@@ -1430,11 +1430,11 @@ describe('SubscriptionUtils', () => {
                     type: CONST.POLICY.TYPE.CORPORATE,
                 },
             };
-            expect(shouldCalculateBillNewDot(true, policies)).toBeTruthy();
+            expect(shouldCalculateBillNewDot(testUserAccountID, true, policies)).toBeTruthy();
         });
 
         it('should return false when empty policies collection is passed', () => {
-            expect(shouldCalculateBillNewDot(true, {})).toBeFalsy();
+            expect(shouldCalculateBillNewDot(testUserAccountID, true, {})).toBeFalsy();
         });
     });