diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 4d4f835dcb0..17d8151bdbe 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -73,7 +73,7 @@ jobs:
     # needs: test
     if: github.ref == 'refs/heads/develop'
     name: Build and push to GitHub Staging
-    runs-on: ubuntu-latest 
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set current date as ENV variable
@@ -193,7 +193,7 @@ jobs:
       - name: install kubectl
         uses: azure/setup-kubectl@v2.0
         with:
-          version: 'v1.23.6'
+          version: "v1.23.6"
         id: install
       - name: Deploy Care Fe Staging
         run: |
@@ -226,7 +226,7 @@ jobs:
       - name: install kubectl
         uses: azure/setup-kubectl@v2.0
         with:
-          version: 'v1.23.6'
+          version: "v1.23.6"
         id: install
       - name: Deploy Care Fe Staging
         run: |
@@ -259,7 +259,7 @@ jobs:
       - name: install kubectl
         uses: azure/setup-kubectl@v2.0
         with:
-          version: 'v1.23.6'
+          version: "v1.23.6"
         id: install
       - name: Deploy Care Fe Production
         run: |
@@ -284,7 +284,7 @@ jobs:
           token: ${{ secrets.GIT_ACCESS_TOKEN  }}
           path: kube
           ref: main
-      
+
       # Setup gcloud CLI
       - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
         with:
@@ -301,12 +301,12 @@ jobs:
       - name: install kubectl
         uses: azure/setup-kubectl@v2.0
         with:
-          version: 'v1.23.6'
+          version: "v1.23.6"
         id: install
-      
+
       - name: Deploy Care Fe Production
         run: |
           mkdir -p $HOME/.kube/
           cd kube/deployments/
           sed -i -e "s/_BUILD_NUMBER_/${GITHUB_RUN_NUMBER}/g" care-fe.yaml
-          kubectl apply -f care-fe.yaml 
+          kubectl apply -f care-fe.yaml
diff --git a/package-lock.json b/package-lock.json
index 24f90f8bec5..a32f294b376 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -94,6 +94,7 @@
       "devDependencies": {
         "@fullhuman/postcss-purgecss": "^2.3.0",
         "@pnotify/core": "^5.2.0",
+        "@pnotify/mobile": "^5.2.0",
         "@testing-library/jest-dom": "^5.12.0",
         "@testing-library/react": "^11.2.7",
         "@testing-library/user-event": "^13.1.9",
@@ -3519,6 +3520,15 @@
       "integrity": "sha512-d9ZM7Q6ZxuwTJ14QbOa7pWmoUqObPis7S1K+TzISffrL8w2f7JigEPI281agLShVAMIsE5SsC6O9YhkutwekbA==",
       "dev": true
     },
+    "node_modules/@pnotify/mobile": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@pnotify/mobile/-/mobile-5.2.0.tgz",
+      "integrity": "sha512-uu0V7h41Y8UTQA6ZB26PcHU7wHu5nwP/FEmMyimHEpEqhrvkzIRD2CxB7zu9SYp3Jk2NFcJC3NiueO3Kh25CVA==",
+      "dev": true,
+      "dependencies": {
+        "@pnotify/core": "^5.2.0"
+      }
+    },
     "node_modules/@rescript/react": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.10.3.tgz",
@@ -41034,6 +41044,15 @@
       "integrity": "sha512-d9ZM7Q6ZxuwTJ14QbOa7pWmoUqObPis7S1K+TzISffrL8w2f7JigEPI281agLShVAMIsE5SsC6O9YhkutwekbA==",
       "dev": true
     },
+    "@pnotify/mobile": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@pnotify/mobile/-/mobile-5.2.0.tgz",
+      "integrity": "sha512-uu0V7h41Y8UTQA6ZB26PcHU7wHu5nwP/FEmMyimHEpEqhrvkzIRD2CxB7zu9SYp3Jk2NFcJC3NiueO3Kh25CVA==",
+      "dev": true,
+      "requires": {
+        "@pnotify/core": "^5.2.0"
+      }
+    },
     "@rescript/react": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.10.3.tgz",
