diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 7aab7c8dcbae2..aede0fabeb824 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -777,7 +777,6 @@ const CONST = {
UBER_FOR_BUSINESS: 'uberForBusiness',
NEW_DOT_DEW: 'newDotDEW',
ODOMETER_EXPENSES: 'odometerExpenses',
- SINGLE_USE_AND_EXPIRE_BY_CARDS: 'singleUseAndExpireByCards',
PAY_INVOICE_VIA_EXPENSIFY: 'payInvoiceViaExpensify',
PERSONAL_CARD_IMPORT: 'personalCardImport',
SUGGESTED_FOLLOWUPS: 'suggestedFollowups',
@@ -3807,8 +3806,6 @@ const CONST = {
LIMIT_VALUE: 21474836,
STEP_NAMES: ['1', '2', '3', '4', '5'],
ASSIGNEE_EXCLUDED_STEP_NAMES: ['1', '2', '3', '4'],
- SINGLE_USE_DISABLED_STEP_NAMES: ['1', '2', '3', '4'],
- SINGLE_USE_AND_ASSIGNEE_EXCLUDED_STEP_NAMES: ['1', '2', '3'],
STEP: {
ASSIGNEE: 'Assignee',
CARD_TYPE: 'CardType',
diff --git a/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx b/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx
index 7aa940911cb59..7bff8634a265d 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx
@@ -199,7 +199,7 @@ function WorkspaceEditCardLimitTypePage({route}: WorkspaceEditCardLimitTypePageP
});
}
- if (card?.nameValuePairs?.isVirtual && isBetaEnabled(CONST.BETAS.SINGLE_USE_AND_EXPIRE_BY_CARDS)) {
+ if (card?.nameValuePairs?.isVirtual) {
options.push({
value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE,
label: translate('workspace.card.issueNewCard.singleUse'),
@@ -278,7 +278,7 @@ function WorkspaceEditCardLimitTypePage({route}: WorkspaceEditCardLimitTypePageP
alternateNumberOfSupportedLines={2}
/>
- {!!card?.nameValuePairs?.isVirtual && isBetaEnabled(CONST.BETAS.SINGLE_USE_AND_EXPIRE_BY_CARDS) && (
+ {!!card?.nameValuePairs?.isVirtual && (
<>
diff --git a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
index 16292344d94ca..0848e753f410e 100644
--- a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
@@ -8,7 +8,6 @@ import TextInput from '@components/TextInput';
import useAutoFocusInput from '@hooks/useAutoFocusInput';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
-import usePermissions from '@hooks/usePermissions';
import useThemeStyles from '@hooks/useThemeStyles';
import {getDefaultCardName} from '@libs/CardUtils';
import {addErrorMessage} from '@libs/ErrorUtils';
@@ -36,7 +35,6 @@ function CardNameStep({policyID, stepNames, startStepIndex}: CardNameStepProps)
const styles = useThemeStyles();
const {inputCallbackRef} = useAutoFocusInput();
const [issueNewCard] = useOnyx(`${ONYXKEYS.COLLECTION.ISSUE_NEW_EXPENSIFY_CARD}${policyID}`);
- const {isBetaEnabled} = usePermissions();
const isEditing = issueNewCard?.isEditing;
const data = issueNewCard?.data;
@@ -79,11 +77,11 @@ function CardNameStep({policyID, stepNames, startStepIndex}: CardNameStepProps)
return;
}
setIssueNewCardStepAndData({
- step: isBetaEnabled(CONST.BETAS.SINGLE_USE_AND_EXPIRE_BY_CARDS) && isVirtualCard ? CONST.EXPENSIFY_CARD.STEP.EXPIRY_OPTIONS : CONST.EXPENSIFY_CARD.STEP.LIMIT_TYPE,
+ step: isVirtualCard ? CONST.EXPENSIFY_CARD.STEP.EXPIRY_OPTIONS : CONST.EXPENSIFY_CARD.STEP.LIMIT_TYPE,
policyID,
});
});
- }, [isEditing, isBetaEnabled, isVirtualCard, policyID]);
+ }, [isEditing, isVirtualCard, policyID]);
return (
;
-function getStartStepIndex(issueNewCard: OnyxEntry, isSingleUseEnabled: boolean): number {
+function getStartStepIndex(issueNewCard: OnyxEntry): number {
if (!issueNewCard) {
return 0;
}
@@ -37,8 +36,8 @@ function getStartStepIndex(issueNewCard: OnyxEntry, isSingleUseEna
[CONST.EXPENSIFY_CARD.STEP.CARD_TYPE]: 1,
[CONST.EXPENSIFY_CARD.STEP.LIMIT_TYPE]: 2,
[CONST.EXPENSIFY_CARD.STEP.EXPIRY_OPTIONS]: 3,
- [CONST.EXPENSIFY_CARD.STEP.CARD_NAME]: isSingleUseEnabled ? 4 : 3,
- [CONST.EXPENSIFY_CARD.STEP.CONFIRMATION]: isSingleUseEnabled ? 5 : 4,
+ [CONST.EXPENSIFY_CARD.STEP.CARD_NAME]: 4,
+ [CONST.EXPENSIFY_CARD.STEP.CONFIRMATION]: 5,
};
const stepIndex = STEP_INDEXES[issueNewCard.currentStep];
@@ -51,16 +50,14 @@ function IssueNewCardPage({policy, route}: IssueNewCardPageProps) {
const {currentStep} = issueNewCard ?? {};
const backTo = route?.params?.backTo;
const {isDelegateAccessRestricted} = useDelegateNoAccessState();
- const {isBetaEnabled} = usePermissions();
- const isSingleUseEnabled = isBetaEnabled(CONST.BETAS.SINGLE_USE_AND_EXPIRE_BY_CARDS);
const stepNames = useMemo(() => {
if (issueNewCard?.isChangeAssigneeDisabled) {
- return isSingleUseEnabled ? CONST.EXPENSIFY_CARD.ASSIGNEE_EXCLUDED_STEP_NAMES : CONST.EXPENSIFY_CARD.SINGLE_USE_AND_ASSIGNEE_EXCLUDED_STEP_NAMES;
+ return CONST.EXPENSIFY_CARD.ASSIGNEE_EXCLUDED_STEP_NAMES;
}
- return isSingleUseEnabled ? CONST.EXPENSIFY_CARD.STEP_NAMES : CONST.EXPENSIFY_CARD.SINGLE_USE_DISABLED_STEP_NAMES;
- }, [issueNewCard?.isChangeAssigneeDisabled, isSingleUseEnabled]);
- const startStepIndex = useMemo(() => getStartStepIndex(issueNewCard, isSingleUseEnabled), [issueNewCard, isSingleUseEnabled]);
+ return CONST.EXPENSIFY_CARD.STEP_NAMES;
+ }, [issueNewCard?.isChangeAssigneeDisabled]);
+ const startStepIndex = useMemo(() => getStartStepIndex(issueNewCard), [issueNewCard]);
useEffect(() => {
startIssueNewCardFlow(policyID);
diff --git a/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx b/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
index e50be5f2c55f5..635d8c206edc7 100644
--- a/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
@@ -10,7 +10,6 @@ import Text from '@components/Text';
import ValuePicker from '@components/ValuePicker';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
-import usePermissions from '@hooks/usePermissions';
import useThemeStyles from '@hooks/useThemeStyles';
import {setIssueNewCardStepAndData} from '@libs/actions/Card';
import {getDefaultExpensifyCardLimitType} from '@libs/CardUtils';
@@ -40,7 +39,6 @@ function LimitTypeStep({policy, stepNames, startStepIndex}: LimitTypeStepProps)
const styles = useThemeStyles();
const policyID = policy?.id;
const [issueNewCard] = useOnyx(`${ONYXKEYS.COLLECTION.ISSUE_NEW_EXPENSIFY_CARD}${policyID}`);
- const {isBetaEnabled} = usePermissions();
const formRef = useRef(null);
const areApprovalsConfigured = getApprovalWorkflow(policy) !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
@@ -53,11 +51,11 @@ function LimitTypeStep({policy, stepNames, startStepIndex}: LimitTypeStepProps)
if (isEditing) {
return CONST.EXPENSIFY_CARD.STEP.CONFIRMATION;
}
- if (issueNewCard?.data?.cardType === CONST.EXPENSIFY_CARD.CARD_TYPE.VIRTUAL && isBetaEnabled(CONST.BETAS.SINGLE_USE_AND_EXPIRE_BY_CARDS)) {
+ if (issueNewCard?.data?.cardType === CONST.EXPENSIFY_CARD.CARD_TYPE.VIRTUAL) {
return CONST.EXPENSIFY_CARD.STEP.EXPIRY_OPTIONS;
}
return CONST.EXPENSIFY_CARD.STEP.CARD_NAME;
- }, [isBetaEnabled, isEditing, issueNewCard?.data?.cardType]);
+ }, [isEditing, issueNewCard?.data?.cardType]);
const onInputFocus = useCallback(() => {
formRef.current?.scrollToEnd();
@@ -116,7 +114,7 @@ function LimitTypeStep({policy, stepNames, startStepIndex}: LimitTypeStepProps)
},
);
- if (issueNewCard?.data?.cardType === CONST.EXPENSIFY_CARD.CARD_TYPE.VIRTUAL && isBetaEnabled(CONST.BETAS.SINGLE_USE_AND_EXPIRE_BY_CARDS)) {
+ if (issueNewCard?.data?.cardType === CONST.EXPENSIFY_CARD.CARD_TYPE.VIRTUAL) {
options.push({
value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE,
label: translate('workspace.card.issueNewCard.singleUse'),
@@ -126,7 +124,7 @@ function LimitTypeStep({policy, stepNames, startStepIndex}: LimitTypeStepProps)
});
}
return options;
- }, [areApprovalsConfigured, isBetaEnabled, issueNewCard?.data?.cardType, translate, typeSelected]);
+ }, [areApprovalsConfigured, issueNewCard?.data?.cardType, translate, typeSelected]);
const validate = useCallback(
(values: FormOnyxValues): FormInputErrors => {