diff --git a/app/src/UI/OfflineDataSync/OfflineDataSyncTable.tsx b/app/src/UI/OfflineDataSync/OfflineDataSyncTable.tsx
index 2f7b5f634..6503a0bae 100644
--- a/app/src/UI/OfflineDataSync/OfflineDataSyncTable.tsx
+++ b/app/src/UI/OfflineDataSync/OfflineDataSyncTable.tsx
@@ -3,13 +3,14 @@ import { Button, LinearProgress } from '@mui/material';
 import { OfflineActivityRecord, selectOfflineActivity } from 'state/reducers/offlineActivity';
 import { useSelector } from 'utils/use_selector';
 import { useDispatch } from 'react-redux';
-import { ACTIVITY_GET_LOCAL_REQUEST, ACTIVITY_OFFLINE_DELETE_ITEM, ACTIVITY_RUN_OFFLINE_SYNC } from 'state/actions';
+import { ACTIVITY_OFFLINE_DELETE_ITEM, ACTIVITY_RUN_OFFLINE_SYNC } from 'state/actions';
 import Delete from '@mui/icons-material/Delete';
 import './OfflineDataSync.css';
 import moment from 'moment';
 import { FileOpen } from '@mui/icons-material';
 import { ActivitySubtypeShortLabels } from 'sharedAPI';
 import { useHistory } from 'react-router-dom';
