From 2b6581ca07343a7173cbca5595e7ae4e1c3200b2 Mon Sep 17 00:00:00 2001 From: Samran Ahmed Date: Fri, 4 Jul 2025 19:24:18 +0500 Subject: [PATCH 1/3] get guideCalendarLink from account.guideDetails --- src/pages/ProfilePage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ProfilePage.tsx b/src/pages/ProfilePage.tsx index 5c1164f7ce25..d920cb8bb8a0 100755 --- a/src/pages/ProfilePage.tsx +++ b/src/pages/ProfilePage.tsx @@ -71,7 +71,7 @@ function ProfilePage({route}: ProfilePageProps) { const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false}); const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true}); const isDebugModeEnabled = !!account?.isDebugModeEnabled; - const guideCalendarLink = account?.guideCalendarLink ?? ''; + const guideCalendarLink = account?.guideDetails?.calendarLink ?? ''; const accountID = Number(route.params?.accountID ?? CONST.DEFAULT_NUMBER_ID); const isCurrentUser = session?.accountID === accountID; From 93e8693cf72830f423b91bbf68ebfcdd12ba912c Mon Sep 17 00:00:00 2001 From: Samran Ahmed Date: Sat, 5 Jul 2025 15:43:24 +0500 Subject: [PATCH 2/3] chore: remove getAssignedSupportData since openApp fetches all required support data --- src/libs/API/parameters/GetAssignedSupportDataParams.ts | 5 ----- src/libs/API/parameters/index.ts | 1 - src/libs/API/types.ts | 2 -- src/libs/actions/Policy/Policy.ts | 9 --------- src/pages/workspace/accounting/PolicyAccountingPage.tsx | 8 -------- src/types/onyx/Account.ts | 3 --- 6 files changed, 28 deletions(-) delete mode 100644 src/libs/API/parameters/GetAssignedSupportDataParams.ts diff --git a/src/libs/API/parameters/GetAssignedSupportDataParams.ts b/src/libs/API/parameters/GetAssignedSupportDataParams.ts deleted file mode 100644 index dcdc4bf99b0c..000000000000 --- a/src/libs/API/parameters/GetAssignedSupportDataParams.ts +++ /dev/null @@ -1,5 +0,0 @@ -type GetAssignedSupportDataParams = { - policyID: string; -}; - -export default GetAssignedSupportDataParams; diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts index a45e243a3b57..b981dfb4df8a 100644 --- a/src/libs/API/parameters/index.ts +++ b/src/libs/API/parameters/index.ts @@ -296,7 +296,6 @@ export type {default as ExportReportCSVParams} from './ExportReportCSVParams'; export type {default as UpdateExpensifyCardLimitParams} from './UpdateExpensifyCardLimitParams'; export type {CreateWorkspaceApprovalParams, UpdateWorkspaceApprovalParams, RemoveWorkspaceApprovalParams} from './WorkspaceApprovalParams'; export type {default as StartIssueNewCardFlowParams} from './StartIssueNewCardFlowParams'; -export type {default as GetAssignedSupportDataParams} from './GetAssignedSupportDataParams'; export type {default as ConnectAsDelegateParams} from './ConnectAsDelegateParams'; export type {default as SetPolicyRulesEnabledParams} from './SetPolicyRulesEnabledParams'; export type {default as SetPolicyDefaultReportTitleParams} from './SetPolicyDefaultReportTitle'; diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index 68d1504d5c75..cf1df61249ab 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -1062,7 +1062,6 @@ const READ_COMMANDS = { OPEN_DRAFT_DISTANCE_EXPENSE: 'OpenDraftDistanceExpense', START_ISSUE_NEW_CARD_FLOW: 'StartIssueNewCardFlow', OPEN_CARD_DETAILS_PAGE: 'OpenCardDetailsPage', - GET_ASSIGNED_SUPPORT_DATA: 'GetAssignedSupportData', GET_CORPAY_ONBOARDING_FIELDS: 'GetCorpayOnboardingFields', OPEN_WORKSPACE_PLAN_PAGE: 'OpenWorkspacePlanPage', OPEN_SECURITY_SETTINGS_PAGE: 'OpenSecuritySettingsPage', @@ -1138,7 +1137,6 @@ type ReadCommandParameters = { [READ_COMMANDS.OPEN_DRAFT_DISTANCE_EXPENSE]: null; [READ_COMMANDS.START_ISSUE_NEW_CARD_FLOW]: Parameters.StartIssueNewCardFlowParams; [READ_COMMANDS.OPEN_CARD_DETAILS_PAGE]: Parameters.OpenCardDetailsPageParams; - [READ_COMMANDS.GET_ASSIGNED_SUPPORT_DATA]: Parameters.GetAssignedSupportDataParams; [READ_COMMANDS.GET_CORPAY_ONBOARDING_FIELDS]: Parameters.GetCorpayOnboardingFieldsParams; [READ_COMMANDS.OPEN_WORKSPACE_PLAN_PAGE]: Parameters.OpenWorkspacePlanPageParams; [READ_COMMANDS.OPEN_SECURITY_SETTINGS_PAGE]: null; diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 5fe09c4b6903..ad817bd04270 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -24,7 +24,6 @@ import type { EnablePolicyReportFieldsParams, EnablePolicyTaxesParams, EnablePolicyWorkflowsParams, - GetAssignedSupportDataParams, LeavePolicyParams, OpenDraftWorkspaceRequestParams, OpenPolicyEditCardLimitTypePageParams, @@ -5279,13 +5278,6 @@ function updateInvoiceCompanyWebsite(policyID: string, companyWebsite: string) { API.write(WRITE_COMMANDS.UPDATE_INVOICE_COMPANY_WEBSITE, parameters, {optimisticData, successData, failureData}); } -function getAssignedSupportData(policyID: string) { - const parameters: GetAssignedSupportDataParams = { - policyID, - }; - API.read(READ_COMMANDS.GET_ASSIGNED_SUPPORT_DATA, parameters); -} - /** * Validates user account and returns a list of accessible policies. */ @@ -5512,7 +5504,6 @@ export { updateInvoiceCompanyName, updateInvoiceCompanyWebsite, updateDefaultPolicy, - getAssignedSupportData, downgradeToTeam, getAccessiblePolicies, clearGetAccessiblePoliciesErrors, diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx index d0cc34897b74..a679bc03a6d8 100644 --- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx +++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx @@ -31,7 +31,6 @@ import useThemeStyles from '@hooks/useThemeStyles'; import useThreeDotsAnchorPosition from '@hooks/useThreeDotsAnchorPosition'; import {isAuthenticationError, isConnectionInProgress, isConnectionUnverified, removePolicyConnection, syncConnection} from '@libs/actions/connections'; import {shouldShowQBOReimbursableExportDestinationAccountError} from '@libs/actions/connections/QuickbooksOnline'; -import {getAssignedSupportData} from '@libs/actions/Policy/Policy'; import {isExpensifyCardFullySetUp} from '@libs/CardUtils'; import { areSettingsInErrorFields, @@ -179,13 +178,6 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) { setDateTimeToRelative(''); }, [getDatetimeToRelative, successfulDate]); - useEffect(() => { - if (!policyID) { - return; - } - getAssignedSupportData(policyID); - }, [policyID]); - const calculateAndSetThreeDotsMenuPosition = useCallback(() => { if (shouldUseNarrowLayout) { return Promise.resolve({horizontal: 0, vertical: 0}); diff --git a/src/types/onyx/Account.ts b/src/types/onyx/Account.ts index aa8f5fa0f012..15add2c01ee3 100644 --- a/src/types/onyx/Account.ts +++ b/src/types/onyx/Account.ts @@ -80,9 +80,6 @@ type Account = { /** Is this account having trouble receiving emails? */ hasEmailDeliveryFailure?: boolean; - /** URL to the assigned guide's appointment booking calendar */ - guideCalendarLink?: string; - /** User recovery codes for setting up 2-FA */ recoveryCodes?: string; From b171f9864e79ab994bb2ee998bf04b2788e1c00b Mon Sep 17 00:00:00 2001 From: Samran Ahmed Date: Sat, 5 Jul 2025 16:04:50 +0500 Subject: [PATCH 3/3] refactor: Use policy.chatReportIDAdmins to get updated adminsRoomReportID for each policy --- src/pages/workspace/accounting/PolicyAccountingPage.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx index a679bc03a6d8..3308e6c98669 100644 --- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx +++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx @@ -504,8 +504,8 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) { const [chatTextLink, chatReportID] = useMemo(() => { // If they have an onboarding specialist assigned display the following and link to the #admins room with the setup specialist. - if (account?.adminsRoomReportID) { - return [translate('workspace.accounting.talkYourOnboardingSpecialist'), account?.adminsRoomReportID]; + if (policy?.chatReportIDAdmins) { + return [translate('workspace.accounting.talkYourOnboardingSpecialist'), policy?.chatReportIDAdmins]; } // If not, if they have an account manager assigned display the following and link to the DM with their account manager. @@ -618,7 +618,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) { /> {translate('workspace.accounting.needAnotherAccounting')} - Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(chatReportID))}>{chatTextLink} + Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(String(chatReportID)))}>{chatTextLink} )}