Merge branch 'develop' into issues/9336/infinite-render-phonenumber-f…

…ield

package.json

@@ -85,7 +85,7 @@
     "hi-profiles": "^1.1.0",
     "i18next": "^23.16.4",
     "i18next-browser-languagedetector": "^8.0.0",
-    "i18next-http-backend": "^2.6.2",
+    "i18next-http-backend": "^3.0.1",
     "lodash-es": "^4.17.21",
     "postcss-loader": "^8.1.1",
     "qrcode.react": "^4.1.0",
@@ -94,7 +94,7 @@
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "18.3.1",
     "react-google-recaptcha": "^3.1.0",
-    "react-i18next": "^15.1.1",
+    "react-i18next": "^15.1.3",
     "react-infinite-scroll-component": "^6.1.0",
     "react-pdf": "^9.1.1",
     "react-webcam": "^7.2.0",

src/components/Common/Page.tsx

@@ -33,7 +33,7 @@ export default function Page(props: PageProps) {
 
   let padding = "";
   if (!props.noImplicitPadding) {
-    if (!props.hideBack || props.componentRight) padding = "py-3 md:p-6";
+    if (!props.hideBack || props.componentRight) padding = "py-3 md:px-6";
     else padding = "px-6 py-5";
   }
 

src/components/Patient/ManagePatients.tsx

@@ -749,14 +749,6 @@ export const PatientManager = () => {
     permittedFacilities?.count === 1 ? permittedFacilities.results[0] : null;
 
   const searchOptions = [
-    {
-      key: "phone_number",
-      label: "Phone Number",
-      type: "phone" as const,
-      placeholder: "Search_by_phone_number",
-      value: qParams.phone_number || "",
-      shortcutKey: "p",
-    },
     {
       key: "name",
       label: "Name",
@@ -773,6 +765,14 @@ export const PatientManager = () => {
       value: qParams.patient_no || "",
       shortcutKey: "u",
     },
+    {
+      key: "phone_number",
+      label: "Phone Number",
+      type: "phone" as const,
+      placeholder: "Search_by_phone_number",
+      value: qParams.phone_number || "",
+      shortcutKey: "p",
+    },
     {
       key: "emergency_contact_number",
       label: "Emergency Contact Phone Number",