Merge pull request #7422 from coronasafe/develop

.github/workflows/deploy.yaml

@@ -4,13 +4,13 @@ on:
   push:
     branches:
       - develop
-      - master
+      - staging
     tags:
       - v*
   pull_request:
     branches:
       - develop
-      - master
+      - staging
   workflow_dispatch:
 
 concurrency:

Dockerfile

@@ -1,10 +1,12 @@
 #build-stage
-FROM node:18-buster-slim as build-stage
+FROM --platform=$BUILDPLATFORM node:18-buster-slim as build-stage
 
 WORKDIR /app
 
 ENV NODE_OPTIONS="--max-old-space-size=4096"
 
+RUN if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "arm64" ]; then apt-get update && apt-get install -y python3-dev make g++; fi
+
 COPY package.json package-lock.json ./
 
 RUN npm install --legacy-peer-deps

src/Components/Facility/ConsultationForm.tsx

@@ -761,10 +761,9 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
         weight: Number(state.form.weight),
         height: Number(state.form.height),
         bed: bed && bed instanceof Array ? bed[0]?.id : bed?.id,
+        patient_no: state.form.patient_no || null,
       };
 
-      if (state.form.patient_no) data["patient_no"] = state.form.patient_no;
-
       const res = await dispatchAction(
         id ? updateConsultation(id!, data) : createConsultation(data)
       );