Cm polish navigation items

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;

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';

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) {
@@ -85,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;
         }
@@ -99,7 +102,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(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));
@@ -113,7 +116,8 @@ function ConfirmationStep({route}: ConfirmationStepProps) {
     };
 
     const handleBackButtonPress = () => {
-        Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE.getRoute({policyID, feed, cardID}));
+        setAssignCardStepAndData({isEditing: true});
+        Navigation.goBack(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD_ASSIGNEE.getRoute({policyID, feed, cardID}), {compareParams: false});
     };
 
     return (

src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx

@@ -184,7 +184,7 @@
     const invitingMemberDetails = getPersonalDetailByEmail(invitingMemberEmail);
     const invitingMemberName = Str.removeSMSDomain(invitingMemberDetails?.displayName ?? '');
 
     const handleMemberPress = () => {
         clearInviteDraft(policyID);
         setAssignCardStepAndData({
             currentStep: CONST.COMPANY_CARD.STEP.ASSIGNEE,
@@ -255,8 +255,7 @@
                                 <MenuItemWithTopDescription
                                     title={invitingMemberName && invitingMemberName !== invitingMemberEmail ? invitingMemberName : invitingMemberEmail}
                                     description={translate('common.member')}
-                                    shouldShowRightIcon
-                                    onPress={handleMemberPress}
+                                    interactive={false}
                                 />
                             )}
                             {shouldShowMemberNames && !isInviteNewMemberStep && (