@djb25/digit-ui-module-common 1.0.7 → 1.0.8

package/dist/index.js

@@ -2892,15 +2892,15 @@ const CitizenPayment = _ref => {
   }, {
     path: "/digit-ui/citizen/payment/my-bills",
     label: t("CS_PAYMENT_BILL_DETAILS"),
-    show: pathname.includes("/my-bills")
+    show: pathname.includes("/my-bills") || pathname.includes("/billDetails") || pathname.includes("/collect") || pathname.includes("/success") || pathname.includes("/failure")
   }, {
     path: pathname,
     label: t("PAYERS_DETAILS_HEADER"),
-    show: pathname.includes("/billDetails")
+    show: pathname.includes("/billDetails") || pathname.includes("/collect") || pathname.includes("/success") || pathname.includes("/failure")
   }, {
     path: pathname,
     label: t("PAYMENT_CS_HEADER"),
-    show: pathname.includes("/collect")
+    show: pathname.includes("/collect") || pathname.includes("/success") || pathname.includes("/failure")
   }, {
     path: pathname,
     label: t("CS_TITLE_PAYMENT_SUCCESS"),
@@ -2919,13 +2919,11 @@ const CitizenPayment = _ref => {
         label: t("ES_TITLE_WATER_AND_SEWERAGE"),
         show: true
       });
-      if (routerState !== null && routerState !== void 0 && routerState.fromMyApplications || routerState !== null && routerState !== void 0 && routerState.fromApplicationDetails) {
-        activeCrumbs.splice(2, 0, {
-          path: "/digit-ui/citizen/ws/my-applications",
-          label: t("CS_HOME_MY_APPLICATIONS"),
-          show: true
-        });
-      }
+      activeCrumbs.splice(2, 0, {
+        path: "/digit-ui/citizen/ws/my-applications",
+        label: t("CS_HOME_MY_APPLICATIONS"),
+        show: true
+      });
       if (routerState !== null && routerState !== void 0 && routerState.fromApplicationDetails) {
         activeCrumbs.splice(3, 0, {
           label: t("WS_APPLICATION_DETAILS_HEADER"),
@@ -2934,8 +2932,15 @@ const CitizenPayment = _ref => {
         });
       }
     }
+    activeCrumbs.forEach((crumb, index) => {
+      if (index < activeCrumbs.length - 1 && crumb.path === pathname) {
+        crumb.path = "";
+        crumb.onClick = () => window.history.go(index - (activeCrumbs.length - 1));
+      }
+    });
     if (activeCrumbs.length > 0) {
       activeCrumbs[activeCrumbs.length - 1].path = "";
+      delete activeCrumbs[activeCrumbs.length - 1].onClick;
     }
     return activeCrumbs;
   };