Skip to content

Update the policy creation flow to enable company cards by default #58599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mountiny merged 5 commits into from
Mar 18, 2025
Merged

Update the policy creation flow to enable company cards by default #58599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd237cf
Update the policy creation flow to enable company cards by default
mountiny Mar 17, 2025
abf598d
Make sure to disable the button to add a feed if workspaceAccountID i…
mountiny Mar 17, 2025
7f92518
Make sure the button is disabled
mountiny Mar 17, 2025
c2c93a5
Update the submodule
mountiny Mar 17, 2025
8dfcfb9
Merge branch 'main' into vit-makeCompanyCardsDefault
mountiny Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/components/FeatureList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ type FeatureListProps = {

/** Custom content to display in the footer */
footer?: ReactNode;

/** Whether the button should be disabled */
isButtonDisabled?: boolean;
};

function FeatureList({
Expand All @@ -72,6 +75,7 @@ function FeatureList({
titleStyles,
contentPaddingOnLargeScreens,
footer,
isButtonDisabled = false,
}: FeatureListProps) {
const styles = useThemeStyles();
const {translate} = useLocalize();
Expand Down Expand Up @@ -117,6 +121,7 @@ function FeatureList({
accessibilityLabel={ctaAccessibilityLabel}
style={styles.w100}
success
isDisabled={isButtonDisabled}
large
/>
)}
Expand Down
8 changes: 8 additions & 0 deletions src/libs/actions/Policy/Policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1731,6 +1731,8 @@ function createDraftInitialWorkspace(policyOwnerEmail = '', policyName = '', pol
ownerAccountID: sessionAccountID,
isPolicyExpenseChatEnabled: true,
areCategoriesEnabled: true,
areCompanyCardsEnabled: true,
areExpensifyCardsEnabled: false,

@mountiny mountiny Mar 17, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of these are TEAM only, you cannot create Control policy in NewDot now. Lets be explicit about the Expensify card settings too

outputCurrency,
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
customUnits,
Expand Down Expand Up @@ -1836,11 +1838,13 @@ function buildPolicyData(
},
customUnits,
areCategoriesEnabled: true,
areCompanyCardsEnabled: true,
areTagsEnabled: false,
areDistanceRatesEnabled: false,
areWorkflowsEnabled: shouldEnableWorkflowsByDefault,
areReportFieldsEnabled: false,
areConnectionsEnabled: false,
areExpensifyCardsEnabled: false,
employeeList: {
[sessionEmail]: {
role: CONST.POLICY.ROLE.ADMIN,
Expand Down Expand Up @@ -2167,11 +2171,13 @@ function createDraftWorkspace(policyOwnerEmail = '', makeMeAdmin = false, policy
},
customUnits,
areCategoriesEnabled: true,
areCompanyCardsEnabled: true,
areTagsEnabled: false,
areDistanceRatesEnabled: false,
areWorkflowsEnabled: false,
areReportFieldsEnabled: false,
areConnectionsEnabled: false,
areExpensifyCardsEnabled: false,
employeeList: {
[sessionEmail]: {
role: CONST.POLICY.ROLE.ADMIN,
Expand Down Expand Up @@ -2480,11 +2486,13 @@ function createWorkspaceFromIOUPayment(iouReport: OnyxEntry<Report>): WorkspaceF
},
customUnits,
areCategoriesEnabled: true,
areCompanyCardsEnabled: true,
areTagsEnabled: false,
areDistanceRatesEnabled: false,
areWorkflowsEnabled: false,
areReportFieldsEnabled: false,
areConnectionsEnabled: false,
areExpensifyCardsEnabled: false,
employeeList: {
[sessionEmail]: {
role: CONST.POLICY.ROLE.ADMIN,
Expand Down
2 changes: 2 additions & 0 deletions src/pages/workspace/companyCards/WorkspaceCompanyCardPageEmptyState.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ function WorkspaceCompanyCardPageEmptyState({policy}: WithPolicyAndFullscreenLoa
const [isNoDelegateAccessMenuVisible, setIsNoDelegateAccessMenuVisible] = useState(false);
const [allWorkspaceCards] = useOnyx(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST);
const shouldShowExpensifyCardPromotionBanner = !hasIssuedExpensifyCard(policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID, allWorkspaceCards);
const workspaceAccountID = policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID;

@mountiny mountiny Mar 17, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not optimistically created, so to make sure we dont allow admins to run to weird bugs we would disable the button if the workspaceAccountID does not exist


const handleCtaPress = useCallback(() => {
if (!policy?.id) {
Expand Down Expand Up @@ -70,6 +71,7 @@ function WorkspaceCompanyCardPageEmptyState({policy}: WithPolicyAndFullscreenLoa
illustrationStyle={styles.emptyStateCardIllustration}
illustrationContainerStyle={[styles.emptyStateCardIllustrationContainer, styles.justifyContentStart]}
titleStyles={styles.textHeadlineH1}
isButtonDisabled={workspaceAccountID > CONST.DEFAULT_NUMBER_ID}

@dangrous dangrous Mar 19, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be the opposite, right? this disables it IF workspaceAccountID exists, not if it doesn't.

The comment above seems to suggest that this is backwards.

@dangrous dangrous Mar 19, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#58670 if so

/>
<DelegateNoAccessModal
isNoDelegateAccessMenuVisible={isNoDelegateAccessMenuVisible}
Expand Down