chore: ContactInfo error verification order

RocketChat · Nov 11, 2024 · d4906ee · d4906ee
1 parent 1a646f7
commit d4906ee
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/apps/meteor/client/views/omnichannel/directory/ContactContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/ContactContextualBar.tsx
@@ -17,18 +17,18 @@ const ContactContextualBar = () => {
 
 	const handleCancel = () => contactId && directoryRoute.push({ tab: 'contacts', context: 'details', id: contactId });
 
-	if (!contactId) {
-		return <ContactInfoError onClose={handleClose} />;
-	}
-
 	if (context === 'edit' && contactId) {
 		return <EditContactInfoWithData id={contactId} onClose={handleClose} onCancel={handleCancel} />;
 	}
 
-	if (context === 'new') {
+	if (context === 'new' && !contactId) {
 		return <EditContactInfo onClose={handleClose} onCancel={handleClose} />;
 	}
 
+	if (!contactId) {
+		return <ContactInfoError onClose={handleClose} />;
+	}
+
 	return <ContactInfo id={contactId} onClose={handleClose} />;
 };