Merge pull request #5429 from msupply-foundation/#5428-crashing-app-w…

…hen-switching-from-patient-to-prescriber

#5428 App crashing in dispensing mode

src/pages/dataTableUtilities/getColumns.js

@@ -10,7 +10,7 @@ import { ROUTES } from '../../navigation/constants';
 import { FORMS, MODALS, TABS } from '../../widgets/constants';
 
 const PAGE_COLUMN_WIDTHS = {
-  [FORMS.PATIENT]: [2.5, 2, 4, 4, 2, 2, 2, 2],
+  [FORMS.PATIENT]: [3, 2, 4, 4, 2, 2, 1.5, 2],
   [FORMS.PRESCRIBER]: [1, 3, 3, 1],
   [MODALS.PATIENT_HISTORY]: [1, 4, 1, 1, 2],
   [MODALS.VACCINE_HISTORY]: [1, 4, 1, 1, 2],

src/reducers/DispensaryReducer.js

@@ -58,23 +58,31 @@ export const DispensaryReducer = (state = initialState(), action) => {
       const { usingAdverseDrugReactions } = payload;
       const { dataSet } = state;
 
+      // Default to patient
+      let sortBy = 'createdDate';
+      let isAscending = false;
+
       const patientDataSet = usingAdverseDrugReactions
         ? 'patientWithAdverseDrugReactions'
         : 'patient';
 
       const prescriberDataSet = 'prescriber';
       const newDataSet = dataSet === patientDataSet ? prescriberDataSet : patientDataSet;
-
       const newColumns = getColumns(newDataSet);
 
+      if (newDataSet === 'prescriber') {
+        sortBy = 'firstName';
+        isAscending = true;
+      }
+
       const newData = UIDatabase.objects(newDataSet === patientDataSet ? 'Patient' : 'Prescriber');
 
       return {
         ...state,
         dataSet: newDataSet,
         columns: newColumns,
-        sortKey: 'createdDate',
-        isAscending: false,
+        sortKey: sortBy,
+        isAscending,
         searchTerm: '',
         data: newData,
       };