Banner removal , modify water sewerage connection summary documents fix and universal connection deprecation popup addition

web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/newCollection.js

@@ -490,6 +490,21 @@ const newCollection = {
         newCollectionFooter,
       },
     },
+    adhocDialog: {
+  uiFramework: "custom-containers-local",
+  moduleName: "egov-uc",
+  componentPath: "DialogContainer",
+  props: {
+    open: false,
+    maxWidth: "sm",
+    screenKey: "newCollection"
+  },
+  children: {
+    message: getLabel({
+      labelKey: "MCOLLECT_CATEGORY_POPUP_MESSAGE"
+    })
+  }
+}
   },
 };
 

web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/newCollectionResource/newCollectionServiceDetails.js

@@ -16,6 +16,20 @@ import "./index.css";
 import { setServiceCategory } from "../../utils";
 const tenantId = getTenantId();
 
+const matchesPopupService = value => {
+  const code = String(
+    typeof value === "object" ? value.code || value.value || value.name : value || ""
+  )
+    .replace(/[_\s.-]/g, "")
+    .toLowerCase();
+
+  return ["advt", "chb", "noduescertificate", "noduecertificate"].some(item => {
+    const isMatch = code.includes(item);
+    console.log("code, item, isMatch", code, item, isMatch);
+    return isMatch;
+  });
+};
+
 export const newCollectionServiceDetailsCard = getCommonCard(
   {
     header: getCommonTitle(
@@ -228,6 +242,28 @@ export const newCollectionServiceDetailsCard = getCommonCard(
               "preparedFinalObject.applyScreenMdmsData.nestedServiceData",
               {}
             );
+            const selectedCategory = action.value;
+            const categoryData = serviceData[selectedCategory] || {};
+            const childServices = Array.isArray(categoryData.child)
+              ? categoryData.child
+              : [];
+
+            const shouldShowPopup =
+              matchesPopupService(selectedCategory) ||
+              childServices.some(matchesPopupService);
+
+              console.log(shouldShowPopup , selectedCategory,childServices, "shouldShowPopup selectedCategory childServices" )
+
+            if (shouldShowPopup) {
+              dispatch(
+                handleField(
+                  "newCollection",
+                  "components.adhocDialog",
+                  "props.open",
+                  true,
+                ),
+              );
+            }
             if (action.value) {
 
               let visibleFlag = false;

web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/footer.js

@@ -215,6 +215,7 @@ const getMdmsData = async (state, dispatch) => {
 const callBackForNext = async (state, dispatch) => {
   window.scrollTo(0, 0);
   let activeStep = get(state.screenConfiguration.screenConfig["apply"], "components.div.children.stepper.props.activeStep", 0);
+  await pushTheDocsUploadedToRedux(state, dispatch);
   let isFormValid = true;
   let hasFieldToaster = false;
   /* validations for property details screen */

web/rainmaker/packages/citizen/src/modules/citizen/User/Login/index.js

@@ -14,9 +14,9 @@ class Login extends Component {
 
     return (
       <Banner bannerUrl={bannerUrl} logoUrl={logoUrl}>
-        <marquee style={{ color: "white", fontStyle: "italic", fontSize: "20px", margin: "20px 0" }}>
+        {/* <marquee style={{ color: "white", fontStyle: "italic", fontSize: "20px", margin: "20px 0" }}>
          Scheduled Maintenance Notice: The mSeva Portal will undergo scheduled maintenance and database optimization from 7:00 PM on 07 August 2026 to 6:00 PM on 09 August 2026. Services may be temporarily unavailable or experience intermittent interruptions during this period. We regret the inconvenience caused and appreciate your patience and cooperation. - Team mSeva, Punjab Municipal Infrastructure Development Company (PMIDC)
-      </marquee>
+      </marquee> */}
         <LoginFormHOC logoUrl={logoUrl} qrCodeURL={qrCodeURL} enableWhatsApp={enableWhatsApp}/>
       </Banner>
     );

web/rainmaker/packages/citizen/src/modules/citizen/User/Register/index.js

@@ -12,9 +12,9 @@ class Register extends Component {
     const { bannerUrl, logoUrl,qrCodeURL,enableWhatsApp } = this.props;
     return (
       <Banner hideBackButton={false} bannerUrl={bannerUrl} logoUrl={logoUrl}>
-        <marquee style={{ color: "white", fontStyle: "italic", fontSize: "20px", margin: "20px 0" }}>
+        {/* <marquee style={{ color: "white", fontStyle: "italic", fontSize: "20px", margin: "20px 0" }}>
          Scheduled Maintenance Notice: The mSeva Portal will undergo scheduled maintenance and database optimization from 7:00 PM on 07 August 2026 to 6:00 PM on 09 August 2026. Services may be temporarily unavailable or experience intermittent interruptions during this period. We regret the inconvenience caused and appreciate your patience and cooperation. - Team mSeva, Punjab Municipal Infrastructure Development Company (PMIDC)
-      </marquee>
+      </marquee> */}
         <RegisterFormHOC logoUrl={logoUrl} qrCodeURL={qrCodeURL} enableWhatsApp={enableWhatsApp}/>
       </Banner>
     );

web/rainmaker/packages/employee/src/modules/employee/User/Login/index.js

@@ -10,7 +10,7 @@ const LoginFormHOC = formHoc({ formKey: "employeeLogin" })(LoginForm);
 const Login = ({ bannerUrl, logoUrl }) => {
   return (
     <Banner hideBackButton={false} bannerUrl={bannerUrl} logoUrl={logoUrl}>
-      <div
+      {/* <div
   style={{
     maxWidth: "1200px",
     width: "100%",
@@ -48,7 +48,7 @@ const Login = ({ bannerUrl, logoUrl }) => {
     <b>Team mSeva</b>, Punjab Municipal Infrastructure Development Company
     (PMIDC)
   </marquee>
-</div>
+</div> */}
       <LoginFormHOC logoUrl={logoUrl} />
     </Banner>
   );