npm - @paro.io/expert-shared-components - Versions diffs - 1.13.6 → 1.13.8 - Mend

@paro.io/expert-shared-components 1.13.6 → 1.13.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/lib/components/Escalations/AccountSuspensionBanner.js CHANGED Viewed

@@ -13,12 +13,7 @@ const AccountSuspensionBanner = ({ setShowSuspensionModal, suspended = false })
                 react_1.default.createElement(base_icons_1.IconExclamation, { className: "h-6 w-6 text-white" })),
             react_1.default.createElement("div", { className: "flex-1" },
                 react_1.default.createElement("h3", { className: "text-lg font-bold text-white" }, "\uD83D\uDEAB Account Suspended"),
-                react_1.default.createElement("p", { className: "text-red-100 text-sm mt-1" }, "Your account has been suspended due to an escalation. You must complete comprehensive training to regain access to new opportunities."),
-                react_1.default.createElement("div", { className: "mt-3 bg-white bg-opacity-10 rounded p-3" },
-                    react_1.default.createElement("div", { className: "flex items-center justify-between text-sm" },
-                        react_1.default.createElement("div", null,
-                            react_1.default.createElement("span", { className: "text-red-100" }, "Suspension: "),
-                            react_1.default.createElement("span", { className: "text-white font-medium" }, "30 days (Medium Severity)"))))))
+                react_1.default.createElement("p", { className: "text-red-100 text-sm mt-1" }, "Your account has been suspended due to an escalation. You must complete comprehensive training to regain access to new opportunities.")))
         :
             react_1.default.createElement("div", { className: "flex items-center justify-between" },
                 react_1.default.createElement("div", { className: "flex items-center" },
@@ -26,9 +21,7 @@ const AccountSuspensionBanner = ({ setShowSuspensionModal, suspended = false })
                         react_1.default.createElement(base_icons_1.IconExclamation, { className: "h-6 w-6 text-white" })),
                     react_1.default.createElement("div", null,
                         react_1.default.createElement("h3", { className: "text-lg font-bold text-white" }, "Account Suspension Risk"),
-                        react_1.default.createElement("p", { className: "text-red-100 text-sm mt-1" }, "Unresolved escalations can lead to automatic suspension. Response times matter for client satisfaction."),
-                        react_1.default.createElement("div", { className: "flex items-center mt-2 text-red-100 text-xs" },
-                            react_1.default.createElement("span", null, "3 warnings: Medium=30d \u2022 2 warnings: High=60d \u2022 1 offense: Critical=Permanent")))),
+                        react_1.default.createElement("p", { className: "text-red-100 text-sm mt-1" }, "Unresolved escalations can lead to automatic suspension. Response times matter for client satisfaction."))),
                 react_1.default.createElement(base_ui_1.Button, { label: "view details", onClick: () => setShowSuspensionModal(true), iconLeft: react_1.default.createElement(base_icons_1.IconInfoCircle, { size: "sm" }), color: "danger", className: "bg-white hover:bg-danger text-danger-dark hover:text-white" }))));
 };
 exports.default = AccountSuspensionBanner;

package/lib/components/Escalations/AccountSuspensionModal.js CHANGED Viewed

@@ -20,7 +20,7 @@ const AccountSuspensionModal = ({ showSuspensionModal, onClose }) => {
                             react_1.default.createElement(base_icons_1.IconBriefcase, { className: "h-5 w-5 text-red-500 mt-0.5 mr-2 flex-shrink-0" }),
                             react_1.default.createElement("div", null,
                                 react_1.default.createElement("p", { className: "font-medium text-red-800" }, "Critical Information"),
-                                react_1.default.createElement("p", { className: "text-sm text-red-700 mt-1" }, "Escalations require timely attention to maintain client relationships and project success. Multiple unresolved issues may result in account warnings and potential suspension."))))),
+                                react_1.default.createElement("p", { className: "text-sm text-red-700 mt-1" }, "Engagment support issues require timely attention to maintain client relationships and project success. Multiple unresolved issues may result in account warnings and potential suspension."))))),
                 react_1.default.createElement("div", { className: "space-y-6" },
                     react_1.default.createElement("div", { className: "relative" },
                         react_1.default.createElement("div", { className: "absolute left-4 top-8 bottom-0 w-0.5 bg-gray-200" }),
@@ -104,7 +104,7 @@ const AccountSuspensionModal = ({ showSuspensionModal, onClose }) => {
                 react_1.default.createElement("div", { className: "mt-6 bg-gray-50 rounded-lg p-4" },
                     react_1.default.createElement("h4", { className: "font-medium text-gray-900 mb-2" }, "Important Reminders"),
                     react_1.default.createElement("ul", { className: "text-sm text-gray-600 space-y-1" },
-                        react_1.default.createElement("li", null, "\u2022 All escalations are tracked and contribute to your warning count"),
+                        react_1.default.createElement("li", null, "\u2022 All issues are tracked and contribute to your warning count"),
                         react_1.default.createElement("li", null, "\u2022 Training completion is required before suspension can be lifted"),
                         react_1.default.createElement("li", null, "\u2022 Warnings are cumulative across all severity levels"),
                         react_1.default.createElement("li", null, "\u2022 All actions are logged and affect your expert rating")))))));

