Skip to content

fix: policy id shows as domain card description #48779

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
MariaHCD merged 8 commits into from
Sep 12, 2024
Merged

fix: policy id shows as domain card description #48779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1f58e3e
fix: policy id shows as domain card description
dominictb Sep 9, 2024
fb65ba5
just apply getDescriptionForPolicyDomainCard to expensify card
dominictb Sep 9, 2024
5457f38
Merge branch 'main' of https://github.com/dominictb/epsf-app into fix…
dominictb Sep 10, 2024
8368f49
move out of utils functions
dominictb Sep 10, 2024
8a72564
Merge branch 'fix/48749' of https://github.com/dominictb/epsf-app int…
dominictb Sep 10, 2024
657d3d0
resolve conflicts
dominictb Sep 10, 2024
9222766
handle lowercase ID
dominictb Sep 12, 2024
e52e9a9
add comments and change variable name
dominictb Sep 12, 2024
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
10 changes: 8 additions & 2 deletions src/CONST.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ const CURRENT_YEAR = new Date().getFullYear();
const PULL_REQUEST_NUMBER = Config?.PULL_REQUEST_NUMBER ?? '';
const MAX_DATE = dateAdd(new Date(), {years: 1});
const MIN_DATE = dateSubtract(new Date(), {years: 20});
const EXPENSIFY_POLICY_DOMAIN = 'expensify-policy';
const EXPENSIFY_POLICY_DOMAIN_EXTENSION = '.exfy';

const keyModifierControl = KeyCommand?.constants?.keyModifierControl ?? 'keyModifierControl';
const keyModifierCommand = KeyCommand?.constants?.keyModifierCommand ?? 'keyModifierCommand';
Expand Down Expand Up @@ -723,8 +725,8 @@ const CONST = {
INBOX: 'inbox',
},

EXPENSIFY_POLICY_DOMAIN: 'expensify-policy',
EXPENSIFY_POLICY_DOMAIN_EXTENSION: '.exfy',
EXPENSIFY_POLICY_DOMAIN,
EXPENSIFY_POLICY_DOMAIN_EXTENSION,

SIGN_IN_FORM_WIDTH: 300,

Expand Down Expand Up @@ -2564,6 +2566,10 @@ const CONST = {
SHORT_MENTION: new RegExp(`@[\\w\\-\\+\\'#@]+(?:\\.[\\w\\-\\'\\+]+)*(?![^\`]*\`)`, 'gim'),

REPORT_ID_FROM_PATH: /\/r\/(\d+)/,

get EXPENSIFY_POLICY_DOMAIN_NAME() {
return new RegExp(`${EXPENSIFY_POLICY_DOMAIN}([a-zA-Z0-9]+)\\${EXPENSIFY_POLICY_DOMAIN_EXTENSION}`);
},
},

PRONOUNS: {
Expand Down
15 changes: 13 additions & 2 deletions src/pages/settings/Wallet/PaymentMethodList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import * as CardUtils from '@libs/CardUtils';
import Log from '@libs/Log';
import Navigation from '@libs/Navigation/Navigation';
import * as PaymentUtils from '@libs/PaymentUtils';
import * as PolicyUtils from '@libs/PolicyUtils';
import variables from '@styles/variables';
import * as PaymentMethods from '@userActions/PaymentMethods';
import CONST from '@src/CONST';
Expand Down Expand Up @@ -199,6 +200,16 @@ function PaymentMethodList({
const {isOffline} = useNetwork();
const [isUserValidated] = useOnyx(ONYXKEYS.USER, {selector: (user) => !!user?.validated});

const getDescriptionForPolicyDomainCard = (domainName: string): string => {
// A domain name containing a policyID indicates that this is a workspace feed
const policyID = domainName.match(CONST.REGEX.EXPENSIFY_POLICY_DOMAIN_NAME)?.[1];
if (policyID) {
const policy = PolicyUtils.getPolicy(policyID.toUpperCase());
return policy?.name ?? domainName;
}
return domainName;
};

const filteredPaymentMethods = useMemo(() => {
if (shouldShowAssignedCards) {
const assignedCards = Object.values(cardList ?? {})
Expand All @@ -214,7 +225,7 @@ function PaymentMethodList({
assignedCardsGrouped.push({
key: card.cardID.toString(),
title: card.bank,
description: card.domainName,
description: getDescriptionForPolicyDomainCard(card.domainName),
shouldShowRightIcon: false,
interactive: false,
canDismissError: false,
Expand Down Expand Up @@ -245,7 +256,7 @@ function PaymentMethodList({
key: card.cardID.toString(),
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
title: card?.nameValuePairs?.cardTitle || card.bank,
description: card.domainName,
description: getDescriptionForPolicyDomainCard(card.domainName),
onPress: () => Navigation.navigate(ROUTES.SETTINGS_WALLET_DOMAINCARD.getRoute(String(card.cardID))),
isGroupedCardDomain: !isAdminIssuedVirtualCard,
shouldShowRightIcon: true,
Expand Down