Merge pull request #47288 from nkdengineer/fix/46705

thienlnam · web-flow · commit 6aa7adc131ff · 2024-08-14T10:18:48.000-07:00
fix: Individual workspace is in 'Send from' field
diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
@@ -206,8 +206,7 @@ function getPolicy(policyID: string | undefined): OnyxEntry<Policy> {
 // TODO: Use getInvoicePrimaryWorkspace when the invoices screen is ready - https://github.com/Expensify/App/issues/45175.
 function getPrimaryPolicy(activePolicyID?: OnyxEntry<string>): Policy | undefined {
     const activeAdminWorkspaces = PolicyUtils.getActiveAdminWorkspaces(allPolicies);
-    const primaryPolicy: Policy | null | undefined = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID ?? '-1'}`];
-
+    const primaryPolicy: Policy | null | undefined = activeAdminWorkspaces.find((policy) => policy.id === activePolicyID);
     return primaryPolicy ?? activeAdminWorkspaces[0];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -206,8 +206,7 @@ function getPolicy(policyID: string \| undefined): OnyxEntry<Policy> {`
`206`	`206`	`// TODO: Use getInvoicePrimaryWorkspace when the invoices screen is ready - https://github.com/Expensify/App/issues/45175.`
`207`	`207`	`function getPrimaryPolicy(activePolicyID?: OnyxEntry<string>): Policy \| undefined {`
`208`	`208`	`const activeAdminWorkspaces = PolicyUtils.getActiveAdminWorkspaces(allPolicies);`
`209`		- const primaryPolicy: Policy \| null \| undefined = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID ?? '-1'}`];
`210`		`-`
	`209`	`+ const primaryPolicy: Policy \| null \| undefined = activeAdminWorkspaces.find((policy) => policy.id === activePolicyID);`
`211`	`210`	`return primaryPolicy ?? activeAdminWorkspaces[0];`
`212`	`211`	`}`
`213`	`212`