package/lib/components/Escalations/EscalationChat.js CHANGED Viewed

@@ -117,7 +117,7 @@ const EscalationChat = ({ activeChatIssue, showEscalationChat, onClose, user, cr
                 react_1.default.createElement("div", { className: "flex flex-col items-start" },
                     react_1.default.createElement("div", { className: "flex flex-row items-center" },
                         react_1.default.createElement("h1", { className: "text-md font-bold mr-2" },
-                            "Escalation Chat #",
+                            "Engagement Support #",
                             activeChatIssue.escalationNumber),
                         react_1.default.createElement(EscalationIssueCard_1.CustomTag, { label: activeChatIssue.status === "InProgress" ? "In Progress" : activeChatIssue.status, customColor: isExpert ? 'bg-neutral border-neutral' : 'bg-[#B0B5D3] border-[#181027]' })),
                     react_1.default.createElement("p", { className: "text-xs" },

package/lib/components/Escalations/EscalationIssueCard.js CHANGED Viewed

@@ -69,24 +69,19 @@ const EscalationIssueCard = ({ issues, isExpert, openEscalationChat, showRespond
                 return "View Response";
             }
             else {
-                return issue.expertResponse ? "View Response" : "Awaiting Response";
+                return issue.expertResponse || issue.clientResponse ? "View Response" : "Awaiting Response";
             }
         }
         if (userTypeId === 1) { // Submitted by Expert
             if (isExpert) {
-                return issue.clientResponse ? "View Response" : "Awaiting Response";
+                return issue.clientResponse || issue.expertResponse ? "View Response" : "Awaiting Response";
             }
             else {
                 return "View Response";
             }
         }
         if (userTypeId === 2) { // Submitted by Paro internal
-            if (isExpert) {
-                return issue.clientResponse ? "View Response" : "Awaiting Response";
-            }
-            else {
-                return issue.expertResponse ? "View Response" : "Awaiting Response";
-            }
+            return issue.clientResponse || issue.expertResponse ? "View Response" : "Awaiting Response";
         }
         return "Awaiting Response";
     };
@@ -94,7 +89,7 @@ const EscalationIssueCard = ({ issues, isExpert, openEscalationChat, showRespond
         return react_1.default.createElement("div", null, "No issues.");
     return (react_1.default.createElement("div", { className: "space-y-4" },
         issues.map((issue) => {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e;
             const project = issue.projectDetails && Array.isArray(issue.projectDetails) && issue.projectDetails.length > 0
                 ? `${(_a = issue.projectDetails[0]) === null || _a === void 0 ? void 0 : _a.projectName}${issue.projectDetails.length > 1 ? ` +${issue.projectDetails.length - 1} more` : ''} `
                 : '';
@@ -104,12 +99,10 @@ const EscalationIssueCard = ({ issues, isExpert, openEscalationChat, showRespond
                 react_1.default.createElement("div", { className: "flex items-center justify-between mb-3" },
                     react_1.default.createElement("div", { className: "flex-1 ml-2" },
                         react_1.default.createElement("div", { className: "flex flex-row justify-start gap-2" },
-                            react_1.default.createElement("div", { className: "font-bold" }, issue.problem),
+                            react_1.default.createElement("div", { className: "font-bold" }, project),
                             react_1.default.createElement(exports.CustomTag, { label: issue.severityLevel })),
                         react_1.default.createElement("div", { className: "text-xs text-gray-500 font-bold" },
-                            isExpert ? (_c = (_b = issue === null || issue === void 0 ? void 0 : issue.client) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : "Client" : (_e = (_d = issue === null || issue === void 0 ? void 0 : issue.freelancer) === null || _d === void 0 ? void 0 : _d.name) !== null && _e !== void 0 ? _e : 'Expert',
-                            " \u2022 ",
-                            project,
+                            isExpert ? `${(_b = issue === null || issue === void 0 ? void 0 : issue.client) === null || _b === void 0 ? void 0 : _b.name} (Client)` : `${(_c = issue === null || issue === void 0 ? void 0 : issue.freelancer) === null || _c === void 0 ? void 0 : _c.name} (Expert)`,
                             " \u2022 Case #",
                             issue.escalationNumber)),
                     react_1.default.createElement(exports.CustomTag, { label: issue.escalationType, customColor: `bg-[#B0B5D3] border-[#181027]` })),
@@ -117,11 +110,25 @@ const EscalationIssueCard = ({ issues, isExpert, openEscalationChat, showRespond
                     react_1.default.createElement("div", { className: "flex items-center justify-between mb-2" },
                         react_1.default.createElement("div", { className: "text-sm text-gray-500" },
                             "Submitted by: ",
-                            react_1.default.createElement("span", { className: "font-bold" }, ((_f = issue === null || issue === void 0 ? void 0 : issue.submittedByUser) === null || _f === void 0 ? void 0 : _f.firstName) + " " + ((_g = issue === null || issue === void 0 ? void 0 : issue.submittedByUser) === null || _g === void 0 ? void 0 : _g.lastName)),
+                            react_1.default.createElement("span", { className: "font-bold" },
+                                ((_d = issue === null || issue === void 0 ? void 0 : issue.submittedByUser) === null || _d === void 0 ? void 0 : _d.firstName) + " " + ((_e = issue === null || issue === void 0 ? void 0 : issue.submittedByUser) === null || _e === void 0 ? void 0 : _e.lastName),
+                                " ",
+                                issue.submittedByUser.userTypeId === 1 ? '(Expert)' : issue.submittedByUser.userTypeId === 2 ? '(Paro)' : '(Client)'),
                             (issue === null || issue === void 0 ? void 0 : issue.createdAt) && react_1.default.createElement(react_1.default.Fragment, null,
                                 " \u2022 Submitted on: ",
                                 react_1.default.createElement("span", { className: "font-bold" }, (0, dayjs_1.default)(issue === null || issue === void 0 ? void 0 : issue.createdAt).format("MM-DD-YYYY"))))),
-                    react_1.default.createElement("div", { className: "text-sm text-gray-600 mb-3" }, issue.outcome),
+                    react_1.default.createElement("div", { className: "text-sm text-gray-600 mb-2" },
+                        react_1.default.createElement("span", { className: "font-bold" }, "Projects Affected:"),
+                        " ",
+                        issue.projectDetails.map((p) => p.projectName).join(", ")),
+                    react_1.default.createElement("div", { className: "text-sm text-gray-600 mb-2" },
+                        react_1.default.createElement("span", { className: "font-bold" }, "Problem:"),
+                        " ",
+                        issue.problem),
+                    react_1.default.createElement("div", { className: "text-sm text-gray-600 mb-2" },
+                        react_1.default.createElement("span", { className: "font-bold" }, "Desired Outcome:"),
+                        " ",
+                        issue.outcome),
                     processedDocs && processedDocs.length > 0 && (react_1.default.createElement("div", { className: "flex flex-wrap gap-2" },
                         react_1.default.createElement("span", { className: "text-sm font-bold text-gray-500 items-center" }, "Supporting Documents: "),
                         processedDocs.map((d, idx) => (react_1.default.createElement(exports.CustomTag, { key: idx, customColor: `bg-success border-success`, label: d.split('%2F')[1], iconLeft: react_1.default.createElement(base_icons_1.IconDocumentDownload, { size: "xs" }), onClick: () => {

package/lib/components/Escalations/EscalationRespondForm.d.ts CHANGED Viewed

@@ -1,5 +1,15 @@
 export declare const ACCEPTED_FILE_TYPES: string[];
 export declare const validateFileUpload: (file: File | null) => boolean;
+export declare const clientResponseTypes: {
+    label: string;
+    description: string;
+    value: string;
+}[];
+export declare const expertResponseTypes: {
+    label: string;
+    description: string;
+    value: string;
+}[];
 declare const EscalationRespondForm: ({ goBack, selectedIssue, documentUploadUrl, downloadDocumentUrl, uploadExpertClientFiles, updateProjectEscalation, bucketName, goHome, isExpert, userId, }: {
     goBack: () => void;
     selectedIssue: any;

package/lib/components/Escalations/EscalationRespondForm.js CHANGED Viewed

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateFileUpload = exports.ACCEPTED_FILE_TYPES = void 0;
+exports.expertResponseTypes = exports.clientResponseTypes = exports.validateFileUpload = exports.ACCEPTED_FILE_TYPES = void 0;
 const react_1 = __importStar(require("react"));
 const base_icons_1 = require("@paro.io/base-icons");
 const base_ui_1 = require("@paro.io/base-ui");
@@ -58,7 +58,7 @@ const validateFileUpload = (file) => {
     return true;
 };
 exports.validateFileUpload = validateFileUpload;
-const responseTypes = [
+exports.clientResponseTypes = [
     {
         label: "Acknowledge issue and provide resolution plan",
         description: "Explain circumstances and apologize",
@@ -66,7 +66,7 @@ const responseTypes = [
     },
     {
         label: "Dispute issue and provide counter-evidence",
-        description: "Challenge the client's concerns with documentation",
+        description: "Challenge the expert's concerns with documentation",
         value: "Disputed",
     },
     {
@@ -75,7 +75,25 @@ const responseTypes = [
         value: "NoResponse",
     },
 ];
+exports.expertResponseTypes = [
+    {
+        label: "Acknowledge issue and provide resolution plan",
+        description: "Explain circumstances and apologize",
+        value: "Acknowledged",
+    },
+    {
+        label: "Challenge the client's concerns with documentation",
+        description: "Challenge the client's concerns with documentation",
+        value: "NeedsHelp",
+    },
+    {
+        label: "Request clarification",
+        description: "Ask for more details about the issue",
+        value: "NoResponse",
+    },
+];
 const EscalationRespondForm = ({ goBack, selectedIssue, documentUploadUrl, downloadDocumentUrl, uploadExpertClientFiles, updateProjectEscalation, bucketName, goHome, isExpert, userId, }) => {
+    const responseTypes = isExpert ? exports.expertResponseTypes : exports.clientResponseTypes;
     const [selectedType, setSelectedType] = (0, react_1.useState)(responseTypes[0].value);
     const [responseInput, setResponseInput] = (0, react_1.useState)('');
     const [uploadFiles, setUploadFiles] = (0, react_1.useState)([]);
@@ -149,6 +167,7 @@ const EscalationRespondForm = ({ goBack, selectedIssue, documentUploadUrl, downl
                 variables: {
                     input: {
                         escalationId: selectedIssue.escalationId,
+                        [isExpert ? 'expertResponseType' : 'clientResponseType']: selectedType,
                         [isExpert ? 'expertResponse' : 'clientResponse']: responseInput,
                         [isExpert ? 'expertSupportingDocuments' : 'clientSupportingDocuments']: uploadFiles.length > 0 ? uploadFiles.join(", ") : '',
                         statusChangedBy: userId,

package/lib/components/Escalations/EscalationSubmitForm.js CHANGED Viewed

@@ -44,6 +44,7 @@ const dayjs_1 = __importDefault(require("dayjs"));
 const EscalationRespondForm_1 = require("./EscalationRespondForm");
 const FileUploader_1 = require("../FileUploader");
 const utils_1 = require("../shared/utils");
+const EscalationIssueCard_1 = require("./EscalationIssueCard");
 const issueTypeOptions = [
     { value: 'CommunicationIssues', label: 'Communication Issues' },
     { value: 'Professionalism', label: 'Professionalism' },
@@ -176,7 +177,7 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
             escalationId: escalationId,
             freelancerId: isExpert ? user.userId : selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id,
             clientId: isExpert ? selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.id : clientId,
-            projectDetails: selectedProjects.map((p) => { return { projectId: p.id, projectName: p.name }; }),
+            projectDetails: selectedProjects.filter((p) => p !== undefined).map((p) => { return { projectId: p.id, projectName: p.name }; }),
             issueStartDate: issueStartDate,
             escalationType: issueType,
             severityLevel: severity,
@@ -193,7 +194,7 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
                     input: formData
                 }
             });
-            (0, utils_1.showToast)("success", "Issue created successfully!");
+            (0, utils_1.showToast)("success", "Issue created successfully. You can find it under the `In Progress` section");
         }
         catch (error) {
             console.error("Failed to create an issue!", error);
@@ -220,17 +221,21 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
                 "Report Issue with Your ",
                 isExpert ? 'Client' : 'Expert'),
             react_1.default.createElement("p", { className: "text-gray-600 mt-1" }, "Provide details about the issue you're experiencing and we'll resolve it within 4-8 hours")),
-        react_1.default.createElement("div", { className: "bg-red-50 border border-red-200 rounded-lg p-4 mb-6" },
-            react_1.default.createElement("div", { className: "flex items-start" },
-                react_1.default.createElement("span", { className: "mr-3" }, "!"),
-                react_1.default.createElement("div", null,
-                    react_1.default.createElement("p", { className: "font-medium text-red-800" }, "Common Issues We Can Help With"),
-                    react_1.default.createElement("ul", { className: "mt-1 text-sm text-red-700 list-disc list-inside space-y-1" },
-                        react_1.default.createElement("li", null, `Communication delays (${isExpert ? 'client' : 'expert'} not responding)`),
-                        !isExpert && react_1.default.createElement("li", null, "Missed deadlines or project delays"),
-                        !isExpert && react_1.default.createElement("li", null, "Quality concerns with deliverables"),
-                        react_1.default.createElement("li", null, "Scope changes or unexpected requests"),
-                        react_1.default.createElement("li", null, "Billing or payment disputes"))))),
+        react_1.default.createElement("div", null,
+            react_1.default.createElement("h4", { className: "font-medium text-gray-900 mb-2" }, "Priority Levels for Issues"),
+            react_1.default.createElement("div", { className: "space-y-2 text-sm" },
+                react_1.default.createElement("div", { className: "flex items-center gap-x-2" },
+                    react_1.default.createElement(EscalationIssueCard_1.CustomTag, { label: "Critical" }),
+                    react_1.default.createElement("span", null, "All deliverables are currently blocked; the project cannot move forward.")),
+                react_1.default.createElement("div", { className: "flex items-center gap-x-2" },
+                    react_1.default.createElement(EscalationIssueCard_1.CustomTag, { label: "High" }),
+                    react_1.default.createElement("span", null, "Key deliverables are blocked, preventing meaningful progress.")),
+                react_1.default.createElement("div", { className: "flex items-center gap-x-2" },
+                    react_1.default.createElement(EscalationIssueCard_1.CustomTag, { label: "Medium" }),
+                    react_1.default.createElement("span", null, "Deliverables are still in progress, but timelines are at risk.")),
+                react_1.default.createElement("div", { className: "flex items-center gap-x-2" },
+                    react_1.default.createElement(EscalationIssueCard_1.CustomTag, { label: "Low" }),
+                    react_1.default.createElement("span", null, "Minor issue or inconvenience that does not affect overall project flow.")))),
         react_1.default.createElement("div", { className: "border rounded-lg overflow-hidden mb-6" },
             react_1.default.createElement("div", { className: "bg-gray-50 p-3 border-b" },
                 react_1.default.createElement("h3", { className: "font-medium" }, "Issue Details")),
@@ -263,10 +268,24 @@ const EscalationSubmitForm = ({ goBack, goHome, expertsOrClients, projects, docu
                                 .filter(opt => selected.includes(opt.value))
                                 .map(opt => opt.label)
                                 .join(', ');
-                        }, placeholder: `Select Project(s)` },
+                        }, placeholder: `Select Project(s)`, MenuProps: {
+                            PaperProps: {
+                                style: {
+                                    maxHeight: 300,
+                                },
+                            },
+                        } },
                         react_1.default.createElement(core_1.MenuItem, { disabled: true, value: "" },
                             react_1.default.createElement("em", null, "Select Project(s)...")),
-                        projectOptions.map(option => (react_1.default.createElement(core_1.MenuItem, { key: option.value.id, value: option.value }, option.label))))),
+                        projectOptions.map(option => (react_1.default.createElement(core_1.MenuItem, { key: option.value.id, value: option.value }, option.label))),
+                        react_1.default.createElement(core_1.MenuItem, { disableRipple: true, disableGutters: true },
+                            react_1.default.createElement(base_ui_1.Button, { label: "save & continue", className: "mx-4", color: "primary", onClick: (e) => {
+                                    const menu = e.target.closest('[role="presentation"]');
+                                    if (menu) {
+                                        const escEvent = new KeyboardEvent('keydown', { key: 'Escape', bubbles: true });
+                                        menu.dispatchEvent(escEvent);
+                                    }
+                                } })))),
                 react_1.default.createElement("div", { className: "grid grid-cols-1 md:grid-cols-2 gap-4" },
                     react_1.default.createElement("div", null,
                         react_1.default.createElement("label", { className: "block text-sm font-medium text-gray-700 mb-1" }, "Issue Type"),

package/lib/components/Escalations/EscalationTabsContent.js CHANGED Viewed

@@ -76,7 +76,9 @@ const EscalationTabsContent = ({ activeTab, openEscalationChat, setSelectedIssue
                                     react_1.default.createElement("span", { className: "mx-2" }, "\u2022"),
                                     react_1.default.createElement("span", { className: "text-xs text-gray-500" },
                                         "Resolved By ",
-                                        issue.statusChangedByUser.firstName + " " + issue.statusChangedByUser.lastName)))),
+                                        issue.statusChangedByUser.firstName + " " + issue.statusChangedByUser.lastName,
+                                        " ",
+                                        issue.statusChangedByUser.userTypeId === 2 && '(Paro)')))),
                         issue.status === 'Resolved' && (0, dayjs_1.default)().diff((0, dayjs_1.default)(issue.updatedAt), 'day') <= 30 &&
                             react_1.default.createElement(base_ui_1.Button, { onClick: () => openEscalationChat(issue.escalationNumber), label: "Chat", color: "primary" }))));
             }))

package/lib/components/Escalations/Escalations.js CHANGED Viewed

@@ -53,13 +53,20 @@ const Escalations = ({ expertsOrClients, projects, isExpert = false, escalations
         const userTypeId = (_a = issue === null || issue === void 0 ? void 0 : issue.submittedByUser) === null || _a === void 0 ? void 0 : _a.userTypeId;
         const internalEscalationTo = issue === null || issue === void 0 ? void 0 : issue.internalEscalationTo;
         const status = issue === null || issue === void 0 ? void 0 : issue.status;
-        // Determine if this issue should be shown to the current user
-        const isRelevantEscalation = (isExpert
-            ? (internalEscalationTo === 'expert' || internalEscalationTo === 'both')
-            : (internalEscalationTo === 'client' || internalEscalationTo === 'both'));
-        return (((userTypeId !== user.userTypeId && (isExpert ? issue.expertResponse === null : issue.clientResponse === null)) || //once responded will move to inProgress from active issues
-            (userTypeId === 2 && isRelevantEscalation)) &&
-            status === 'InProgress');
+        const isDifferentUserType = userTypeId !== user.userTypeId;
+        const isPendingResponse = isExpert
+            ? issue.expertResponse === null
+            : issue.clientResponse === null;
+        const isValidInternalEscalation = userTypeId === 2
+            ? (isExpert
+                ? internalEscalationTo !== "client" // expert should NOT see escalations to client
+                : internalEscalationTo !== "expert") // client should NOT see escalations to expert
+            : userTypeId !== user.userTypeId;
+        const shouldInclude = isDifferentUserType &&
+            isPendingResponse &&
+            isValidInternalEscalation &&
+            status === 'InProgress';
+        return shouldInclude;
     });
     const inProgressIssues = escalations.filter(issue => { var _a; return ((((_a = issue === null || issue === void 0 ? void 0 : issue.submittedByUser) === null || _a === void 0 ? void 0 : _a.userTypeId) === user.userTypeId) || (isExpert ? issue.expertResponse !== null : issue.clientResponse !== null)) && (issue === null || issue === void 0 ? void 0 : issue.status) === 'InProgress'; });
     const resolvedIssues = escalations.filter(issue => (issue === null || issue === void 0 ? void 0 : issue.status) === 'Resolved');
@@ -88,7 +95,7 @@ const Escalations = ({ expertsOrClients, projects, isExpert = false, escalations
         react_1.default.createElement("div", { className: isExpert ? "p-6" : "mx-auto p-6 border-solid border-t-2" },
             activeSection === 'support' && selectedIssueId === null && react_1.default.createElement("div", null,
                 react_1.default.createElement("div", { className: "flex justify-between items-center mb-1 mt-2" },
-                    react_1.default.createElement("h2", { className: "text-xl font-bold" }, "Support & Engagement Management"),
+                    react_1.default.createElement("h2", { className: "text-xl font-bold" }, "Engagement Management"),
                     activeIssues.length > 0 ? react_1.default.createElement("div", { className: "flex items-center space-x-2" },
                         react_1.default.createElement("div", { className: `border box-border text-center px-4 pb-0.5 pt-1 text-sm inline-block break-words text-[#A73A43] rounded-full bg-[#F9BABF] border-[#F9BABF] font-medium` },
                             activeIssues.length,
@@ -112,7 +119,7 @@ const Escalations = ({ expertsOrClients, projects, isExpert = false, escalations
                                     react_1.default.createElement("span", null,
                                         react_1.default.createElement("strong", null, "Step 2:"),
                                         " ",
-                                        `${isExpert ? 'Client' : 'Expert'} response with solution/timeline`)),
+                                        `${isExpert ? 'Client response provided' : 'Expert response provided'}`)),
                                 react_1.default.createElement("div", { className: "flex items-center" },
                                     react_1.default.createElement("div", { className: "bg-blue-500 w-2 h-2 rounded-full mr-2" }),
                                     react_1.default.createElement("span", null,
@@ -121,22 +128,22 @@ const Escalations = ({ expertsOrClients, projects, isExpert = false, escalations
                             react_1.default.createElement("div", { className: "mt-3 text-xs text-gray-600 bg-white p-2 rounded border" },
                                 react_1.default.createElement("strong", null, "Chat integration:"),
                                 " ",
-                                `All escalations include real-time chat with ${isExpert ? 'client' : 'expert'} and support team for transparent communication.`)),
+                                `All issues include asynchronous messaging with your ${isExpert ? 'client' : 'expert'} and the support team for transparent communication`)),
                         react_1.default.createElement("div", null,
-                            react_1.default.createElement("h4", { className: "font-medium text-gray-900 mb-2" }, "Priority Levels & Response Times"),
+                            react_1.default.createElement("h4", { className: "font-medium text-gray-900 mb-2" }, "Priority Levels for Issues"),
                             react_1.default.createElement("div", { className: "space-y-2 text-sm" },
                                 react_1.default.createElement("div", { className: "flex items-center gap-x-2" },
                                     react_1.default.createElement(EscalationIssueCard_1.CustomTag, { label: "Critical" }),
-                                    react_1.default.createElement("span", null, "All work blocked")),
+                                    react_1.default.createElement("span", null, "All deliverables are currently blocked; the project cannot move forward.")),
                                 react_1.default.createElement("div", { className: "flex items-center gap-x-2" },
                                     react_1.default.createElement(EscalationIssueCard_1.CustomTag, { label: "High" }),
-                                    react_1.default.createElement("span", null, "Progress blocked")),
+                                    react_1.default.createElement("span", null, "Key deliverables are blocked, preventing meaningful progress.")),
                                 react_1.default.createElement("div", { className: "flex items-center gap-x-2" },
                                     react_1.default.createElement(EscalationIssueCard_1.CustomTag, { label: "Medium" }),
-                                    react_1.default.createElement("span", null, "Timeline impacted")),
+                                    react_1.default.createElement("span", null, "Deliverables are still in progress, but timelines are at risk.")),
                                 react_1.default.createElement("div", { className: "flex items-center gap-x-2" },
                                     react_1.default.createElement(EscalationIssueCard_1.CustomTag, { label: "Low" }),
-                                    react_1.default.createElement("span", null, "Minor issues")))))),
+                                    react_1.default.createElement("span", null, "Minor issue or inconvenience that does not affect overall project flow.")))))),
                 isExpert &&
                     react_1.default.createElement("div", { className: "rounded-lg p-2 mb-4 shadow-lg" },
                         react_1.default.createElement("div", { className: "flex items-center justify-between" },

package/lib/components/Escalations/MarkResolvedModal.js CHANGED Viewed

@@ -53,7 +53,7 @@ const MarkResolvedModal = ({ escalationId, expertName, open, onClose, updateProj
                     }
                 }
             });
-            (0, utils_1.showToast)("success", "Issue marked as resolved!");
+            (0, utils_1.showToast)("success", "Issue marked as resolved. You can now find it in the `Resolved` section");
         }
         catch (error) {
             console.error("Failed to update escalation!", error);

package/lib/components/Escalations/ViewResponseModal.js CHANGED Viewed

@@ -8,10 +8,17 @@ const base_icons_1 = require("@paro.io/base-icons");
 const core_1 = require("@material-ui/core");
 const utils_1 = require("../shared/utils");
 const EscalationIssueCard_1 = require("./EscalationIssueCard");
+const EscalationRespondForm_1 = require("./EscalationRespondForm");
 const ViewResponseModal = ({ selectedIssue, open, onClose, isExpert }) => {
+    var _a, _b, _c, _d, _e;
     const docs = [selectedIssue.expertSupportingDocuments, selectedIssue.clientSupportingDocuments, selectedIssue.internalSupportingDocuments];
     const processedDocs = (0, utils_1.processDocs)(docs);
-    return (react_1.default.createElement(core_1.Dialog, { open: open, onClose: onClose, maxWidth: 'sm' },
+    const responseType = isExpert ? (_a = selectedIssue.clientResponseType) !== null && _a !== void 0 ? _a : selectedIssue.expertResponseType : (_b = selectedIssue.expertResponseType) !== null && _b !== void 0 ? _b : selectedIssue.clientResponseType;
+    const responseTypeLabel = ((_c = [...new Set([...EscalationRespondForm_1.clientResponseTypes, ...EscalationRespondForm_1.expertResponseTypes])].find(opt => opt.value === responseType)) === null || _c === void 0 ? void 0 : _c.label) || responseType || "";
+    const response = isExpert ? (_d = selectedIssue.clientResponse) !== null && _d !== void 0 ? _d : selectedIssue.expertResponse : (_e = selectedIssue.expertResponse) !== null && _e !== void 0 ? _e : selectedIssue.clientResponse;
+    return (react_1.default.createElement(core_1.Dialog, { open: open, onClose: onClose, maxWidth: 'md', PaperProps: {
+            style: { minWidth: '40%' }
+        } },
         react_1.default.createElement(core_1.DialogTitle, null,
             react_1.default.createElement("div", { className: "text-black mb-1 p-2 pl-4 absolute top-0 left-0 w-full flex flex-row justify-between items-center z-50" },
                 react_1.default.createElement("div", { className: "flex flex-col items-start" },
@@ -21,15 +28,12 @@ const ViewResponseModal = ({ selectedIssue, open, onClose, isExpert }) => {
                         react_1.default.createElement(base_icons_1.IconX, null))))),
         react_1.default.createElement(core_1.DialogContent, null,
             react_1.default.createElement("div", { className: "bg-green-50 border-green-800 border border-l-4 rounded p-4 mt-4 mb-4" },
-                react_1.default.createElement("p", { className: "text-sm font-medium" },
-                    "Status: ",
-                    react_1.default.createElement("span", { className: "font-normal" }, "Responded")),
                 react_1.default.createElement("p", { className: "text-sm font-medium" },
                     "Response Type: ",
-                    react_1.default.createElement("span", { className: "font-normal" }, isExpert ? selectedIssue.clientResponseType : selectedIssue.expertResponseType)),
+                    react_1.default.createElement("span", { className: "font-normal" }, responseTypeLabel)),
                 react_1.default.createElement("p", { className: "text-sm font-medium" },
                     "Response: ",
-                    react_1.default.createElement("span", { className: "font-normal" }, isExpert ? selectedIssue.clientResponse : selectedIssue.expertResponse))),
+                    react_1.default.createElement("span", { className: "font-normal" }, response))),
             processedDocs && processedDocs.length > 0 && (react_1.default.createElement("div", { className: "flex flex-wrap gap-2 mt-4 mb-2" },
                 react_1.default.createElement("span", { className: "text-sm font-bold text-gray-500 items-center" }, "Supporting Documents: "),
                 processedDocs.map((d, idx) => (react_1.default.createElement(EscalationIssueCard_1.CustomTag, { key: idx, label: d.split('%2F')[1], customColor: `bg-success border-success` }))))))));

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@paro.io/expert-shared-components",
-  "version": "1.13.6",
+  "version": "1.13.8",
   "description": "",
   "main": "lib/index.js",
   "scripts": {