From e418c04375475557bab78ce1b93df1acc65a056a Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Sat, 7 Dec 2024 00:53:08 +0530
Subject: [PATCH 1/4] fix: Add an Invite button to the workspace profile page.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/pages/workspace/WorkspaceProfilePage.tsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/pages/workspace/WorkspaceProfilePage.tsx b/src/pages/workspace/WorkspaceProfilePage.tsx
index 4a4862152d53..44c3417ae3f3 100644
--- a/src/pages/workspace/WorkspaceProfilePage.tsx
+++ b/src/pages/workspace/WorkspaceProfilePage.tsx
@@ -54,6 +54,7 @@ function WorkspaceProfilePage({policyDraft, policy: policyProp, route}: Workspac
 
     // When we create a new workspace, the policy prop will be empty on the first render. Therefore, we have to use policyDraft until policy has been set in Onyx.
     const policy = policyDraft?.id ? policyDraft : policyProp;
+    const isPolicyAdmin = PolicyUtils.isPolicyAdmin(policy);
     const outputCurrency = policy?.outputCurrency ?? DistanceRequestUtils.getDefaultMileageRate(policy)?.currency ?? PolicyUtils.getPersonalPolicy()?.outputCurrency ?? '';
     const currencySymbol = currencyList?.[outputCurrency]?.symbol ?? '';
     const formattedCurrency = !isEmptyObject(policy) && !isEmptyObject(currencyList) ? `${outputCurrency} - ${currencySymbol}` : '';
@@ -269,6 +270,16 @@ function WorkspaceProfilePage({policyDraft, policy: policyProp, route}: Workspac
                         )}
                         {!readOnly && (
                             <View style={[styles.flexRow, styles.mt6, styles.mnw120]}>
+                                {isPolicyAdmin && (
+                                    <Button
+                                        accessibilityLabel={translate('common.invite')}
+                                        text={translate('common.invite')}
+                                        onPress={() => Navigation.navigate(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID))}
+                                        icon={Expensicons.UserPlus}
+                                        style={[styles.mr2]}
+                                    />
+                                )}
+
                                 <Button
                                     accessibilityLabel={translate('common.share')}
                                     text={translate('common.share')}

From deae955c6245dba90ac1aa84ab9394d9ec17e669 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Sat, 7 Dec 2024 00:58:25 +0530
Subject: [PATCH 2/4] remove redundant spacing.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/pages/workspace/WorkspaceProfilePage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/workspace/WorkspaceProfilePage.tsx b/src/pages/workspace/WorkspaceProfilePage.tsx
index 44c3417ae3f3..ddb3c985c903 100644
--- a/src/pages/workspace/WorkspaceProfilePage.tsx
+++ b/src/pages/workspace/WorkspaceProfilePage.tsx
@@ -279,7 +279,6 @@ function WorkspaceProfilePage({policyDraft, policy: policyProp, route}: Workspac
                                         style={[styles.mr2]}
                                     />
                                 )}
-
                                 <Button
                                     accessibilityLabel={translate('common.share')}
                                     text={translate('common.share')}

From b072946131aea6245b38f8efaa5546b22ac570c4 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Sat, 21 Dec 2024 16:23:36 +0530
Subject: [PATCH 3/4] add backTo param in WorkspaceInvitePage &
 WorkspaceInviteMessagePage.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/ROUTES.ts                                                 | 4 ++--
 .../Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts    | 2 --
 src/libs/Navigation/types.ts                                  | 2 ++
 src/pages/workspace/WorkspaceInviteMessagePage.tsx            | 4 ++--
 src/pages/workspace/WorkspaceInvitePage.tsx                   | 2 +-
 src/pages/workspace/WorkspaceMembersPage.tsx                  | 2 +-
 src/pages/workspace/WorkspaceProfilePage.tsx                  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 58d28a46a7b8..909f847fd75d 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -702,11 +702,11 @@ const ROUTES = {
     },
     WORKSPACE_INVITE: {
         route: 'settings/workspaces/:policyID/invite',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/invite` as const,
+        getRoute: (policyID: string, backTo?: string) => `${getUrlWithBackToParam(`settings/workspaces/${policyID}/invite`, backTo)}` as const,
     },
     WORKSPACE_INVITE_MESSAGE: {
         route: 'settings/workspaces/:policyID/invite-message',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/invite-message` as const,
+        getRoute: (policyID: string, backTo?: string) => `${getUrlWithBackToParam(`settings/workspaces/${policyID}/invite-message`, backTo)}` as const,
     },
     WORKSPACE_PROFILE: {
         route: 'settings/workspaces/:policyID/profile',
diff --git a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
index bd4497fbcc58..9a03409fb3a2 100755
--- a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
@@ -12,8 +12,6 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial<Record<FullScreenName, string[]>> = {
         SCREENS.WORKSPACE.DOWNGRADE,
     ],
     [SCREENS.WORKSPACE.MEMBERS]: [
-        SCREENS.WORKSPACE.INVITE,
-        SCREENS.WORKSPACE.INVITE_MESSAGE,
         SCREENS.WORKSPACE.MEMBER_DETAILS,
         SCREENS.WORKSPACE.MEMBER_NEW_CARD,
         SCREENS.WORKSPACE.OWNER_CHANGE_CHECK,
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 71f11113e84c..9869f4e39f94 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -190,6 +190,7 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.SHARE]: undefined;
     [SCREENS.WORKSPACE.INVITE]: {
         policyID: string;
+        backTo?: Routes;
     };
     [SCREENS.WORKSPACE.MEMBERS_IMPORT]: {
         policyID: string;
@@ -199,6 +200,7 @@ type SettingsNavigatorParamList = {
     };
     [SCREENS.WORKSPACE.INVITE_MESSAGE]: {
         policyID: string;
+        backTo?: Routes;
     };
     [SCREENS.WORKSPACE.CATEGORY_CREATE]: {
         policyID: string;
diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.tsx b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
index 5b9d64d52cbc..33d3925f75c5 100644
--- a/src/pages/workspace/WorkspaceInviteMessagePage.tsx
+++ b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
@@ -92,7 +92,7 @@ function WorkspaceInviteMessagePage({policy, route, currentUserPersonalDetails}:
         if (isEmptyObject(policy)) {
             return;
         }
-        Navigation.goBack(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID), true);
+        Navigation.goBack(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID, route.params.backTo), true);
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [isOnyxLoading]);
 
@@ -141,7 +141,7 @@ function WorkspaceInviteMessagePage({policy, route, currentUserPersonalDetails}:
                     guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_MEMBERS}
                     shouldShowBackButton
                     onCloseButtonPress={() => Navigation.dismissModal()}
-                    onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID))}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID, route.params.backTo))}
                 />
                 <FormProvider
                     style={[styles.flexGrow1, styles.ph5]}
diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index ca09300ca0d9..bda2aa7e5253 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -249,7 +249,7 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
             invitedEmailsToAccountIDs[login] = Number(accountID);
         });
         Member.setWorkspaceInviteMembersDraft(route.params.policyID, invitedEmailsToAccountIDs);
-        Navigation.navigate(ROUTES.WORKSPACE_INVITE_MESSAGE.getRoute(route.params.policyID));
+        Navigation.navigate(ROUTES.WORKSPACE_INVITE_MESSAGE.getRoute(route.params.policyID, Navigation.getActiveRoute()));
     }, [route.params.policyID, selectedOptions]);
 
     const [policyName, shouldShowAlertPrompt] = useMemo(() => [policy?.name ?? '', !isEmptyObject(policy?.errors) || !!policy?.alertMessage], [policy]);
diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 6b88f3b59995..407ccca99438 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -208,7 +208,7 @@ function WorkspaceMembersPage({personalDetails, route, policy, currentUserPerson
      */
     const inviteUser = () => {
         clearInviteDraft();
-        Navigation.navigate(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID));
+        Navigation.navigate(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID, Navigation.getActiveRouteWithoutParams()));
     };
 
     /**
diff --git a/src/pages/workspace/WorkspaceProfilePage.tsx b/src/pages/workspace/WorkspaceProfilePage.tsx
index 82d8393022d9..e5761748bef8 100644
--- a/src/pages/workspace/WorkspaceProfilePage.tsx
+++ b/src/pages/workspace/WorkspaceProfilePage.tsx
@@ -351,7 +351,7 @@ function WorkspaceProfilePage({policyDraft, policy: policyProp, route}: Workspac
                                     <Button
                                         accessibilityLabel={translate('common.invite')}
                                         text={translate('common.invite')}
-                                        onPress={() => Navigation.navigate(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID))}
+                                        onPress={() => Navigation.navigate(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID, Navigation.getActiveRouteWithoutParams()))}
                                         icon={Expensicons.UserPlus}
                                         style={[styles.mr2]}
                                     />

From 1a7a15afa75d4a8fe2539c709b3ec2d07ba3c015 Mon Sep 17 00:00:00 2001
From: krishna2323 <belivethatkg@gmail.com>
Date: Mon, 23 Dec 2024 15:50:25 +0530
Subject: [PATCH 4/4] fix animation and eslint.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
---
 src/pages/workspace/WorkspaceInviteMessagePage.tsx | 7 ++++++-
 src/pages/workspace/WorkspaceInvitePage.tsx        | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.tsx b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
index 33d3925f75c5..463b7df2124f 100644
--- a/src/pages/workspace/WorkspaceInviteMessagePage.tsx
+++ b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
@@ -103,7 +103,12 @@ function WorkspaceInviteMessagePage({policy, route, currentUserPersonalDetails}:
         Member.addMembersToWorkspace(invitedEmailsToAccountIDsDraft ?? {}, `${welcomeNoteSubject}\n\n${welcomeNote}`, route.params.policyID, policyMemberAccountIDs);
         Policy.setWorkspaceInviteMessageDraft(route.params.policyID, welcomeNote ?? null);
         FormActions.clearDraftValues(ONYXKEYS.FORMS.WORKSPACE_INVITE_MESSAGE_FORM);
-        Navigation.dismissModal();
+        if ((route.params?.backTo as string)?.endsWith('members')) {
+            Navigation.setNavigationActionToMicrotaskQueue(() => Navigation.dismissModal());
+
+            return;
+        }
+        Navigation.setNavigationActionToMicrotaskQueue(() => Navigation.navigate(ROUTES.WORKSPACE_MEMBERS.getRoute(route.params.policyID)));
     };
 
     /** Opens privacy url as an external link */
diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index bda2aa7e5253..9ca582050414 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -242,7 +242,7 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
         const invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs = {};
         selectedOptions.forEach((option) => {
             const login = option.login ?? '';
-            const accountID = option.accountID ?? '-1';
+            const accountID = option.accountID ?? CONST.DEFAULT_NUMBER_ID;
             if (!login.toLowerCase().trim() || !accountID) {
                 return;
             }