+import Activity from 'state/actions/activity/Activity';
 
 export const OfflineDataSyncTable = () => {
   const { working, serializedActivities } = useSelector(selectOfflineActivity);
@@ -60,7 +61,7 @@ export const OfflineDataSyncTable = () => {
                     <Button
                       disabled={!(workingOffline || authenticated)}
                       onClick={() => {
-                        dispatch({ type: ACTIVITY_GET_LOCAL_REQUEST, payload: { activityID: key } });
+                        dispatch(Activity.getLocal(key));
                         history.push(`/Records/Activity:${key}/form`);
                       }}
                     >
diff --git a/app/src/UI/Overlay/FormMenuButtons.tsx b/app/src/UI/Overlay/FormMenuButtons.tsx
index 565e8b79f..6133964ef 100644
--- a/app/src/UI/Overlay/FormMenuButtons.tsx
+++ b/app/src/UI/Overlay/FormMenuButtons.tsx
@@ -2,14 +2,8 @@ import { Button } from '@mui/material';
 import { useEffect, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { useSelector } from 'utils/use_selector';
-import {
-  ACTIVITY_COPY_REQUEST,
-  ACTIVITY_DELETE_REQUEST,
-  ACTIVITY_PASTE_REQUEST,
-  ACTIVITY_SAVE_REQUEST,
-  ACTIVITY_SUBMIT_REQUEST,
-  OVERLAY_MENU_TOGGLE
-} from 'state/actions';
+import { OVERLAY_MENU_TOGGLE } from 'state/actions';
+import Activity from 'state/actions/activity/Activity';
 
 export const FormMenuButtons = (props) => {
   const dispatch = useDispatch();
@@ -39,23 +33,23 @@ export const FormMenuButtons = (props) => {
   }, [accessRoles, username, activityCreatedBy]);
 
   const handleSaveDraft = () => {
-    dispatch({ type: ACTIVITY_SAVE_REQUEST });
+    dispatch(Activity.save());
     dispatch({ type: OVERLAY_MENU_TOGGLE });
   };
   const handlePublish = () => {
-    dispatch({ type: ACTIVITY_SUBMIT_REQUEST });
+    dispatch(Activity.submit());
     dispatch({ type: OVERLAY_MENU_TOGGLE });
   };
   const handleCopy = () => {
-    dispatch({ type: ACTIVITY_COPY_REQUEST });
+    dispatch(Activity.copy());
     dispatch({ type: OVERLAY_MENU_TOGGLE });
   };
   const handlePaste = () => {
-    dispatch({ type: ACTIVITY_PASTE_REQUEST });
+    dispatch(Activity.paste());
     dispatch({ type: OVERLAY_MENU_TOGGLE });
   };
   const handleDelete = () => {
-    dispatch({ type: ACTIVITY_DELETE_REQUEST });
+    dispatch(Activity.deleteReq());
     dispatch({ type: OVERLAY_MENU_TOGGLE });
     setTimeout(() => history.back(), 5000);
   };
diff --git a/app/src/UI/Overlay/Records/NewRecordDialog.tsx b/app/src/UI/Overlay/Records/NewRecordDialog.tsx
index 78b84e806..7eca21b9b 100644
--- a/app/src/UI/Overlay/Records/NewRecordDialog.tsx
+++ b/app/src/UI/Overlay/Records/NewRecordDialog.tsx
@@ -13,12 +13,13 @@ import { useHistory } from 'react-router-dom';
 import { useEffect, useState } from 'react';
 import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
 import { useDispatch } from 'react-redux';
-import { ACTIVITY_CREATE_REQUEST, CLOSE_NEW_RECORD_MENU } from 'state/actions';
+import { CLOSE_NEW_RECORD_MENU } from 'state/actions';
 import { ActivitySubtypeRelations, ActivitySubtypeShortLabels } from 'sharedAPI';
 
 import './NewRecordDialog.css';
 import UserSettings from 'state/actions/userSettings/UserSettings';
 import { useSelector } from 'utils/use_selector';
+import Activity from 'state/actions/activity/Activity';
 
 export interface INewRecordDialog {}
 
@@ -72,10 +73,9 @@ const NewRecordDialog = (props: INewRecordDialog) => {
   }, [newRecordDialogState.recordType]);
 
   const insert_record = async () => {
-    dispatch({
-      type: ACTIVITY_CREATE_REQUEST,
-      payload: { type: newRecordDialogState.recordType, subType: newRecordDialogState.recordSubtype }
-    });
+    dispatch(
+      Activity.createReq({ type: newRecordDialogState.recordType, subType: newRecordDialogState.recordSubtype })
+    );
     history.push('/Records/Activity:/form');
   };
 
diff --git a/app/src/state/actions.tsx b/app/src/state/actions.tsx
index d5a785d6e..8a50a2cc1 100644
--- a/app/src/state/actions.tsx
+++ b/app/src/state/actions.tsx
@@ -44,12 +44,6 @@ export const ACTIVITY_GET_INITIAL_STATE_REQUEST = 'ACTIVITY_GET_INITIAL_STATE_RE
 export const ACTIVITY_GET_INITIAL_STATE_SUCCESS = 'ACTIVITY_GET_INITIAL_STATE_SUCCESS';
 export const ACTIVITY_GET_INITIAL_STATE_FAILURE = 'ACTIVITY_GET_INITIAL_STATE_FAILURE';
 
-export const ACTIVITY_GET_REQUEST = 'ACTIVITY_GET_REQUEST';
-export const ACTIVITY_GET_NETWORK_REQUEST = 'ACTIVITY_GET_NETWORK_REQUEST';
-export const ACTIVITY_GET_LOCAL_REQUEST = 'ACTIVITY_GET_LOCALDB_REQUEST';
-export const ACTIVITY_GET_SUCCESS = 'ACTIVITY_GET_SUCCESS';
-export const ACTIVITY_GET_FAILURE = 'ACTIVITY_GET_FAILURE';
-
 export const ACTIVITY_UPDATE_GEO_REQUEST = 'ACTIVITY_UPDATE_GEO_REQUEST';
 export const ACTIVITY_UPDATE_GEO_SUCCESS = 'ACTIVITY_UPDATE_GEO_SUCCESS';
 export const ACTIVITY_UPDATE_GEO_FAILURE = 'ACTIVITY_UPDATE_GEO_FAILURE';
@@ -63,9 +57,6 @@ export const ACTIVITY_ON_FORM_CHANGE_SUCCESS = 'ACTIVITY_ON_FORM_CHANGE_SUCCESS'
 export const ACTIVITY_SET_CURRENT_HASH_REQUEST = 'ACTIVITY_SET_CURRENT_HASH_REQUEST';
 export const ACTIVITY_SET_CURRENT_HASH_SUCCESS = 'ACTIVITY_SET_CURRENT_HASH_SUCCESS';
 export const ACTIVITY_SET_CURRENT_HASH_FAILURE = 'ACTIVITY_SET_CURRENT_HASH_REQUEST';
-export const ACTIVITY_SET_SAVED_HASH_REQUEST = 'ACTIVITY_SET_SAVED_HASH_REQUEST';
-export const ACTIVITY_SET_SAVED_HASH_SUCCESS = 'ACTIVITY_SET_SAVED_HASH_SUCCESS';
-export const ACTIVITY_SET_SAVED_HASH_FAILURE = 'ACTIVITY_SET_SAVED_HASH_REQUEST';
 
 export const ACTIVITY_CHEM_TREATMENT_DETAILS_FORM_ON_CHANGE_REQUEST =
   'ACTIVITY_CHEM_TREATMENT_DETAILS_FORM_ON_CHANGE_REQUEST';
@@ -84,17 +75,7 @@ export const ACTIVITY_PERSIST_REQUEST = 'ACTIVITY_PERSIST_REQUEST';
 export const ACTIVITY_PERSIST_SUCCESS = 'ACTIVITY_PERSIST_SUCCESS';
 export const ACTIVITY_PERSIST_FAILURE = 'ACTIVITY_PERSIST_FAILURE';
 
-export const ACTIVITY_SAVE_REQUEST = 'ACTIVITY_SAVE_REQUEST';
-export const ACTIVITY_SAVE_SUCCESS = 'ACTIVITY_SAVE_SUCCESS';
-
 export const TOGGLE_CUSTOMIZE_LAYERS = 'TOGGLE_CUSTOMIZE_LAYERS';
-export const ACTIVITY_PASTE_REQUEST = 'ACTIVITY_PASTE_REQUEST';
-export const ACTIVITY_PASTE_SUCCESS = 'ACTIVITY_PASTE_SUCCESS';
-export const ACTIVITY_PASTE_FAILURE = 'ACTIVITY_PASTE_FAILURE';
-
-export const ACTIVITY_COPY_REQUEST = 'ACTIVITY_COPY_REQUEST';
-export const ACTIVITY_COPY_SUCCESS = 'ACTIVITY_COPY_SUCCESS';
-export const ACTIVITY_COPY_FAILURE = 'ACTIVITY_COPY_FAILURE';
 
 export const ACTIVITY_SAVE_OFFLINE = 'ACTIVITY_SAVE_OFFLINE';
 export const ACTIVITY_RESTORE_OFFLINE = 'ACTIVITY_RESTORE_OFFLINE';
@@ -105,28 +86,7 @@ export const ACTIVITY_OFFLINE_SYNC_DIALOG_SET_STATE = 'ACTIVITY_OFFLINE_SYNC_DIA
 export const ACTIVITY_RUN_OFFLINE_SYNC = 'ACTIVITY_RUN_OFFLINE_SYNC';
 export const ACTIVITY_RUN_OFFLINE_SYNC_COMPLETE = 'ACTIVITY_RUN_OFFLINE_SYNC_COMPLETE';
 
-export const ACTIVITY_SAVE_NETWORK_REQUEST = 'ACTIVITY_SAVE_NETWORK_REQUEST';
-export const ACTIVITY_SAVE_NETWORK_SUCCESS = 'ACTIVITY_SAVE_NETWORK_SUCCESS';
-export const ACTIVITY_SAVE_NETWORK_FAILURE = 'ACTIVITY_SAVE_NETWORK_FAILURE';
-
-export const ACTIVITY_CREATE_REQUEST = 'ACTIVITY_CREATE_REQUEST';
-export const ACTIVITY_CREATE_NETWORK = 'ACTIVITY_CREATE_NETWORK';
-export const ACTIVITY_CREATE_LOCAL = 'ACTIVITY_CREATE_LOCAL';
-export const ACTIVITY_CREATE_SUCCESS = 'ACTIVITY_CREATE_SUCCESS';
-export const ACTIVITY_CREATE_FAILURE = 'ACTIVITY_CREATE_FAILURE';
-
-export const ACTIVITY_SUBMIT_REQUEST = 'ACTIVITY_SUBMIT_REQUEST';
-export const ACTIVITY_SUBMIT_SUCCESS = 'ACTIVITY_SUBMIT_SUCCESS';
-export const ACTIVITY_SUBMIT_FAILURE = 'ACTIVITY_SUBMIT_FAILURE';
-export const ACTIVITY_DELETE_REQUEST = 'ACTIVITY_DELETE_REQUEST';
-export const ACTIVITY_DELETE_NETWORK_REQUEST = 'ACTIVITY_DELETE_NETWORK_REQUEST';
-
 export const PAN_AND_ZOOM_TO_ACTIVITY = 'PAN_AND_ZOOM_TO_ACTIVITY';
-export const ACTIVITY_DELETE_SUCCESS = 'ACTIVITY_DELETE_SUCCESS';
-export const ACTIVITY_DELETE_FAILURE = 'ACTIVITY_DELETE_FAILURE';
-export const ACTIVITY_SET_ACTIVE_REQUEST = 'ACTIVITY_SET_ACTIVE_REQUEST';
-export const ACTIVITY_SET_ACTIVE_SUCCESS = 'ACTIVITY_SET_ACTIVE_SUCCESS';
-export const ACTIVITY_SET_ACTIVE_FAILURE = 'ACTIVITY_SET_ACTIVE_FAILURE';
 
 export const ACTIVITY_DEBUG = 'ACTIVITY_DEBUG';
 
@@ -300,7 +260,3 @@ export const EMAIL_TEMPLATES_RETRIEVE_REQUEST_SUCCESS = 'EMAIL_TEMPLATES_RETRIEV
 export const EMAIL_TEMPLATES_RETRIEVE_REQUEST_FAILURE = 'EMAIL_TEMPLATES_RETRIEVE_REQUEST_FAILURE';
 
 export const CRASH_HANDLE_GLOBAL_ERROR = 'CRASH_HANDLE_GLOBAL_ERROR';
-
-export const NEW_ALERT = 'NEW_ALERT';
-export const CLEAR_ALERTS = 'CLEAR_ALERTS';
-export const CLEAR_ALERT = 'CLEAR_ALERT';
diff --git a/app/src/state/actions/activity/Activity.ts b/app/src/state/actions/activity/Activity.ts
index 2d564952c..e46dd3f30 100644
--- a/app/src/state/actions/activity/Activity.ts
+++ b/app/src/state/actions/activity/Activity.ts
@@ -2,127 +2,62 @@ import { createAction } from '@reduxjs/toolkit';
 import Offline from './Offline';
 import Photos from './Photos';
 import Suggestions from './Suggestions';
-import {
-  ACTIVITY_LINK_RECORD_REQUEST,
-  ACTIVITY_LINK_RECORD_SUCCESS,
-  ACTIVITY_LINK_RECORD_FAILURE,
-  ACTIVITY_PERSIST_REQUEST,
-  ACTIVITY_PERSIST_SUCCESS,
-  ACTIVITY_PERSIST_FAILURE,
-  ACTIVITY_UPDATE_SYNC_STATE,
-  ACTIVITY_ERRORS,
-  ACTIVITY_DEBUG,
-  ACTIVITY_PAGE_MAP_EXTENT_TOGGLE,
-  ACTIVITY_UPDATE_GEO_REQUEST,
-  ACTIVITY_UPDATE_GEO_SUCCESS,
-  ACTIVITY_UPDATE_GEO_FAILURE,
-  ACTIVITY_GET_INITIAL_STATE_REQUEST,
-  ACTIVITY_GET_INITIAL_STATE_SUCCESS,
-  ACTIVITY_GET_INITIAL_STATE_FAILURE,
-  ACTIVITY_BUILD_SCHEMA_FOR_FORM_REQUEST,
-  ACTIVITY_BUILD_SCHEMA_FOR_FORM_SUCCESS,
-  ACTIVITY_ON_FORM_CHANGE_REQUEST,
-  ACTIVITY_ON_FORM_CHANGE_SUCCESS,
-  ACTIVITY_SET_CURRENT_HASH_REQUEST,
-  ACTIVITY_SET_CURRENT_HASH_SUCCESS,
-  ACTIVITY_SET_CURRENT_HASH_FAILURE,
-  ACTIVITY_CHEM_TREATMENT_DETAILS_FORM_ON_CHANGE_REQUEST,
-  ACTIVITY_CHEM_TREATMENT_DETAILS_FORM_ON_CHANGE_SUCCESS,
-  ACTIVITIES_TABLE_ROWS_GET_REQUEST,
-  ACTIVITIES_TABLE_ROWS_GET_ONLINE,
-  ACTIVITIES_TABLE_ROWS_GET_SUCCESS,
-  ACTIVITIES_TABLE_ROWS_GET_FAILURE,
-  ACTIVITIES_GET_IDS_FOR_RECORDSET_REQUEST,
-  ACTIVITIES_GET_IDS_FOR_RECORDSET_ONLINE,
-  ACTIVITIES_GET_IDS_FOR_RECORDSET_SUCCESS,
-  ACTIVITY_SET_ACTIVE_REQUEST,
-  ACTIVITY_SET_ACTIVE_SUCCESS,
-  ACTIVITY_SET_ACTIVE_FAILURE,
-  ACTIVITY_CREATE_REQUEST,
-  ACTIVITY_CREATE_NETWORK,
-  ACTIVITY_CREATE_LOCAL,
-  ACTIVITY_CREATE_SUCCESS,
-  ACTIVITY_CREATE_FAILURE,
-  ACTIVITY_DELETE_REQUEST,
-  ACTIVITY_DELETE_NETWORK_REQUEST,
-  ACTIVITY_DELETE_SUCCESS,
-  ACTIVITY_DELETE_FAILURE,
-  ACTIVITY_SUBMIT_REQUEST,
-  ACTIVITY_SUBMIT_SUCCESS,
-  ACTIVITY_SUBMIT_FAILURE,
-  ACTIVITY_SAVE_NETWORK_REQUEST,
-  ACTIVITY_SAVE_NETWORK_SUCCESS,
-  ACTIVITY_SAVE_NETWORK_FAILURE,
-  ACTIVITY_SAVE_REQUEST,
-  ACTIVITY_SAVE_SUCCESS,
-  ACTIVITY_SET_SAVED_HASH_REQUEST,
-  ACTIVITY_SET_SAVED_HASH_SUCCESS,
-  ACTIVITY_SET_SAVED_HASH_FAILURE,
-  ACTIVITY_GET_NETWORK_REQUEST,
-  ACTIVITY_PASTE_REQUEST,
-  ACTIVITY_PASTE_SUCCESS,
-  ACTIVITY_PASTE_FAILURE,
-  ACTIVITY_COPY_REQUEST,
-  ACTIVITY_COPY_SUCCESS,
-  ACTIVITY_COPY_FAILURE,
-  ACTIVITY_GET_REQUEST,
-  ACTIVITY_GET_LOCAL_REQUEST,
-  ACTIVITY_GET_SUCCESS,
-  ACTIVITY_GET_FAILURE
-} from '../../actions';
 import AutoFill from './AutoFill';
 import GeoJson from './GeoJson';
+import { ActivityStatus } from 'sharedAPI';
 
+export interface INewActivity {
+  type: string;
+  subType: string;
+}
+interface ISaveNetwork {
+  activity_id: string;
+  updatedFormData?: Record<string, any>;
+  form_status?: ActivityStatus;
+}
+export interface ICreateLocal {
+  id: string;
+  data: Record<string, any>;
+}
 class Activity {
+  private static readonly PREFIX = 'Activity';
   static readonly Offline = Offline;
   static readonly Photo = Photos;
   static readonly Suggestions = Suggestions;
   static readonly Autofill = AutoFill;
   static readonly GeoJson = GeoJson;
 
-  static readonly createReq = createAction(ACTIVITY_CREATE_REQUEST);
-  static readonly createNetwork = createAction(ACTIVITY_CREATE_NETWORK);
-
-  static readonly saveNetworkRequest = createAction(ACTIVITY_SAVE_NETWORK_REQUEST);
-  static readonly saveNetworkSuccess = createAction(ACTIVITY_SAVE_NETWORK_SUCCESS);
-  static readonly saveNetworkFailure = createAction(ACTIVITY_SAVE_NETWORK_FAILURE);
-  static readonly getNetworkRequest = createAction(ACTIVITY_GET_NETWORK_REQUEST);
+  static readonly createReq = createAction<INewActivity>(`${this.PREFIX}/createReq`);
+  static readonly createNetwork = createAction<Record<string, any>>(`${this.PREFIX}/createNetwork`);
 
-  static readonly save = createAction(ACTIVITY_SAVE_REQUEST);
-  static readonly saveSuccess = createAction(ACTIVITY_SAVE_SUCCESS);
+  static readonly saveNetworkRequest = createAction<ISaveNetwork>(`${this.PREFIX}/saveNetworkRequest`);
+  static readonly getNetworkRequest = createAction<string>(`${this.PREFIX}/getNetworkRequest`);
 
-  static readonly setSavedHash = createAction(ACTIVITY_SET_SAVED_HASH_REQUEST);
-  static readonly setSavedHashSuccess = createAction(ACTIVITY_SET_SAVED_HASH_SUCCESS);
-  static readonly setSavedHashFailure = createAction(ACTIVITY_SET_SAVED_HASH_FAILURE);
+  static readonly save = createAction(`${this.PREFIX}/save`);
+  static readonly saveSuccess = createAction<Record<string, any>>(`${this.PREFIX}/saveSuccess`);
 
-  static readonly createLocal = createAction(ACTIVITY_CREATE_LOCAL);
-  static readonly createSuccess = createAction(ACTIVITY_CREATE_SUCCESS);
-  static readonly createFailure = createAction(ACTIVITY_CREATE_FAILURE);
+  static readonly setSavedHashSuccess = createAction<string>(`${this.PREFIX}/setSavedHashSuccess`);
 
-  static readonly deleteReq = createAction(ACTIVITY_DELETE_REQUEST);
-  static readonly deleteNetwork = createAction(ACTIVITY_DELETE_NETWORK_REQUEST);
-  static readonly deleteSuccess = createAction(ACTIVITY_DELETE_SUCCESS);
-  static readonly deleteFailure = createAction(ACTIVITY_DELETE_FAILURE);
+  static readonly createLocal = createAction<ICreateLocal>(`${this.PREFIX}/createLocal`);
+  static readonly createSuccess = createAction<string>(`${this.PREFIX}/createSuccess`);
 
-  static readonly submit = createAction(ACTIVITY_SUBMIT_REQUEST);
-  static readonly submitSuccess = createAction(ACTIVITY_SUBMIT_SUCCESS);
-  static readonly submitFailure = createAction(ACTIVITY_SUBMIT_FAILURE);
+  static readonly deleteReq = createAction(`${this.PREFIX}/deleteReq`);
+  static readonly deleteNetwork = createAction(`${this.PREFIX}/deleteNetwork`);
+  static readonly deleteSuccess = createAction(`${this.PREFIX}/deleteSuccess`);
+  static readonly deleteFailure = createAction(`${this.PREFIX}/deleteFailure`);
 
-  static readonly paste = createAction(ACTIVITY_PASTE_REQUEST);
-  static readonly pasteSuccess = createAction(ACTIVITY_PASTE_SUCCESS);
-  static readonly pasteFailure = createAction(ACTIVITY_PASTE_FAILURE);
+  static readonly submit = createAction(`${this.PREFIX}/submit`);
 
-  static readonly copy = createAction(ACTIVITY_COPY_REQUEST);
-  static readonly copySuccess = createAction(ACTIVITY_COPY_SUCCESS);
-  static readonly copyFailure = createAction(ACTIVITY_COPY_FAILURE);
+  static readonly paste = createAction(`${this.PREFIX}/paste`);
 
-  static readonly get = createAction(ACTIVITY_GET_REQUEST);
-  static readonly getLocal = createAction(ACTIVITY_GET_LOCAL_REQUEST);
-  static readonly getSuccess = createAction(ACTIVITY_GET_SUCCESS);
-  static readonly getFailure = createAction(ACTIVITY_GET_FAILURE);
+  static readonly copy = createAction(`${this.PREFIX}/copy`);
+  static readonly copySuccess = createAction<Record<string, any>>(`${this.PREFIX}/copySuccess`);
 
-  static readonly setActive = createAction(ACTIVITY_SET_ACTIVE_REQUEST);
-  static readonly setActiveSuccess = createAction(ACTIVITY_SET_ACTIVE_SUCCESS);
-  static readonly setActiveFailure = createAction(ACTIVITY_SET_ACTIVE_FAILURE);
+  static readonly get = createAction<string>(`${this.PREFIX}/get`);
+  static readonly getLocal = createAction<string>(`${this.PREFIX}/getLocal`);
+  static readonly getSuccess = createAction<Record<string, any>>(`${this.PREFIX}/getSuccess`);
+  static readonly getFailure = createAction(`${this.PREFIX}/getFailure`, (arg?: Response) => ({
+    payload: arg
+  }));
 }
 export default Activity;
diff --git a/app/src/state/reducers/activity.ts b/app/src/state/reducers/activity.ts
index 3dfbd3dc3..72a80bcf3 100644
--- a/app/src/state/reducers/activity.ts
+++ b/app/src/state/reducers/activity.ts
@@ -3,19 +3,9 @@ import { createNextState } from '@reduxjs/toolkit';
 import { RJSFSchema, UiSchema } from '@rjsf/utils';
 import {
   ACTIVITY_BUILD_SCHEMA_FOR_FORM_SUCCESS,
-  ACTIVITY_COPY_SUCCESS,
-  ACTIVITY_CREATE_REQUEST,
-  ACTIVITY_CREATE_SUCCESS,
-  ACTIVITY_DELETE_SUCCESS,
   ACTIVITY_ERRORS,
-  ACTIVITY_GET_FAILURE,
-  ACTIVITY_GET_REQUEST,
-  ACTIVITY_GET_SUCCESS,
   ACTIVITY_ON_FORM_CHANGE_SUCCESS,
-  ACTIVITY_PASTE_SUCCESS,
-  ACTIVITY_SAVE_SUCCESS,
   ACTIVITY_SET_CURRENT_HASH_SUCCESS,
-  ACTIVITY_SET_SAVED_HASH_SUCCESS,
   ACTIVITY_UPDATE_GEO_SUCCESS
 } from '../actions';
 import { getCustomErrorTransformer } from 'rjsf/business-rules/customErrorTransformer';
@@ -119,6 +109,67 @@ function createActivityReducer(): (ActivityState: ActivityState, AnyAction) => A
         draftState.suggestedTreatmentIDs = [...action.payload];
         if (draftState?.schema?.properties?.activity_type_data?.properties?.linked_id)
           draftState.schema.properties.activity_type_data.properties.linked_id.options = action.payload;
+      } else if (Activity.createReq.match(action)) {
+        const activity_copy_buffer = JSON.parse(JSON.stringify(draftState.activity_copy_buffer));
+        Object.assign(draftState, {
+          activity: null,
+          current_activity_hash: null,
+          error: false,
+          pasteCount: 0,
+          failCode: null,
+          initialized: false,
+          loading: false,
+          saved_activity_hash: null,
+          biocontrol: {
+            plantToAgentMap: draftState.biocontrol.plantToAgentMap ?? []
+          },
+          suggestedJurisdictions: [],
+          suggestedPersons: [],
+          suggestedTreatmentIDs: [],
+          activity_copy_buffer
+        });
+      } else if (Activity.saveSuccess.match(action)) {
+        draftState.activity = { ...action.payload };
+      } else if (Activity.setSavedHashSuccess.match(action)) {
+        draftState.saved_activity_hash = action.payload;
+      } else if (Activity.createSuccess.match(action)) {
+        draftState.activeActivity = action.payload;
+        draftState.current_activity_hash = null;
+        draftState.saved_activity_hash = null;
+      } else if (Activity.deleteSuccess.match(action)) {
+        Object.assign(draftState, {
+          activity: null,
+          current_activity_hash: null,
+          error: false,
+          pasteCount: 0,
+          failCode: null,
+          initialized: false,
+          loading: false,
+          saved_activity_hash: null,
+          biocontrol: {
+            plantToAgentMap: draftState.biocontrol.plantToAgentMap ?? []
+          },
+          suggestedJurisdictions: [],
+          suggestedPersons: [],
+          suggestedTreatmentIDs: []
+        });
+      } else if (Activity.paste.match(action)) {
+        draftState.pasteCount = draftState.pasteCount + 1;
+        draftState.activity.form_data = JSON.parse(JSON.stringify(draftState.activity_copy_buffer?.form_data));
+      } else if (Activity.copySuccess.match(action)) {
+        draftState.activity_copy_buffer = {
+          form_data: action.payload
+        };
+      } else if (Activity.get.match(action)) {
+        draftState.failCode = null;
+        draftState.loading = true;
+      } else if (Activity.getSuccess.match(action)) {
+        draftState.activity = { ...action.payload };
+        draftState.suggestedTreatmentIDs = [];
+        draftState.loading = false;
+      } else if (Activity.getFailure.match(action)) {
+        draftState.loading = false;
+        draftState.failCode = action.payload?.status ?? null;
       } else {
         switch (action.type) {
           case ACTIVITY_ERRORS: {
@@ -126,62 +177,6 @@ function createActivityReducer(): (ActivityState: ActivityState, AnyAction) => A
               draftState.activityErrors = getCustomErrorTransformer()(action.payload.errors);
             break;
           }
-          case ACTIVITY_DELETE_SUCCESS: {
-            Object.assign(draftState, {
-              activity: null,
-              current_activity_hash: null,
-              error: false,
-              pasteCount: 0,
-              failCode: null,
-              initialized: false,
-              loading: false,
-              saved_activity_hash: null,
-              biocontrol: {
-                plantToAgentMap: draftState.biocontrol.plantToAgentMap ?? []
-              },
-              suggestedJurisdictions: [],
-              suggestedPersons: [],
-              suggestedTreatmentIDs: []
-            });
-            break;
-          }
-          case ACTIVITY_CREATE_REQUEST: {
-            const activity_copy_buffer = JSON.parse(JSON.stringify(draftState.activity_copy_buffer));
-            Object.assign(draftState, {
-              activity: null,
-              current_activity_hash: null,
-              error: false,
-              pasteCount: 0,
-              failCode: null,
-              initialized: false,
-              loading: false,
-              saved_activity_hash: null,
-              biocontrol: {
-                plantToAgentMap: draftState.biocontrol.plantToAgentMap ?? []
-              },
-              suggestedJurisdictions: [],
-              suggestedPersons: [],
-              suggestedTreatmentIDs: [],
-              activity_copy_buffer
-            });
-            break;
-          }
-          case ACTIVITY_GET_FAILURE: {
-            draftState.loading = false;
-            draftState.failCode = action.payload?.failNetworkObj?.status;
-            break;
-          }
-          case ACTIVITY_GET_REQUEST: {
-            draftState.failCode = null;
-            draftState.loading = true;
-            break;
-          }
-          case ACTIVITY_GET_SUCCESS: {
-            draftState.activity = { ...action.payload.activity };
-            draftState.suggestedTreatmentIDs = [];
-            draftState.loading = false;
-            break;
-          }
           case ACTIVITY_BUILD_SCHEMA_FOR_FORM_SUCCESS: {
             draftState.uiSchema = action.payload.uiSchema;
             draftState.schema = action.payload.schema;
@@ -210,35 +205,10 @@ function createActivityReducer(): (ActivityState: ActivityState, AnyAction) => A
             draftState.activity.jurisdiction = action.payload.activity.jurisdiction;
             break;
           }
-          case ACTIVITY_CREATE_SUCCESS: {
-            draftState.activeActivity = action.payload.activity_id;
-            draftState.current_activity_hash = null;
-            draftState.saved_activity_hash = null;
-            break;
-          }
-          case ACTIVITY_SAVE_SUCCESS: {
-            draftState.activity = { ...action.payload.activity };
-            break;
-          }
-          case ACTIVITY_COPY_SUCCESS: {
-            draftState.activity_copy_buffer = {
-              form_data: action.payload.form_data
-            };
-            break;
-          }
-          case ACTIVITY_PASTE_SUCCESS: {
-            draftState.pasteCount = draftState.pasteCount + 1;
-            draftState.activity.form_data = JSON.parse(JSON.stringify(draftState.activity_copy_buffer?.form_data));
-            break;
-          }
           case ACTIVITY_SET_CURRENT_HASH_SUCCESS: {
             draftState.current_activity_hash = action.payload.current;
             break;
           }
-          case ACTIVITY_SET_SAVED_HASH_SUCCESS: {
-            draftState.saved_activity_hash = action.payload.saved;
-            break;
-          }
           default:
             break;
         }
diff --git a/app/src/state/reducers/offlineActivity.ts b/app/src/state/reducers/offlineActivity.ts
index c704fc4a3..3f358e74e 100644
--- a/app/src/state/reducers/offlineActivity.ts
+++ b/app/src/state/reducers/offlineActivity.ts
@@ -2,7 +2,6 @@ import { createNextState } from '@reduxjs/toolkit';
 import moment from 'moment';
 import { AppConfig } from '../config';
 import {
-  ACTIVITY_CREATE_LOCAL,
   ACTIVITY_OFFLINE_DELETE_ITEM,
   ACTIVITY_OFFLINE_SYNC_DIALOG_SET_STATE,
   ACTIVITY_RUN_OFFLINE_SYNC,
@@ -11,6 +10,7 @@ import {
   ACTIVITY_UPDATE_SYNC_STATE
 } from '../actions';
 import { CURRENT_MIGRATION_VERSION, MIGRATION_VERSION_KEY } from 'constants/offline_state_version';
+import Activity from 'state/actions/activity/Activity';
 
 export enum OfflineActivitySyncState {
   LOCALLY_MODIFIED = 'Locally Modified',
@@ -53,69 +53,70 @@ function createOfflineActivityReducer(
   return (state: OfflineActivityState = initialState, action) => {
     return createNextState(state, (draftState) => {
       const { type, payload } = action;
-      switch (type) {
-        case ACTIVITY_CREATE_LOCAL:
-          draftState.serializedActivities[payload.id] = {
-            data: JSON.stringify(payload.data, null, 2),
-            saved_at: moment.now(),
-            short_id: payload.data.short_id || payload.id,
-            record_type: payload.data.activity_subtype,
-            sync_state: OfflineActivitySyncState.LOCALLY_MODIFIED
-          };
-          draftState.serial = moment.now();
-          break;
-        case ACTIVITY_SAVE_OFFLINE:
-          draftState.serializedActivities[payload.id] = {
-            data: JSON.stringify(payload.data, null, 2),
-            saved_at: moment.now(),
-            short_id: payload.data.short_id || payload.id,
-            record_type: payload.data.activity_subtype,
-            sync_state: OfflineActivitySyncState.LOCALLY_MODIFIED
-          };
-          draftState.serial = moment.now();
-          break;
-        case ACTIVITY_RUN_OFFLINE_SYNC: {
-          draftState.working = true;
-          break;
-        }
-        case ACTIVITY_RUN_OFFLINE_SYNC_COMPLETE: {
-          draftState.working = false;
-          break;
-        }
-        case ACTIVITY_UPDATE_SYNC_STATE: {
-          const found = draftState.serializedActivities[payload.id];
-          if (found) {
+      if (Activity.createLocal.match(action)) {
+        draftState.serializedActivities[payload.id] = {
+          data: JSON.stringify(payload.data, null, 2),
+          saved_at: moment.now(),
+          short_id: action.payload.data.short_id || payload.id,
+          record_type: action.payload.data.activity_subtype,
+          sync_state: OfflineActivitySyncState.LOCALLY_MODIFIED
+        };
+        draftState.serial = moment.now();
+      } else {
+        switch (type) {
+          case ACTIVITY_SAVE_OFFLINE:
             draftState.serializedActivities[payload.id] = {
-              ...found,
-              sync_state: payload.sync_state
+              data: JSON.stringify(payload.data, null, 2),
+              saved_at: moment.now(),
+              short_id: payload.data.short_id || payload.id,
+              record_type: payload.data.activity_subtype,
+              sync_state: OfflineActivitySyncState.LOCALLY_MODIFIED
             };
+            draftState.serial = moment.now();
+            break;
+          case ACTIVITY_RUN_OFFLINE_SYNC: {
+            draftState.working = true;
+            break;
+          }
+          case ACTIVITY_RUN_OFFLINE_SYNC_COMPLETE: {
+            draftState.working = false;
+            break;
+          }
+          case ACTIVITY_UPDATE_SYNC_STATE: {
+            const found = draftState.serializedActivities[payload.id];
+            if (found) {
+              draftState.serializedActivities[payload.id] = {
+                ...found,
+                sync_state: payload.sync_state
+              };
 
-            if (payload.error_detail) {
-              draftState.serializedActivities[payload.id].error_detail = payload.error_detail;
-            } else {
-              delete draftState.serializedActivities[payload.id].error_detail;
-            }
-            if (payload.error_object) {
-              draftState.serializedActivities[payload.id].error_object = payload.error_object;
-            } else {
-              delete draftState.serializedActivities[payload.id].error_object;
+              if (payload.error_detail) {
+                draftState.serializedActivities[payload.id].error_detail = payload.error_detail;
+              } else {
+                delete draftState.serializedActivities[payload.id].error_detail;
+              }
+              if (payload.error_object) {
+                draftState.serializedActivities[payload.id].error_object = payload.error_object;
+              } else {
+                delete draftState.serializedActivities[payload.id].error_object;
+              }
             }
-          }
 
-          draftState.serial = moment.now();
-          break;
-        }
-        case ACTIVITY_OFFLINE_SYNC_DIALOG_SET_STATE: {
-          draftState.statusDialogOpen = action.payload.open;
-          break;
-        }
-        case ACTIVITY_OFFLINE_DELETE_ITEM: {
-          const found = draftState.serializedActivities[payload.id];
-          if (found) {
-            delete draftState.serializedActivities[payload.id];
+            draftState.serial = moment.now();
+            break;
+          }
+          case ACTIVITY_OFFLINE_SYNC_DIALOG_SET_STATE: {
+            draftState.statusDialogOpen = action.payload.open;
+            break;
+          }
+          case ACTIVITY_OFFLINE_DELETE_ITEM: {
+            const found = draftState.serializedActivities[payload.id];
+            if (found) {
+              delete draftState.serializedActivities[payload.id];
+            }
+            draftState.serial = moment.now();
+            break;
           }
-          draftState.serial = moment.now();
-          break;
         }
       }
     });
diff --git a/app/src/state/reducers/userSettings.ts b/app/src/state/reducers/userSettings.ts
index af61ae4bf..12773578e 100644
--- a/app/src/state/reducers/userSettings.ts
+++ b/app/src/state/reducers/userSettings.ts
@@ -2,9 +2,6 @@ import { createNextState } from '@reduxjs/toolkit';
 import { Md5 } from 'ts-md5';
 
 import {
-  ACTIVITY_CREATE_SUCCESS,
-  ACTIVITY_DELETE_SUCCESS,
-  ACTIVITY_GET_REQUEST,
   CLOSE_NEW_RECORD_MENU,
   GET_API_DOC_SUCCESS,
   IAPP_GET_SUCCESS,
@@ -23,6 +20,7 @@ import { UserRecordSet } from 'interfaces/UserRecordSet';
 import UserSettings from 'state/actions/userSettings/UserSettings';
 import Boundary from 'interfaces/Boundary';
 import WhatsHere from 'state/actions/whatsHere/WhatsHere';
+import Activity from 'state/actions/activity/Activity';
 
 export function getUuid() {
   return Math.random() + Date.now().toString();
@@ -117,17 +115,13 @@ function createUserSettingsReducer(configuration: AppConfig): (UserSettingsState
         draftState.layerPickerIsAccordion = !draftState.layerPickerIsAccordion;
       } else if (WhatsHere.toggle.match(action)) {
         draftState.recordsExpanded = action.payload ? false : draftState.recordsExpanded;
+      } else if (Activity.deleteSuccess.match(action)) {
+        draftState.activeActivity = null;
+        draftState.activeActivityDescription = null;
+      } else if (Activity.get.match(action)) {
+        draftState.activeActivity = action.payload;
       } else {
         switch (action.type) {
-          case ACTIVITY_GET_REQUEST: {
-            draftState.activeActivity = action.payload.activityID;
-            break;
-          }
-          case ACTIVITY_DELETE_SUCCESS: {
-            draftState.activeActivity = null;
-            draftState.activeActivityDescription = null;
-            break;
-          }
           case GET_API_DOC_SUCCESS: {
             draftState.apiDocsWithViewOptions = action.payload.apiDocsWithViewOptions;
             draftState.apiDocsWithSelectOptions = action.payload.apiDocsWithSelectOptions;
@@ -145,10 +139,6 @@ function createUserSettingsReducer(configuration: AppConfig): (UserSettingsState
             draftState.activeIAPP = action.payload.iapp?.site_id;
             break;
           }
-          case ACTIVITY_CREATE_SUCCESS: {
-            draftState.newRecordDialogueOpen = false;
-            break;
-          }
           case RECORDSET_ADD_FILTER: {
             switch (action.payload.filterType) {
               case 'tableFilter':
diff --git a/app/src/state/sagas/activity.ts b/app/src/state/sagas/activity.ts
index 9c607fe1e..e77bfd5f5 100644
--- a/app/src/state/sagas/activity.ts
+++ b/app/src/state/sagas/activity.ts
@@ -1,35 +1,15 @@
 import { all, call, delay, put, select, take, takeEvery, takeLatest } from 'redux-saga/effects';
-import { buffer } from '@turf/turf';
 import {
   ACTIVITY_BUILD_SCHEMA_FOR_FORM_REQUEST,
   ACTIVITY_BUILD_SCHEMA_FOR_FORM_SUCCESS,
   ACTIVITY_CHEM_TREATMENT_DETAILS_FORM_ON_CHANGE_REQUEST,
-  ACTIVITY_COPY_REQUEST,
-  ACTIVITY_CREATE_NETWORK,
-  ACTIVITY_CREATE_REQUEST,
-  ACTIVITY_CREATE_SUCCESS,
-  ACTIVITY_DEBUG,
-  ACTIVITY_DELETE_FAILURE,
-  ACTIVITY_DELETE_NETWORK_REQUEST,
-  ACTIVITY_DELETE_REQUEST,
-  ACTIVITY_DELETE_SUCCESS,
-  ACTIVITY_GET_NETWORK_REQUEST,
-  ACTIVITY_GET_REQUEST,
-  ACTIVITY_GET_SUCCESS,
   ACTIVITY_LINK_RECORD_REQUEST,
   ACTIVITY_ON_FORM_CHANGE_REQUEST,
   ACTIVITY_ON_FORM_CHANGE_SUCCESS,
-  ACTIVITY_PASTE_REQUEST,
   ACTIVITY_PERSIST_REQUEST,
   ACTIVITY_RESTORE_OFFLINE,
-  ACTIVITY_SAVE_NETWORK_REQUEST,
-  ACTIVITY_SAVE_REQUEST,
-  ACTIVITY_SAVE_SUCCESS,
   ACTIVITY_SET_CURRENT_HASH_FAILURE,
   ACTIVITY_SET_CURRENT_HASH_SUCCESS,
-  ACTIVITY_SET_SAVED_HASH_FAILURE,
-  ACTIVITY_SET_SAVED_HASH_SUCCESS,
-  ACTIVITY_SUBMIT_REQUEST,
   ACTIVITY_UPDATE_GEO_REQUEST,
   ACTIVITY_UPDATE_GEO_SUCCESS,
   MAP_INIT_REQUEST,
@@ -51,7 +31,6 @@ import {
   handle_ACTIVITY_GET_SUGGESTED_PERSONS_REQUEST,
   handle_ACTIVITY_GET_SUGGESTED_TREATMENT_IDS_REQUEST,
   handle_ACTIVITY_ON_FORM_CHANGE_REQUEST,
-  handle_ACTIVITY_PASTE_REQUEST,
   handle_ACTIVITY_SAVE_REQUEST,
   handle_ACTIVITY_SAVE_SUCCESS,
   handle_ACTIVITY_SUBMIT_REQUEST,
@@ -74,7 +53,7 @@ import { handle_ACTIVITY_RESTORE_OFFLINE, OFFLINE_ACTIVITY_SAGA_HANDLERS } from
 import { selectUserSettings } from 'state/reducers/userSettings';
 import RootUISchemas from 'rjsf/uiSchema/RootUISchemas';
 import { AlertSeverity, AlertSubjects } from 'constants/alertEnums';
-import { distance, kinks, lineToPolygon } from '@turf/turf';
+import { buffer, distance, kinks, lineToPolygon } from '@turf/turf';
 import GeoShapes from 'constants/geoShapes';
 import { calculateGeometryArea } from 'utils/geometryHelpers';
 import geomWithinBC from 'utils/geomWithinBC';
@@ -89,14 +68,6 @@ import GeoTracking from 'state/actions/geotracking/GeoTracking';
 import Activity from 'state/actions/activity/Activity';
 import { selectMap } from 'state/reducers/map';
 
-function* handle_USER_SETTINGS_READY(action) {
-  // if (action.payload.activeActivity) {
-  //    yield put({ type: ACTIVITY_GET_REQUEST, payload: { activityID: action.payload.activeActivity } });
-  // }
-}
-
-function* handle_ACTIVITY_DEBUG(action) {}
-
 function* handle_ACTIVITY_DELETE_SUCESS(action) {
   yield put(UserSettings.RecordSet.setSelected(null));
   yield put(
@@ -112,17 +83,9 @@ function* handle_ACTIVITY_DELETE_SUCESS(action) {
 function* handle_ACTIVITY_SET_SAVED_HASH_REQUEST(action) {
   try {
     const activityState = yield select(selectActivity);
-    yield put({
-      type: ACTIVITY_SET_SAVED_HASH_SUCCESS,
-      payload: {
-        saved: activityState?.current_activity_hash
-      }
-    });
+    yield put(Activity.setSavedHashSuccess(activityState?.current_activity_hash));
   } catch (e) {
     console.error(e);
-    yield put({
-      type: ACTIVITY_SET_SAVED_HASH_FAILURE
-    });
   }
 }
 
@@ -168,14 +131,7 @@ function* handle_URL_CHANGE(action) {
     if (afterColon) {
       id = afterColon.includes('/') ? afterColon.split('/')[0] : afterColon;
     }
-    if (id && id.length === 36 && activityPageState?.activity?.activity_id !== id)
-      yield put({ type: ACTIVITY_GET_REQUEST, payload: { activityID: id } });
-
-    /*    else if (userSettingsState.activeActivity) {
-      id = userSettingsState.activeActivity;
-      yield put({ type: ACTIVITY_GET_REQUEST, payload: { activityID: id } });
-    }
-    */
+    if (id && id.length === 36 && activityPageState?.activity?.activity_id !== id) yield put(Activity.get(id));
   }
 }
 
@@ -444,20 +400,17 @@ function* activityPageSaga() {
   yield all([
     takeEvery(URL_CHANGE, handle_URL_CHANGE),
     takeEvery(ACTIVITY_BUILD_SCHEMA_FOR_FORM_REQUEST, handle_ACTIVITY_BUILD_SCHEMA_FOR_FORM_REQUEST),
-    takeEvery(ACTIVITY_GET_REQUEST, handle_ACTIVITY_GET_REQUEST),
-    takeEvery(ACTIVITY_COPY_REQUEST, handle_ACTIVITY_COPY_REQUEST),
-    takeEvery(ACTIVITY_PASTE_REQUEST, handle_ACTIVITY_PASTE_REQUEST),
-    takeEvery(ACTIVITY_GET_NETWORK_REQUEST, handle_ACTIVITY_GET_NETWORK_REQUEST),
+    takeEvery(Activity.get, handle_ACTIVITY_GET_REQUEST),
+    takeEvery(Activity.copy, handle_ACTIVITY_COPY_REQUEST),
+    takeEvery(Activity.getNetworkRequest, handle_ACTIVITY_GET_NETWORK_REQUEST),
     takeEvery(MAP_SET_COORDS, handle_MAP_SET_COORDS),
-    takeEvery(UserSettings.InitState.getSuccess, handle_USER_SETTINGS_READY),
-    takeEvery(UserSettings.Activity.setActiveActivityIdSuccess, handle_USER_SETTINGS_READY),
     takeEvery(ACTIVITY_UPDATE_GEO_REQUEST, handle_ACTIVITY_UPDATE_GEO_REQUEST),
     takeEvery(ACTIVITY_UPDATE_GEO_SUCCESS, handle_ACTIVITY_UPDATE_GEO_SUCCESS),
     takeEvery(Activity.Suggestions.jurisdictions, handle_GET_SUGGESTED_JURISDICTIONS_REQUEST),
     takeEvery(Activity.Suggestions.jurisdictionsOnline, handle_ACTIVITY_GET_SUGGESTED_JURISDICTIONS_REQUEST_ONLINE),
     takeLatest(Activity.Suggestions.jurisdictionsSuccess, handle_ACTIVITY_SET_CURRENT_HASH_REQUEST),
     takeLatest(ACTIVITY_ON_FORM_CHANGE_SUCCESS, handle_ACTIVITY_SET_CURRENT_HASH_REQUEST),
-    takeEvery(ACTIVITY_SAVE_SUCCESS, handle_ACTIVITY_SET_SAVED_HASH_REQUEST),
+    takeEvery(Activity.saveSuccess, handle_ACTIVITY_SET_SAVED_HASH_REQUEST),
     takeEvery(Activity.Suggestions.persons, handle_ACTIVITY_GET_SUGGESTED_PERSONS_REQUEST),
     takeEvery(Activity.Suggestions.personsOnline, handle_ACTIVITY_GET_SUGGESTED_PERSONS_REQUEST_ONLINE),
     takeEvery(Activity.Suggestions.treatmentIdsRequest, handle_ACTIVITY_GET_SUGGESTED_TREATMENT_IDS_REQUEST),
@@ -466,21 +419,20 @@ function* activityPageSaga() {
       Activity.Suggestions.treatmentIdsRequestOnline,
       handle_ACTIVITY_GET_SUGGESTED_TREATMENT_IDS_REQUEST_ONLINE
     ),
-    takeEvery(ACTIVITY_SAVE_REQUEST, handle_ACTIVITY_SAVE_REQUEST),
-    takeEvery(ACTIVITY_SAVE_SUCCESS, handle_ACTIVITY_SAVE_SUCCESS),
-    takeEvery(ACTIVITY_SAVE_NETWORK_REQUEST, handle_ACTIVITY_SAVE_NETWORK_REQUEST),
+    takeEvery(Activity.save, handle_ACTIVITY_SAVE_REQUEST),
+    takeEvery(Activity.saveSuccess, handle_ACTIVITY_SAVE_SUCCESS),
+    takeEvery(Activity.saveNetworkRequest, handle_ACTIVITY_SAVE_NETWORK_REQUEST),
     takeEvery(ACTIVITY_RESTORE_OFFLINE, handle_ACTIVITY_RESTORE_OFFLINE),
-    takeEvery(ACTIVITY_CREATE_REQUEST, handle_ACTIVITY_CREATE_REQUEST),
-    takeEvery(ACTIVITY_CREATE_NETWORK, handle_ACTIVITY_CREATE_NETWORK),
-    takeEvery(ACTIVITY_CREATE_SUCCESS, handle_ACTIVITY_CREATE_SUCCESS),
-    takeEvery(ACTIVITY_SUBMIT_REQUEST, handle_ACTIVITY_SUBMIT_REQUEST),
-    takeEvery(ACTIVITY_DEBUG, handle_ACTIVITY_DEBUG),
-    takeEvery(ACTIVITY_GET_SUCCESS, handle_ACTIVITY_GET_SUCCESS),
+    takeEvery(Activity.createReq, handle_ACTIVITY_CREATE_REQUEST),
+    takeEvery(Activity.createNetwork, handle_ACTIVITY_CREATE_NETWORK),
+    takeEvery(Activity.createSuccess, handle_ACTIVITY_CREATE_SUCCESS),
+    takeEvery(Activity.submit, handle_ACTIVITY_SUBMIT_REQUEST),
+    takeEvery(Activity.getSuccess, handle_ACTIVITY_GET_SUCCESS),
     takeEvery(Activity.Photo.delete, handle_ACTIVITY_DELETE_PHOTO_REQUEST),
     takeEvery(Activity.Photo.add, handle_ACTIVITY_ADD_PHOTO_REQUEST),
     takeEvery(Activity.Photo.edit, handle_ACTIVITY_EDIT_PHOTO_REQUEST),
-    takeEvery(ACTIVITY_DELETE_SUCCESS, handle_ACTIVITY_DELETE_SUCESS),
-    takeEvery(ACTIVITY_DELETE_FAILURE, handle_ACTIVITY_DELETE_FAILURE),
+    takeEvery(Activity.deleteSuccess, handle_ACTIVITY_DELETE_SUCESS),
+    takeEvery(Activity.deleteFailure, handle_ACTIVITY_DELETE_FAILURE),
     takeEvery(ACTIVITY_ON_FORM_CHANGE_REQUEST, handle_ACTIVITY_ON_FORM_CHANGE_REQUEST),
     takeEvery(
       ACTIVITY_CHEM_TREATMENT_DETAILS_FORM_ON_CHANGE_REQUEST,
@@ -490,10 +442,8 @@ function* activityPageSaga() {
     takeEvery(Activity.Photo.update, () => console.log('Activity.Photo.update')),
     takeEvery(ACTIVITY_LINK_RECORD_REQUEST, () => console.log('ACTIVITY_LINK_RECORD_REQUEST')),
     takeEvery(ACTIVITY_PERSIST_REQUEST, () => console.log('ACTIVITY_PERSIST_REQUEST')),
-    takeEvery(ACTIVITY_SAVE_REQUEST, () => console.log('ACTIVITY_SAVE_REQUEST')),
-    takeEvery(ACTIVITY_SUBMIT_REQUEST, () => console.log('ACTIVITY_SUBMIT_REQUEST')),
-    takeEvery(ACTIVITY_DELETE_REQUEST, handle_ACTIVITY_DELETE_REQUEST),
-    takeEvery(ACTIVITY_DELETE_NETWORK_REQUEST, handle_ACTIVITY_DELETE_NETWORK_REQUEST),
+    takeEvery(Activity.deleteReq, handle_ACTIVITY_DELETE_REQUEST),
+    takeEvery(Activity.deleteNetwork, handle_ACTIVITY_DELETE_NETWORK_REQUEST),
     takeEvery(PAN_AND_ZOOM_TO_ACTIVITY, handle_PAN_AND_ZOOM_TO_ACTIVITY),
     takeEvery(GeoTracking.start, handle_MAP_TOGGLE_TRACK_ME_DRAW_GEO_START),
     takeEvery(GeoTracking.stop, handle_MAP_TOGGLE_TRACK_ME_DRAW_GEO_STOP),
diff --git a/app/src/state/sagas/activity/dataAccess.ts b/app/src/state/sagas/activity/dataAccess.ts
index 02703c7bd..04ab96ef2 100644
--- a/app/src/state/sagas/activity/dataAccess.ts
+++ b/app/src/state/sagas/activity/dataAccess.ts
@@ -19,26 +19,13 @@ import {
 } from 'rjsf/business-rules/populateCalculatedFields';
 import {
   ACTIVITY_BUILD_SCHEMA_FOR_FORM_REQUEST,
-  ACTIVITY_COPY_FAILURE,
-  ACTIVITY_COPY_SUCCESS,
-  ACTIVITY_CREATE_FAILURE,
-  ACTIVITY_CREATE_LOCAL,
-  ACTIVITY_CREATE_NETWORK,
-  ACTIVITY_DELETE_FAILURE,
-  ACTIVITY_DELETE_NETWORK_REQUEST,
   ACTIVITY_GET_INITIAL_STATE_FAILURE,
-  ACTIVITY_GET_LOCAL_REQUEST,
-  ACTIVITY_GET_NETWORK_REQUEST,
-  ACTIVITY_GET_REQUEST,
   ACTIVITY_ON_FORM_CHANGE_REQUEST,
   ACTIVITY_ON_FORM_CHANGE_SUCCESS,
-  ACTIVITY_PASTE_FAILURE,
-  ACTIVITY_PASTE_SUCCESS,
-  ACTIVITY_SAVE_NETWORK_FAILURE,
-  ACTIVITY_SAVE_NETWORK_REQUEST,
   ACTIVITY_SAVE_OFFLINE,
   ACTIVITY_UPDATE_GEO_REQUEST,
   ACTIVITY_UPDATE_GEO_SUCCESS,
+  CLOSE_NEW_RECORD_MENU,
   MAIN_MAP_MOVE,
   MAP_INIT_REQUEST
 } from 'state/actions';
@@ -59,15 +46,16 @@ import { MOBILE } from 'state/build-time-config';
 import Alerts from 'state/actions/alerts/Alerts';
 import Prompt from 'state/actions/prompts/Prompt';
 import UserSettings from 'state/actions/userSettings/UserSettings';
-import Activity from 'state/actions/activity/Activity';
+import Activity, { INewActivity } from 'state/actions/activity/Activity';
 import UploadedPhoto from 'interfaces/UploadedPhoto';
+import { PayloadAction } from '@reduxjs/toolkit';
 
-export function* handle_ACTIVITY_GET_REQUEST(action) {
+export function* handle_ACTIVITY_GET_REQUEST(action: PayloadAction<string>) {
   try {
     if (MOBILE) {
-      yield put({ type: ACTIVITY_GET_LOCAL_REQUEST, payload: { activityID: action.payload.activityID } });
+      yield put(Activity.getLocal(action.payload));
     } else {
-      yield put({ type: ACTIVITY_GET_NETWORK_REQUEST, payload: { activityID: action.payload.activityID } });
+      yield put(Activity.getNetworkRequest(action.payload));
     }
   } catch (e) {
     console.error(e);
@@ -75,7 +63,7 @@ export function* handle_ACTIVITY_GET_REQUEST(action) {
   }
 }
 
-export function* handle_ACTIVITY_COPY_REQUEST(action) {
+export function* handle_ACTIVITY_COPY_REQUEST() {
   try {
     const activityState = yield select(selectActivity);
     const activityData = { ...activityState.activity.form_data.activity_data };
@@ -88,22 +76,9 @@ export function* handle_ACTIVITY_COPY_REQUEST(action) {
       ...activityState.activity.form_data,
       activity_data: activityDataToCopy
     };
-    yield put({
-      type: ACTIVITY_COPY_SUCCESS,
-      payload: {
-        form_data: formDataToCopy
-      }
-    });
+    yield put(Activity.copySuccess(formDataToCopy));
   } catch (e) {
-    yield put({ type: ACTIVITY_COPY_FAILURE, payload: {} });
-  }
-}
-
-export function* handle_ACTIVITY_PASTE_REQUEST(action) {
-  try {
-    yield put({ type: ACTIVITY_PASTE_SUCCESS, payload: {} });
-  } catch (e) {
-    yield put({ type: ACTIVITY_PASTE_FAILURE, payload: {} });
+    console.error(e);
   }
 }
 
@@ -261,7 +236,7 @@ export function* handle_ACTIVITY_UPDATE_GEO_REQUEST(action: Record<string, any>)
 export function* handle_ACTIVITY_SAVE_SUCCESS(action) {
   const activity_id = yield select((state) => state.ActivityPage.activity.activity_id);
   try {
-    yield put({ type: ACTIVITY_GET_REQUEST, payload: { activityID: activity_id } });
+    yield put(Activity.get(activity_id));
     yield put(
       Alerts.create({
         autoClose: 5,
@@ -287,18 +262,19 @@ export function* handle_ACTIVITY_SAVE_REQUEST(action) {
     });
   } else {
     try {
-      yield put({
-        type: ACTIVITY_SAVE_NETWORK_REQUEST,
-        payload: { activity_id: activityState.activity_id, updatedFormData: action.payload?.updatedFormData }
-      });
+      yield put(
+        Activity.saveNetworkRequest({
+          activity_id: activityState.activity_id,
+          updatedFormData: action.payload?.updatedFormData
+        })
+      );
     } catch (e) {
       console.error(e);
-      yield put({ type: ACTIVITY_SAVE_NETWORK_FAILURE });
     }
   }
 }
 
-export function* handle_ACTIVITY_CREATE_REQUEST(action) {
+export function* handle_ACTIVITY_CREATE_REQUEST(action: PayloadAction<INewActivity>) {
   try {
     const authState = yield select(selectAuth);
 
@@ -312,28 +288,22 @@ export function* handle_ACTIVITY_CREATE_REQUEST(action) {
     );
 
     if (MOBILE) {
-      yield put({ type: ACTIVITY_CREATE_LOCAL, payload: { id: newActivity.activity_id, data: newActivity } });
+      yield put(Activity.createLocal({ id: newActivity.activity_id, data: newActivity }));
     } else {
-      yield put({ type: ACTIVITY_CREATE_NETWORK, payload: { activity: newActivity } });
+      yield put(Activity.createNetwork(newActivity));
     }
   } catch (e) {
     console.error(e);
-    yield put({ type: ACTIVITY_CREATE_FAILURE });
   }
 }
 
-export function* handle_ACTIVITY_CREATE_SUCCESS(action) {
+export function* handle_ACTIVITY_CREATE_SUCCESS(action: PayloadAction<string>) {
   try {
-    yield put(UserSettings.Activity.setActiveActivityId(action.payload.activity_id));
-    yield put({
-      type: ACTIVITY_GET_REQUEST,
-      payload: {
-        activityID: action.payload.activity_id
-      }
-    });
+    yield put(UserSettings.Activity.setActiveActivityId(action.payload));
+    yield put({ type: CLOSE_NEW_RECORD_MENU });
+    yield put(Activity.get(action.payload));
   } catch (e) {
     console.error(e);
-    yield put({ type: ACTIVITY_CREATE_FAILURE });
   }
 }
 
@@ -399,7 +369,6 @@ export function* handle_ACTIVITY_ON_FORM_CHANGE_REQUEST(action) {
     //call autofill events
   } catch (e) {
     console.error(e);
-    yield put({ type: ACTIVITY_CREATE_FAILURE });
   }
 }
 
@@ -416,10 +385,9 @@ export function* handle_ACTIVITY_SUBMIT_REQUEST() {
     });
   } else {
     try {
-      yield put({
-        type: ACTIVITY_SAVE_NETWORK_REQUEST,
-        payload: { activity_id: activityState.activity_id, form_status: ActivityStatus.SUBMITTED }
-      });
+      yield put(
+        Activity.saveNetworkRequest({ activity_id: activityState.activity_id, form_status: ActivityStatus.SUBMITTED })
+      );
     } catch (e) {
       console.error(e);
       yield put({ type: ACTIVITY_GET_INITIAL_STATE_FAILURE });
@@ -427,16 +395,12 @@ export function* handle_ACTIVITY_SUBMIT_REQUEST() {
   }
 }
 
-export function* handle_ACTIVITY_DELETE_REQUEST(action) {
-  const activityState = yield select(selectActivity);
+export function* handle_ACTIVITY_DELETE_REQUEST() {
   try {
-    yield put({
-      type: ACTIVITY_DELETE_NETWORK_REQUEST,
-      payload: { activity_id: activityState.activity_id }
-    });
+    yield put(Activity.deleteNetwork());
   } catch (e) {
     console.error(e);
-    yield put({ type: ACTIVITY_DELETE_FAILURE });
+    yield put(Activity.deleteFailure());
   }
 }
 
@@ -554,7 +518,7 @@ export function* handle_PAN_AND_ZOOM_TO_ACTIVITY(action) {
 }
 
 // some form autofill on create stuff will likely need to go here
-export function* handle_ACTIVITY_GET_SUCCESS(action) {
+export function* handle_ACTIVITY_GET_SUCCESS(action: PayloadAction<Record<string, any>>) {
   try {
     const activityState = yield select(selectActivity);
     const type = activityState?.activity?.activity_subtype;
@@ -563,22 +527,21 @@ export function* handle_ACTIVITY_GET_SUCCESS(action) {
     yield put(Activity.Suggestions.jurisdictions(activityState.activity.geometry));
 
     // needs to be latlng expression
-    const isGeo = action.payload.activity?.geometry?.[0]?.geometry?.coordinates ? true : false;
-    //const centerPoint = center(action.payload.activity?.geometry[0]?.geometry?.coordinates);
+    const isGeo = action.payload?.geometry?.[0]?.geometry?.coordinates ? true : false;
 
     let centerPoint;
     if (isGeo) {
-      centerPoint = center(action.payload.activity?.geometry[0]?.geometry);
+      centerPoint = center(action.payload?.geometry[0]?.geometry);
     }
     if (centerPoint && isGeo) {
       yield put(UserSettings.Map.setCenter(centerPoint.geometry.coordinates));
     }
     if (isLinkedTreatmentSubtype(type)) {
-      yield put(Activity.Suggestions.treatmentIdsRequest(action.payload.activity));
+      yield put(Activity.Suggestions.treatmentIdsRequest(action.payload));
     }
     const authState = yield select(selectAuth);
     const userName = authState.username;
-    const created_by = action.payload.activity.created_by;
+    const created_by = action.payload.created_by;
     const createdByUser = userName === created_by;
 
     const isViewing = !createdByUser;
diff --git a/app/src/state/sagas/activity/offline.ts b/app/src/state/sagas/activity/offline.ts
index 2fcf65ca6..e84b78b82 100644
--- a/app/src/state/sagas/activity/offline.ts
+++ b/app/src/state/sagas/activity/offline.ts
@@ -1,12 +1,6 @@
 import { delay, put, select, takeEvery, takeLeading } from 'redux-saga/effects';
 import { ActivityStatus } from 'sharedAPI';
 import {
-  ACTIVITY_CREATE_LOCAL,
-  ACTIVITY_CREATE_SUCCESS,
-  ACTIVITY_GET_FAILURE,
-  ACTIVITY_GET_LOCAL_REQUEST,
-  ACTIVITY_GET_REQUEST,
-  ACTIVITY_GET_SUCCESS,
   ACTIVITY_RUN_OFFLINE_SYNC,
   ACTIVITY_RUN_OFFLINE_SYNC_COMPLETE,
   ACTIVITY_SAVE_OFFLINE,
@@ -17,10 +11,10 @@ import { selectNetworkConnected } from 'state/reducers/network';
 import { InvasivesAPI_Call } from 'hooks/useInvasivesApi';
 import { AlertSeverity, AlertSubjects } from 'constants/alertEnums';
 import Alerts from 'state/actions/alerts/Alerts';
+import Activity, { ICreateLocal } from 'state/actions/activity/Activity';
+import { PayloadAction } from '@reduxjs/toolkit';
 
 export function* handle_ACTIVITY_SAVE_OFFLINE(action) {
-  //const shortId = action.payload.
-  // all logic handled in the reducer
   yield put(
     Alerts.create({
       content: 'Saved locally',
@@ -28,9 +22,8 @@ export function* handle_ACTIVITY_SAVE_OFFLINE(action) {
       subject: AlertSubjects.Form
     })
   );
-
   // reload the activity in case the reducer modified it (create time, etc.)
-  yield put({ type: ACTIVITY_GET_REQUEST, payload: { activityID: action.payload.id } });
+  yield put(Activity.get(action.payload.id));
 
   // trigger a sync if we're online
   const connected = yield select(selectNetworkConnected);
@@ -40,51 +33,46 @@ export function* handle_ACTIVITY_SAVE_OFFLINE(action) {
   }
 }
 
-export function* handle_ACTIVITY_CREATE_LOCAL(action) {
-  yield put({ type: ACTIVITY_CREATE_SUCCESS, payload: { activity_id: action.payload.data.activity_id } });
+export function* handle_ACTIVITY_CREATE_LOCAL(action: PayloadAction<ICreateLocal>) {
+  yield put(Activity.createSuccess(action.payload.data.activity_id));
 }
 
-export function* handle_ACTIVITY_GET_LOCAL_REQUEST(action) {
+export function* handle_ACTIVITY_GET_LOCAL_REQUEST(action: PayloadAction<string>) {
   const connected = yield select(selectNetworkConnected);
   const { serializedActivities } = yield select(selectOfflineActivity);
-  const { activityID } = action.payload;
+  const activityID = action.payload;
 
   const found = serializedActivities[activityID];
 
   if (found) {
-    yield put({ type: ACTIVITY_GET_SUCCESS, payload: { activity: JSON.parse(found.data) } });
-    return;
-  } else {
+    yield put(Activity.getSuccess(JSON.parse(found.data)));
+  } else if (connected) {
     // not locally, maybe we can get it from the server if we're online
+    try {
+      const networkReturn = yield InvasivesAPI_Call('GET', `/api/activity/${action.payload}`);
 
-    if (connected) {
-      try {
-        const networkReturn = yield InvasivesAPI_Call('GET', `/api/activity/${action.payload.activityID}`);
-
-        if (!(networkReturn.status === 200)) {
-          yield put({ type: ACTIVITY_GET_FAILURE, payload: { failNetworkObj: networkReturn } });
-          return;
-        }
-
-        const datav2 = {
-          ...networkReturn.data,
-          species_positive: networkReturn.data.species_positive || [],
-          species_negative: networkReturn.data.species_negative || [],
-          species_treated: networkReturn.data.species_treated || [],
-          media: networkReturn.data.media || [],
-          media_delete_keys: networkReturn.data.media_delete_keys || []
-        };
-
-        yield put({ type: ACTIVITY_GET_SUCCESS, payload: { activity: datav2 } });
-        return;
-      } catch (e) {
-        yield put({ type: ACTIVITY_GET_FAILURE });
+      if (networkReturn.status !== 200) {
+        yield put(Activity.getFailure(networkReturn));
         return;
       }
-    } else {
-      yield put({ type: ACTIVITY_GET_FAILURE });
+
+      const datav2 = {
+        ...networkReturn.data,
+        species_positive: networkReturn.data.species_positive || [],
+        species_negative: networkReturn.data.species_negative || [],
+        species_treated: networkReturn.data.species_treated || [],
+        media: networkReturn.data.media || [],
+        media_delete_keys: networkReturn.data.media_delete_keys || []
+      };
+      yield put(Activity.getSuccess(datav2));
+      return;
+    } catch (e) {
+      yield put(Activity.getFailure());
       return;
     }
+  } else {
+    yield put(Activity.getFailure());
+    return;
   }
 }
 
@@ -144,8 +132,8 @@ export function* handle_ACTIVITY_RUN_OFFLINE_SYNC() {
 export function* handle_ACTIVITY_RESTORE_OFFLINE() {}
 
 export const OFFLINE_ACTIVITY_SAGA_HANDLERS = [
-  takeEvery(ACTIVITY_GET_LOCAL_REQUEST, handle_ACTIVITY_GET_LOCAL_REQUEST),
+  takeEvery(Activity.getLocal, handle_ACTIVITY_GET_LOCAL_REQUEST),
   takeEvery(ACTIVITY_SAVE_OFFLINE, handle_ACTIVITY_SAVE_OFFLINE),
-  takeEvery(ACTIVITY_CREATE_LOCAL, handle_ACTIVITY_CREATE_LOCAL),
+  takeEvery(Activity.createLocal, handle_ACTIVITY_CREATE_LOCAL),
   takeLeading(ACTIVITY_RUN_OFFLINE_SYNC, handle_ACTIVITY_RUN_OFFLINE_SYNC)
 ];
diff --git a/app/src/state/sagas/activity/online.ts b/app/src/state/sagas/activity/online.ts
index 0bec4cf2b..3164d4c58 100644
--- a/app/src/state/sagas/activity/online.ts
+++ b/app/src/state/sagas/activity/online.ts
@@ -2,26 +2,18 @@ import { put, select, take } from 'redux-saga/effects';
 import { ActivityStatus } from 'sharedAPI';
 import { InvasivesAPI_Call } from 'hooks/useInvasivesApi';
 
-import {
-  ACTIVITIES_GEOJSON_REFETCH_ONLINE,
-  ACTIVITY_CREATE_SUCCESS,
-  ACTIVITY_DELETE_FAILURE,
-  ACTIVITY_DELETE_SUCCESS,
-  ACTIVITY_GET_FAILURE,
-  ACTIVITY_GET_SUCCESS,
-  ACTIVITY_SAVE_SUCCESS,
-  AUTH_INITIALIZE_COMPLETE
-} from 'state/actions';
+import { ACTIVITIES_GEOJSON_REFETCH_ONLINE, AUTH_INITIALIZE_COMPLETE } from 'state/actions';
 import { selectActivity } from 'state/reducers/activity';
 import { selectAuth } from 'state/reducers/auth';
 import { AlertSeverity, AlertSubjects } from 'constants/alertEnums';
 import Alerts from 'state/actions/alerts/Alerts';
 import Activity from 'state/actions/activity/Activity';
 import SuggestedTreatmentId from 'interfaces/SuggestedTreatmentId';
+import { PayloadAction } from '@reduxjs/toolkit';
 
-export function* handle_ACTIVITY_CREATE_NETWORK(action) {
-  yield InvasivesAPI_Call('POST', `/api/activity/`, action.payload.activity);
-  yield put({ type: ACTIVITY_CREATE_SUCCESS, payload: { activity_id: action.payload.activity.activity_id } });
+export function* handle_ACTIVITY_CREATE_NETWORK(action: PayloadAction<Record<string, any>>) {
+  yield InvasivesAPI_Call('POST', `/api/activity/`, action.payload);
+  yield put(Activity.createSuccess(action.payload.activity_id));
 }
 
 export function* handle_ACTIVITY_DELETE_NETWORK_REQUEST() {
@@ -31,12 +23,12 @@ export function* handle_ACTIVITY_DELETE_NETWORK_REQUEST() {
       ids: [activityState.activity.activity_id]
     });
     if (networkReturn?.status == 200) {
-      yield put({ type: ACTIVITY_DELETE_SUCCESS });
+      yield put(Activity.deleteSuccess());
     } else {
-      yield put({ type: ACTIVITY_DELETE_FAILURE });
+      yield put(Activity.deleteFailure());
     }
   } catch (e) {
-    yield put({ type: ACTIVITY_DELETE_FAILURE });
+    yield put(Activity.deleteFailure());
   }
 }
 
@@ -45,10 +37,10 @@ export function* handle_ACTIVITY_GET_NETWORK_REQUEST(action) {
   if (!authState.authenticated) {
     yield take(AUTH_INITIALIZE_COMPLETE);
   }
-  const networkReturn = yield InvasivesAPI_Call('GET', `/api/activity/${action.payload.activityID}`);
+  const networkReturn = yield InvasivesAPI_Call('GET', `/api/activity/${action.payload}`);
 
-  if (!(networkReturn.status === 200)) {
-    yield put({ type: ACTIVITY_GET_FAILURE, payload: { failNetworkObj: networkReturn } });
+  if (networkReturn.status !== 200) {
+    yield put(Activity.getFailure(networkReturn));
     return;
   }
 
@@ -61,11 +53,7 @@ export function* handle_ACTIVITY_GET_NETWORK_REQUEST(action) {
     media_delete_keys: networkReturn.data.media_delete_keys || []
   };
 
-  //const validatedReturn = yield checkForErrors(networkReturn)
-
-  // const remappedBlob = yield mapDBActivityToDoc(networkReturn.data)
-
-  yield put({ type: ACTIVITY_GET_SUCCESS, payload: { activity: datav2 } });
+  yield put(Activity.getSuccess(datav2));
 }
 
 export function* handle_ACTIVITY_SAVE_NETWORK_REQUEST(action) {
@@ -122,15 +110,12 @@ export function* handle_ACTIVITY_SAVE_NETWORK_REQUEST(action) {
       })
     );
   } else {
-    yield put({
-      type: ACTIVITY_SAVE_SUCCESS,
-      payload: {
-        activity: {
-          ...newActivity,
-          media_delete_keys: filtered_media_delete_keys
-        }
-      }
-    });
+    yield put(
+      Activity.saveSuccess({
+        ...newActivity,
+        media_delete_keys: filtered_media_delete_keys
+      })
+    );
   }
   yield put({
     type: ACTIVITIES_GEOJSON_REFETCH_ONLINE,
diff --git a/app/src/state/sagas/iappsite.ts b/app/src/state/sagas/iappsite.ts
index 88bd63d80..f1169a629 100644
--- a/app/src/state/sagas/iappsite.ts
+++ b/app/src/state/sagas/iappsite.ts
@@ -16,8 +16,8 @@ function* iappPageSaga() {
     takeEvery(IAPP_GET_NETWORK_REQUEST, handle_IAPP_GET_NETWORK_REQUEST),
     takeEvery(IAPP_GET_SUCCESS, handle_IAPP_GET_SUCCESS),
     takeEvery(IAPP_PAN_AND_ZOOM, handle_IAPP_PAN_AND_ZOOM),
-    takeEvery(UserSettings.InitState.getSuccess.type, handle_USER_SETTINGS_READY),
-    takeEvery(UserSettings.IAPP.setActiveSuccess.type, handle_USER_SETTINGS_READY)
+    takeEvery(UserSettings.InitState.getSuccess, handle_USER_SETTINGS_READY),
+    takeEvery(UserSettings.IAPP.setActiveSuccess, handle_USER_SETTINGS_READY)
   ]);
 }