From 92d71bf65c1e2801ccb121fb1e8403f1921168e0 Mon Sep 17 00:00:00 2001 From: Carlos Miceli Date: Fri, 19 Dec 2025 13:59:06 -0500 Subject: [PATCH 1/6] make new member menu item read only --- .../workspace/members/WorkspaceInviteMessageComponent.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx b/src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx index e09be4aec02f..c99346b1746b 100644 --- a/src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx +++ b/src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx @@ -255,8 +255,7 @@ function WorkspaceInviteMessageComponent({ )} {shouldShowMemberNames && !isInviteNewMemberStep && ( From e9651eeba56ec7bec71e904cf459fe7f104a90fb Mon Sep 17 00:00:00 2001 From: Carlos Miceli Date: Fri, 19 Dec 2025 15:20:55 -0500 Subject: [PATCH 2/6] fix navigation again --- .../assignCard/ConfirmationStep.tsx | 10 +++++++--- .../assignCard/TransactionStartDateStep.tsx | 18 +++++++++--------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx index fc95f9893916..6e1b1a9450ea 100644 --- a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx +++ b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx @@ -35,6 +35,7 @@ function ConfirmationStep({route}: ConfirmationStepProps) { const policyID = route.params.policyID; const feed = route.params.feed as CompanyCardFeedWithDomainID; const cardID = route.params.cardID; + const backTo = route.params?.backTo; const {translate} = useLocalize(); const styles = useThemeStyles(); const {isOffline} = useNetwork(); @@ -64,9 +65,12 @@ function ConfirmationStep({route}: ConfirmationStepProps) { } Navigation.dismissModal(); + if (backTo) { + Navigation.navigate(backTo); + } // eslint-disable-next-line @typescript-eslint/no-deprecated InteractionManager.runAfterInteractions(() => clearAssignCardStepAndData()); - }, [assignCard?.isAssignmentFinished]); + }, [assignCard?.isAssignmentFinished, backTo]); const submit = () => { if (!policyID) { @@ -99,7 +103,7 @@ function ConfirmationStep({route}: ConfirmationStepProps) { switch (step) { case CONST.COMPANY_CARD.STEP.ASSIGNEE: - Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE.getRoute(routeParams)); + Navigation.goBack(); break; case CONST.COMPANY_CARD.STEP.TRANSACTION_START_DATE: Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_TRANSACTION_START_DATE.getRoute(routeParams)); @@ -113,7 +117,7 @@ function ConfirmationStep({route}: ConfirmationStepProps) { }; const handleBackButtonPress = () => { - Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE.getRoute({policyID, feed, cardID})); + Navigation.goBack(); }; return ( diff --git a/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx b/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx index 8086c60b08d2..b8c5be64720c 100644 --- a/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx +++ b/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx @@ -37,15 +37,6 @@ function TransactionStartDateStep() { Navigation.goBack(); }; - const handleSelectDateOption = (dateOption: string) => { - setErrorText(''); - setDateOptionSelected(dateOption); - if (dateOption === CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.FROM_BEGINNING) { - return; - } - setStartDate(format(new Date(), CONST.DATE.FNS_FORMAT_STRING)); - }; - const submit = () => { if (dateOptionSelected === CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM && !isRequiredFulfilled(startDate)) { setErrorText(translate('common.error.fieldRequired')); @@ -65,6 +56,15 @@ function TransactionStartDateStep() { Navigation.goBack(); }; + const handleSelectDateOption = (dateOption: string) => { + setErrorText(''); + setDateOptionSelected(dateOption); + if (dateOption === CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.FROM_BEGINNING) { + return; + } + setStartDate(format(new Date(), CONST.DATE.FNS_FORMAT_STRING)); + }; + const dateOptions = [ { value: CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.FROM_BEGINNING, From c41f26cd8cf7755e11e3913167256830e4d524a3 Mon Sep 17 00:00:00 2001 From: Carlos Miceli Date: Fri, 19 Dec 2025 15:36:54 -0500 Subject: [PATCH 3/6] confirmation back to assignee regardless of coming from new member invite --- src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx index 6e1b1a9450ea..52846f608a01 100644 --- a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx +++ b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx @@ -89,7 +89,6 @@ function ConfirmationStep({route}: ConfirmationStepProps) { }, }); } - // For expired feeds, navigate to the old ASSIGN_CARD route which handles these special cases Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD.getRoute({policyID, feed, cardID})); return; } From bf33678fe30a2ba75ec7569a05872f265b15af03 Mon Sep 17 00:00:00 2001 From: Carlos Miceli Date: Fri, 19 Dec 2025 15:57:04 -0500 Subject: [PATCH 4/6] skip invite new memeber from back navigation --- .../workspace/companyCards/assignCard/ConfirmationStep.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx index 52846f608a01..91d50b6995dd 100644 --- a/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx +++ b/src/pages/workspace/companyCards/assignCard/ConfirmationStep.tsx @@ -102,7 +102,7 @@ function ConfirmationStep({route}: ConfirmationStepProps) { switch (step) { case CONST.COMPANY_CARD.STEP.ASSIGNEE: - Navigation.goBack(); + Navigation.goBack(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE.getRoute(routeParams), {compareParams: false}); break; case CONST.COMPANY_CARD.STEP.TRANSACTION_START_DATE: Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_TRANSACTION_START_DATE.getRoute(routeParams)); @@ -116,7 +116,8 @@ function ConfirmationStep({route}: ConfirmationStepProps) { }; const handleBackButtonPress = () => { - Navigation.goBack(); + setAssignCardStepAndData({isEditing: true}); + Navigation.goBack(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE.getRoute({policyID, feed, cardID}), {compareParams: false}); }; return ( From 1c6f829b0237bad19e6d2d1463ea6bcc9876bb9d Mon Sep 17 00:00:00 2001 From: Carlos Miceli Date: Fri, 19 Dec 2025 15:58:43 -0500 Subject: [PATCH 5/6] prettier --- src/hooks/useAssignCard.ts | 2 +- src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hooks/useAssignCard.ts b/src/hooks/useAssignCard.ts index d05c4f49d908..8f0b42a38f44 100644 --- a/src/hooks/useAssignCard.ts +++ b/src/hooks/useAssignCard.ts @@ -27,10 +27,10 @@ import {getEmptyObject} from '@src/types/utils/EmptyObject'; import type {CombinedCardFeed} from './useCardFeeds'; import useCardFeeds from './useCardFeeds'; import useCardsList from './useCardsList'; -import usePolicy from './usePolicy'; import useIsAllowedToIssueCompanyCard from './useIsAllowedToIssueCompanyCard'; import useNetwork from './useNetwork'; import useOnyx from './useOnyx'; +import usePolicy from './usePolicy'; type UseAssignCardProps = { selectedFeed: CompanyCardFeedWithDomainID | undefined; diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx index 6e3d63ddae00..de2d2a2e74a4 100644 --- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx +++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx @@ -9,8 +9,8 @@ import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; import usePermissions from '@hooks/usePermissions'; -import useResponsiveLayout from '@hooks/useResponsiveLayout'; import usePolicy from '@hooks/usePolicy'; +import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; import {getCompanyCardFeed, getCompanyFeeds, getDomainOrWorkspaceAccountID, getSelectedFeed} from '@libs/CardUtils'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; From 87fc6e223fafc8bd20577e2acad81258c3ce4959 Mon Sep 17 00:00:00 2001 From: Carlos Miceli Date: Fri, 19 Dec 2025 16:00:28 -0500 Subject: [PATCH 6/6] cleanup --- .../assignCard/TransactionStartDateStep.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx b/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx index b8c5be64720c..8086c60b08d2 100644 --- a/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx +++ b/src/pages/workspace/companyCards/assignCard/TransactionStartDateStep.tsx @@ -37,6 +37,15 @@ function TransactionStartDateStep() { Navigation.goBack(); }; + const handleSelectDateOption = (dateOption: string) => { + setErrorText(''); + setDateOptionSelected(dateOption); + if (dateOption === CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.FROM_BEGINNING) { + return; + } + setStartDate(format(new Date(), CONST.DATE.FNS_FORMAT_STRING)); + }; + const submit = () => { if (dateOptionSelected === CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.CUSTOM && !isRequiredFulfilled(startDate)) { setErrorText(translate('common.error.fieldRequired')); @@ -56,15 +65,6 @@ function TransactionStartDateStep() { Navigation.goBack(); }; - const handleSelectDateOption = (dateOption: string) => { - setErrorText(''); - setDateOptionSelected(dateOption); - if (dateOption === CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.FROM_BEGINNING) { - return; - } - setStartDate(format(new Date(), CONST.DATE.FNS_FORMAT_STRING)); - }; - const dateOptions = [ { value: CONST.COMPANY_CARD.TRANSACTION_START_DATE_OPTIONS.FROM_BEGINNING,