Merge pull request #221 from sparrowapp-dev/release/2.36.0

Release/2.36.0 to development.

Author: aakashreddy-p

src/lib/services/auth.service.ts

@@ -112,10 +112,10 @@ const updateOccaisonalUpdatesStatus = async (occaisonalUpdates: OccaisonalUpdate
 	return response;
 };
 
-const acceptTeamInvite = async (teamId: string, inviteId: string) => {
+const acceptTeamInvite = async (teamId: string, inviteId: string,email:string) => {
 	const response = await makeRequest(
 		'POST',
-		`${apiUrl}/api/team/${teamId}/invite/user/accept/${inviteId}`,
+		`${apiUrl}/api/team/${teamId}/invite/user/accept/${inviteId}/email/${email}`,
 		{
 			body: {}
 		}

src/pages/Auth/team-invite-acceptance/TeamInviteAcceptance.svelte

@@ -13,7 +13,7 @@
 	export let email;
 
 	onMount(async () => {
-		await handleAcceptTeamInvite(teamId, inviteId);
+		await handleAcceptTeamInvite(teamId, inviteId, email);
         isSpinner = false;
 	});
 

src/pages/Auth/team-invite-acceptance/team-invite-acceptance.ts

@@ -2,12 +2,16 @@ import { notifications } from "$lib/components/toast-notification/ToastNotificat
 import { acceptTeamInvite } from "$lib/services/auth.service";
 import { navigate } from "svelte-navigator";
 export const handleAcceptTeamInvite = async (
-  teamId: string, inviteId: string
+  teamId: string, inviteId: string, email: string
 ) => {
-  const response = await acceptTeamInvite(teamId, inviteId);
+  const response = await acceptTeamInvite(teamId, inviteId,email);
   if (response.isSuccessful) {
     notifications.success("Invitation accepted successfully");
     return response;
+  } else if(response.message === "User is already a member of the hub"){
+    notifications.warning("You are already a member of this hub");
+  } else if(response.message === "Plan limit reached."){
+    notifications.error("The user limit for the Hub Plan has been reached.");
   } else {
     //  window.location.href = 'sparrow://';
     notifications.error("Failed to accept invitation");