Merge branch 'develop' into fix-bednumbertest

.github/workflows/cypress.yaml

@@ -22,11 +22,21 @@ jobs:
       - name: Checkout 📥
         uses: actions/checkout@v3
 
+      - name: Set backend branch
+        id: backend-branch
+        run: |
+          if [[ '${{ github.event.pull_request.base.ref }}' == 'staging' ]]; then
+            echo "branch=staging" >> $GITHUB_OUTPUT
+          else
+            echo "branch=develop" >> $GITHUB_OUTPUT
+          fi
+
       - name: Checkout care 📥
         uses: actions/checkout@v3
         with:
           repository: coronasafe/care
           path: care
+          ref: ${{ steps.backend-branch.outputs.branch }}
 
       - name: Start care docker containers 🐳
         run: |

package.json

@@ -80,7 +80,6 @@
     "react-pdf": "^9.0.0",
     "react-player": "^2.16.0",
     "react-redux": "^8.1.1",
-    "react-transition-group": "^4.4.5",
     "react-webcam": "^7.2.0",
     "redux": "^4.2.1",
     "redux-thunk": "^2.4.2",
@@ -98,8 +97,6 @@
     "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/forms": "^0.5.7",
     "@tailwindcss/typography": "^0.5.13",
-    "@types/cypress": "^1.1.3",
-    "@types/echarts": "^4.9.22",
     "@types/google.maps": "^3.55.8",
     "@types/lodash-es": "^4.17.12",
     "@types/qrcode.react": "^1.0.5",
@@ -108,8 +105,6 @@
     "@types/react-csv": "^1.1.10",
     "@types/react-dom": "^18.3.0",
     "@types/react-google-recaptcha": "^2.1.9",
-    "@types/react-qr-reader": "^2.1.7",
-    "@types/react-transition-group": "^4.4.10",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@vitejs/plugin-react-swc": "^3.6.0",
     "autoprefixer": "^10.4.19",

src/Components/Facility/ConsultationForm.tsx

@@ -740,12 +740,6 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
         patient_no: state.form.patient_no || null,
       };
 
-      request(id ? routes.updateConsultation : routes.createConsultation, {
-        pathParams: id ? { id } : undefined,
-        body: data,
-        controllerRef: submitController,
-      });
-
       const { data: obj } = await request(
         id ? routes.updateConsultation : routes.createConsultation,
         {