diff --git a/package.json b/package.json
index 18e2da9051c..f968dc3ea81 100644
--- a/package.json
+++ b/package.json
@@ -147,6 +147,7 @@
   "devDependencies": {
     "@fullhuman/postcss-purgecss": "^2.3.0",
     "@pnotify/core": "^5.2.0",
+    "@pnotify/mobile": "^5.2.0",
     "@testing-library/jest-dom": "^5.12.0",
     "@testing-library/react": "^11.2.7",
     "@testing-library/user-event": "^13.1.9",
diff --git a/src/Components/Common/HelperInputFields.tsx b/src/Components/Common/HelperInputFields.tsx
index ebb89b73543..0694726b032 100644
--- a/src/Components/Common/HelperInputFields.tsx
+++ b/src/Components/Common/HelperInputFields.tsx
@@ -77,17 +77,17 @@ type ActionTextFieldProps = TextFieldPropsExtended & {
   actionIcon?: React.ReactElement;
   action?: () => void;
 };
-type Option = { text: string; score: number };
-interface InputProps {
-  options: Array<Option>;
-  onChange: (
-    e: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>,
-    index: number
-  ) => void;
-  handleDeleteOption: (index: number) => void;
-  errors: Array<Option>;
-  onKeyDown: (e: React.KeyboardEvent<HTMLInputElement>) => void;
-}
+// type Option = { text: string; score: number };
+// interface InputProps {
+//   options: Array<Option>;
+//   onChange: (
+//     e: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>,
+//     index: number
+//   ) => void;
+//   handleDeleteOption: (index: number) => void;
+//   errors: Array<Option>;
+//   onKeyDown: (e: React.KeyboardEvent<HTMLInputElement>) => void;
+// }
 interface DateInputFieldProps extends DatePickerProps {
   value: string;
   onChange: (
@@ -100,13 +100,13 @@ interface DateInputFieldProps extends DatePickerProps {
   disabled?: boolean;
   margin?: "none" | "dense" | "normal";
 }
-interface TimeInputFieldProps {
-  value: string;
-  onChange: (
-    date: MaterialUiPickersDate,
-    value?: string | null | undefined
-  ) => void;
-}
+// interface TimeInputFieldProps {
+//   value: string;
+//   onChange: (
+//     date: MaterialUiPickersDate,
+//     value?: string | null | undefined
+//   ) => void;
+// }
 
 interface CheckboxProps extends Omit<FormControlLabelProps, "control"> {
   label: string;
@@ -234,7 +234,7 @@ export const DateInputField = (props: DateInputFieldProps) => {
     onChange,
     label,
     errors,
-    variant,
+    // variant,
     disabled,
     margin,
     ...restProps
@@ -598,11 +598,11 @@ export const PhoneNumberField = (props: any) => {
     turnOffAutoFormat,
     disabled,
   } = props;
-  const countryRestriction = !!onlyIndia ? { onlyCountries: ["in"] } : {};
+  const countryRestriction = onlyIndia ? { onlyCountries: ["in"] } : {};
   const onChangeHandler = debounce(onChange, 500);
   const handleChange = (
     value: string,
-    data: ICountryData | {},
+    data: Partial<ICountryData>,
     event: ChangeEvent<HTMLInputElement>,
     formattedValue: string
   ) => {
diff --git a/src/Components/Notifications/NotificationsList.tsx b/src/Components/Notifications/NotificationsList.tsx
index 96127334e63..e16ce8fdc92 100644
--- a/src/Components/Notifications/NotificationsList.tsx
+++ b/src/Components/Notifications/NotificationsList.tsx
@@ -24,8 +24,7 @@ interface Props {
   onClickCB?: () => void;
 }
 
-export default function ResultList(props: Props) {
-  const { expanded, onClickCB } = props;
+export default function ResultList({ expanded = false, onClickCB }: Props) {
   const rootState: any = useSelector((rootState) => rootState);
   const { currentUser } = rootState;
   const { t } = useTranslation();
diff --git a/src/Utils/Notifications.js b/src/Utils/Notifications.js
index 8e5e40bd2fe..4233485e0ee 100644
--- a/src/Utils/Notifications.js
+++ b/src/Utils/Notifications.js
@@ -1,8 +1,12 @@
-import { alert, Stack } from "@pnotify/core";
+import { alert, Stack, defaultModules } from "@pnotify/core";
 import "@pnotify/core/dist/PNotify.css";
+import * as PNotifyMobile from "@pnotify/mobile";
+import "@pnotify/mobile/dist/PNotifyMobile.css";
 import "@pnotify/core/dist/BrightTheme.css";
 import _ from "lodash";
 
+defaultModules.set(PNotifyMobile, {});
+
 const notifyStack = new Stack({
   dir1: "down",
   dir2: "left",
@@ -26,11 +30,6 @@ const notify = (text, type) => {
       closer: false,
       sticker: false,
     },
-    modules: {
-      Desktop: {
-        desktop: true,
-      },
-    },
     stack: notifyStack,
   });
   notification.refs.elem.addEventListener("click", () => {