diff --git a/__test__/backend.test.js b/__test__/backend.test.js
index 8a23e6833..3bf246846 100644
--- a/__test__/backend.test.js
+++ b/__test__/backend.test.js
@@ -1,6 +1,6 @@
 import { isSqlite } from "../src/server/models/";
 import { resolvers } from "../src/server/api/schema";
-import { schema } from "../src/api/schema";
+import schema from "../src/api/schema";
 import { assignmentRequiredOrAdminRole } from "../src/server/api/errors";
 import { graphql } from "graphql";
 
@@ -28,7 +28,7 @@ import {
   createInvite as helperCreateInvite,
   runGql
 } from "./test_helpers";
-import { makeExecutableSchema } from "graphql-tools";
+import { makeExecutableSchema } from "@graphql-tools/schema";
 
 import { editUserMutation } from "../src/containers/UserEdit.jsx";
 
@@ -99,7 +99,12 @@ async function createInvite() {
   }`;
   const context = getContext();
   try {
-    const invite = await graphql(mySchema, inviteQuery, rootValue, context);
+    const invite = await graphql({
+      schema: mySchema,
+      source: inviteQuery,
+      rootValue,
+      contextValue: context
+    });
     return invite;
   } catch (err) {
     console.error("Error creating invite");
@@ -121,20 +126,20 @@ async function createOrganization(user, name, userId, inviteId) {
     }
   }`;
 
-  const variables = {
+  const variableValues = {
     userId,
     name,
     inviteId
   };
 
   try {
-    const org = await graphql(
-      mySchema,
-      orgQuery,
+    const org = await graphql({
+      schema: mySchema,
+      source: orgQuery,
       rootValue,
-      context,
-      variables
-    );
+      contextValue: context,
+      variableValues
+    });
     return org;
   } catch (err) {
     console.error("Error creating organization");
@@ -151,7 +156,7 @@ async function createCampaign(user, title, description, organizationId) {
       title
     }
   }`;
-  const variables = {
+  const variableValues = {
     input: {
       title,
       description,
@@ -160,13 +165,13 @@ async function createCampaign(user, title, description, organizationId) {
   };
 
   try {
-    const campaign = await graphql(
-      mySchema,
-      campaignQuery,
+    const campaign = await graphql({
+      schema: mySchema,
+      source: campaignQuery,
       rootValue,
-      context,
-      variables
-    );
+      contextValue: context,
+      variableValues
+    });
     return campaign;
   } catch (err) {
     console.error("Error creating campaign");
@@ -177,14 +182,8 @@ async function createCampaign(user, title, description, organizationId) {
 // graphQL tests
 
 describe("graphql test suite", () => {
-  beforeAll(
-    async () => await setupTest(),
-    global.DATABASE_SETUP_TEARDOWN_TIMEOUT
-  );
-  afterAll(
-    async () => await cleanupTest(),
-    global.DATABASE_SETUP_TEARDOWN_TIMEOUT
-  );
+  beforeAll(async () => setupTest(), global.DATABASE_SETUP_TEARDOWN_TIMEOUT);
+  afterAll(async () => cleanupTest(), global.DATABASE_SETUP_TEARDOWN_TIMEOUT);
 
   it("should be undefined when user not logged in", async () => {
     const query = `{
@@ -193,7 +192,12 @@ describe("graphql test suite", () => {
       }
     }`;
     const context = getContext();
-    const result = await graphql(mySchema, query, rootValue, context);
+    const result = await graphql({
+      schema: mySchema,
+      source: query,
+      rootValue,
+      contextValue: context
+    });
     const data = result;
 
     expect(typeof data.currentUser).toEqual("undefined");
@@ -207,7 +211,12 @@ describe("graphql test suite", () => {
       }
     }`;
     const context = getContext({ user: testAdminUser });
-    const result = await graphql(mySchema, query, rootValue, context);
+    const result = await graphql({
+      schema: mySchema,
+      source: query,
+      rootValue,
+      contextValue: context
+    });
     const { data } = result;
 
     expect(data.currentUser.email).toBe("testuser@example.com");
@@ -236,10 +245,10 @@ describe("graphql test suite", () => {
       expect(testOrganization.data.createOrganization.name).toBe(
         "Testy test organization"
       );
-    } else {
-      console.log("Failed to create invite and/or user for organization test");
-      return false;
+      return true;
     }
+    console.log("Failed to create invite and/or user for organization test");
+    return false;
   });
 
   it("should create a test campaign", async () => {
@@ -257,7 +266,7 @@ describe("graphql test suite", () => {
   it("should create campaign contacts", async () => {
     const contact = await createContact(testCampaign.data.createCampaign.id);
     expect(contact.campaign_id).toBe(
-      parseInt(testCampaign.data.createCampaign.id)
+      parseInt(testCampaign.data.createCampaign.id, 10)
     );
   });
 
@@ -282,7 +291,7 @@ describe("graphql test suite", () => {
           firstName
           assignment(campaignId:$campaignId) {
             contactsCount
-            needsMessageCount: contactsCount(contactsFilter:{messageStatus:\"needsMessage\"})
+            needsMessageCount: contactsCount(contactsFilter:{messageStatus:"needsMessage"})
           }
         }
         interactionSteps {
@@ -302,13 +311,13 @@ describe("graphql test suite", () => {
       }
     }`;
     const context = getContext({ user: testAdminUser });
-    const updateCampaign = Object.assign({}, testCampaign.data.createCampaign);
+    const updateCampaign = { ...testCampaign.data.createCampaign };
     const campaignId = updateCampaign.id;
     testTexterUser = await helperCreateTexter(testOrganization);
 
     updateCampaign.texters = [
       {
-        id: testTexterUser.id
+        id: testTexterUser.id.toString()
       }
     ];
     delete updateCampaign.id;
@@ -317,13 +326,13 @@ describe("graphql test suite", () => {
       campaignId,
       campaign: updateCampaign
     };
-    const result = await graphql(
-      mySchema,
-      campaignEditQuery,
+    const result = await graphql({
+      schema: mySchema,
+      source: campaignEditQuery,
       rootValue,
-      context,
-      variables
-    );
+      contextValue: context,
+      variableValues: variables
+    });
 
     expect(result.data.editCampaign.texters.length).toBe(1);
     expect(result.data.editCampaign.texters[0].assignment.contactsCount).toBe(
@@ -355,7 +364,6 @@ describe("graphql test suite", () => {
 
     describe("contacts", () => {
       let campaigns;
-      let contacts;
       beforeEach(async () => {
         campaigns = await Promise.all(
           [
@@ -374,7 +382,7 @@ describe("graphql test suite", () => {
           ].map(async each => each.save())
         );
 
-        contacts = await Promise.all(
+        await Promise.all(
           [
             new CampaignContact({
               campaign_id: campaigns[0].id,
@@ -439,7 +447,7 @@ describe("graphql test suite", () => {
       });
 
       test("resolves unassigned contacts when true", async () => {
-        const contact = await new CampaignContact({
+        await new CampaignContact({
           campaign_id: campaign.id,
           message_status: "needsMessage",
           cell: ""
@@ -473,7 +481,7 @@ describe("graphql test suite", () => {
           campaign_id: campaign.id
         }).save();
 
-        const contact = await new CampaignContact({
+        await new CampaignContact({
           campaign_id: campaign.id,
           assignment_id: assignment.id,
           message_status: "closed",
@@ -619,24 +627,23 @@ describe("graphql test suite", () => {
           typeof copiedCampaign.due_by === "number" ||
           typeof copiedCampaign.due_by === "string"
         ) {
-          let parsedDate = new Date(copiedCampaign.due_by);
+          const parsedDate = new Date(copiedCampaign.due_by);
           expect(parsedDate).toEqual(campaign.due_by);
+        } else if (isSqlite) {
+          // Currently an open issue w/ datetime being stored as a string in SQLite3 for Jest tests: https://github.com/TryGhost/node-sqlite3/issues/1355. This results in milliseconds being truncated when getting campaign due_by
+          const campaignDueBy = campaign.due_by;
+
+          campaignDueBy.setMilliseconds(0);
+          expect(copiedCampaign.due_by).toEqual(campaignDueBy);
         } else {
-          if (isSqlite) {
-            // Currently an open issue w/ datetime being stored as a string in SQLite3 for Jest tests: https://github.com/TryGhost/node-sqlite3/issues/1355. This results in milliseconds being truncated when getting campaign due_by
-            const campaignDueBy = campaign.due_by;
-
-            campaignDueBy.setMilliseconds(0);
-            expect(copiedCampaign.due_by).toEqual(campaignDueBy);
-          } else {
-            expect(copiedCampaign.due_by).toEqual(campaign.due_by);
-          }
+          expect(copiedCampaign.due_by).toEqual(campaign.due_by);
         }
+
         if (
           typeof copiedCampaign.features === "object" &&
           copiedCampaign.features
         ) {
-          let jsonString = JSON.stringify(copiedCampaign.features);
+          const jsonString = JSON.stringify(copiedCampaign.features);
           expect(jsonString).toEqual(campaign.features);
         } else {
           expect(copiedCampaign.features).toEqual(campaign.features);
diff --git a/__test__/components/AssignmentSummary.test.js b/__test__/components/AssignmentSummary.test.js
index 1d806e6a2..7f12ca96c 100644
--- a/__test__/components/AssignmentSummary.test.js
+++ b/__test__/components/AssignmentSummary.test.js
@@ -5,7 +5,7 @@ import React from "react";
 import { mount } from "enzyme";
 import { StyleSheetTestUtils } from "aphrodite";
 import each from "jest-each";
-import { ApolloProvider } from "react-apollo";
+import { ApolloProvider } from "@apollo/client";
 import ApolloClientSingleton from "../../src/network/apollo-client-singleton";
 import { AssignmentSummaryBase as AssignmentSummary } from "../../src/components/AssignmentSummary";
 import Badge from "@material-ui/core/Badge";
diff --git a/__test__/components/IncomingMessageList/ConversationPreviewModal.test.js b/__test__/components/IncomingMessageList/ConversationPreviewModal.test.js
index ebf6018ad..883dc3fd4 100644
--- a/__test__/components/IncomingMessageList/ConversationPreviewModal.test.js
+++ b/__test__/components/IncomingMessageList/ConversationPreviewModal.test.js
@@ -11,7 +11,7 @@ import { prepareDataTableData } from "../../../src/components/IncomingMessageLis
 import ReactTestUtils from "react-dom/test-utils";
 import { createMemoryHistory } from "react-router";
 import ApolloClientSingleton from "../../../src/network/apollo-client-singleton";
-import { ApolloProvider } from "react-apollo";
+import { ApolloProvider } from "@apollo/client";
 import Dialog from "@material-ui/core/Dialog";
 
 import { r } from "../../../src/server/models";
diff --git a/__test__/components/TopNav.test.js b/__test__/components/TopNav.test.jsx
similarity index 100%
rename from __test__/components/TopNav.test.js
rename to __test__/components/TopNav.test.jsx
diff --git a/__test__/extensions/message-handlers/profanity-tagger.test.js b/__test__/extensions/message-handlers/profanity-tagger.test.js
index 70533bede..7dd6e62df 100644
--- a/__test__/extensions/message-handlers/profanity-tagger.test.js
+++ b/__test__/extensions/message-handlers/profanity-tagger.test.js
@@ -9,7 +9,8 @@ import {
   setupTest,
   cleanupTest,
   createStartedCampaign,
-  sendMessage
+  sendMessage,
+  sleep
 } from "../../test_helpers";
 
 beforeEach(async () => {
@@ -62,12 +63,15 @@ describe("Message Hanlder: profanity-tagger", () => {
     await cacheableData.organization.clear(c.organizationId);
 
     // SEND
-    await sendMessage(c.testContacts[1].id, c.testTexterUser, {
-      userId: c.testTexterUser.id,
+    await sendMessage(c.testContacts[1].id.toString(), c.testTexterUser, {
+      userId: c.testTexterUser.id.toString(),
       contactNumber: c.testContacts[1].cell,
       text: "brass shoe eddie homonym",
-      assignmentId: c.assignmentId
+      assignmentId: c.assignmentId.toString()
     });
+
+    await sleep(5);
+
     // a little stupidly updating messageservice_sid is necessary
     // because it's not await'd
     await r
@@ -126,17 +130,22 @@ describe("Message Hanlder: profanity-tagger", () => {
     expect(available(org)).toBeTruthy();
 
     // Confirm texter catch
-    await sendMessage(c.testContacts[0].id, c.testTexterUser, {
-      userId: c.testTexterUser.id,
+    await sendMessage(c.testContacts[0].id.toString(), c.testTexterUser, {
+      userId: c.testTexterUser.id.toString(),
       contactNumber: c.testContacts[0].cell,
       text: "Some fakeslur message",
-      assignmentId: c.assignmentId
+      assignmentId: c.assignmentId.toString()
     });
+
+    await sleep(10);
+
     const text1 = await r
       .knex("tag_campaign_contact")
       .select("tag_id", "campaign_contact_id")
-      .where("campaign_contact_id", 1);
-    expect(text1).toEqual([{ tag_id: 2, campaign_contact_id: 1 }]);
+      .where("campaign_contact_id", c.testContacts[0].id);
+    expect(text1).toEqual([
+      { tag_id: 2, campaign_contact_id: c.testContacts[0].id }
+    ]);
 
     let user = await cacheableData.user.userHasRole(
       c.testTexterUser,
@@ -146,16 +155,19 @@ describe("Message Hanlder: profanity-tagger", () => {
     expect(user).toBe(true);
 
     // Confirm texter no-match
-    await sendMessage(c.testContacts[1].id, c.testTexterUser, {
-      userId: c.testTexterUser.id,
+    await sendMessage(c.testContacts[1].id.toString(), c.testTexterUser, {
+      userId: c.testTexterUser.id.toString(),
       contactNumber: c.testContacts[1].cell,
       text: "brass shoe eddie homonym",
-      assignmentId: c.assignmentId
+      assignmentId: c.assignmentId.toString()
     });
+
+    await sleep(5);
+
     const text2 = await r
       .knex("tag_campaign_contact")
       .select("tag_id", "campaign_contact_id")
-      .where("campaign_contact_id", 2);
+      .where("campaign_contact_id", c.testContacts[1].id);
     expect(text2).toEqual([]);
 
     user = await cacheableData.user.userHasRole(
@@ -166,12 +178,15 @@ describe("Message Hanlder: profanity-tagger", () => {
     expect(user).toBe(true);
 
     // Confirm texter no-match
-    await sendMessage(c.testContacts[1].id, c.testTexterUser, {
-      userId: c.testTexterUser.id,
+    await sendMessage(c.testContacts[1].id.toString(), c.testTexterUser, {
+      userId: c.testTexterUser.id.toString(),
       contactNumber: c.testContacts[1].cell,
       text: "fakeslur is one too many slurs",
-      assignmentId: c.assignmentId
+      assignmentId: c.assignmentId.toString()
     });
+
+    await sleep(5);
+
     user = await cacheableData.user.userHasRole(
       c.testTexterUser,
       c.organizationId,
@@ -209,17 +224,22 @@ describe("Message Hanlder: profanity-tagger", () => {
     expect(available(org)).toBeTruthy();
 
     // Confirm texter catch
-    await sendMessage(c.testContacts[0].id, c.testTexterUser, {
-      userId: c.testTexterUser.id,
+    await sendMessage(c.testContacts[0].id.toString(), c.testTexterUser, {
+      userId: c.testTexterUser.id.toString(),
       contactNumber: c.testContacts[0].cell,
       text: "Some fakeslur message",
-      assignmentId: c.assignmentId
+      assignmentId: c.assignmentId.toString()
     });
+
+    await sleep(5);
+
     const text1 = await r
       .knex("tag_campaign_contact")
       .select("tag_id", "campaign_contact_id")
-      .where("campaign_contact_id", 1);
-    expect(text1).toEqual([{ tag_id: 2, campaign_contact_id: 1 }]);
+      .where("campaign_contact_id", c.testContacts[0].id);
+    expect(text1).toEqual([
+      { tag_id: 2, campaign_contact_id: c.testContacts[0].id }
+    ]);
 
     const messages = await r.knex("message").select();
     expect(messages.length).toBe(1);
diff --git a/__test__/lib.test.js b/__test__/lib.test.js
index 4800ee67a..10bf193b5 100644
--- a/__test__/lib.test.js
+++ b/__test__/lib.test.js
@@ -1,8 +1,8 @@
 import { resolvers } from "../src/server/api/schema";
-import { schema } from "../src/api/schema";
+import schema from "../src/api/schema";
 import twilio from "../src/extensions/service-vendors/twilio";
 import { getConfig, hasConfig } from "../src/server/api/lib/config";
-import { makeExecutableSchema } from "graphql-tools";
+import { makeExecutableSchema } from "@graphql-tools/schema";
 
 const mySchema = makeExecutableSchema({
   typeDefs: schema,
diff --git a/__test__/server/api/campaign/campaign.test.js b/__test__/server/api/campaign/campaign.test.js
index 2589c5b19..cce06246d 100644
--- a/__test__/server/api/campaign/campaign.test.js
+++ b/__test__/server/api/campaign/campaign.test.js
@@ -1,4 +1,4 @@
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { campaignDataQuery as AdminCampaignEditQuery } from "../../../../src/containers/AdminCampaignEdit";
 import {
   bulkReassignCampaignContactsMutation,
@@ -237,7 +237,7 @@ it("save campaign interaction steps, edit it, make sure the last value is set",
   let texterCampaignDataResults = await runGql(
     campaignQuery,
     {
-      assignmentId
+      assignmentId: assignmentId.toString()
     },
     testTexterUser
   );
@@ -282,7 +282,7 @@ it("save campaign interaction steps, edit it, make sure the last value is set",
   texterCampaignDataResults = await runGql(
     campaignQuery,
     {
-      assignmentId
+      assignmentId: assignmentId.toString()
     },
     testTexterUser
   );
@@ -363,7 +363,7 @@ it("should save campaign canned responses across copies and match saved data", a
     testAdminUser
   );
   expect(campaignDataResults.data.campaign.cannedResponses.length).toEqual(6);
-  for (let i = 0; i < 6; i++) {
+  for (let i = 0; i < 6; i += 1) {
     expect(campaignDataResults.data.campaign.cannedResponses[i].title).toEqual(
       `canned ${i + 1}`
     );
@@ -382,7 +382,7 @@ it("should save campaign canned responses across copies and match saved data", a
     testAdminUser
   );
   expect(campaignDataResults.data.campaign.cannedResponses.length).toEqual(6);
-  for (let i = 0; i < 6; i++) {
+  for (let i = 0; i < 6; i += 1) {
     expect(campaignDataResults.data.campaign.cannedResponses[i].title).toEqual(
       `canned ${i + 1}`
     );
@@ -397,7 +397,7 @@ it("should save campaign canned responses across copies and match saved data", a
   );
 
   expect(campaignDataResults.data.campaign.cannedResponses.length).toEqual(6);
-  for (let i = 0; i < 6; i++) {
+  for (let i = 0; i < 6; i += 1) {
     expect(campaignDataResults.data.campaign.cannedResponses[i].title).toEqual(
       `canned ${i + 1}`
     );
@@ -415,14 +415,18 @@ describe("Caching", () => {
 
       queryLog = [];
       console.log("STARTING TEXTING"); // eslint-disable-line no-console
-      for (let i = 0; i < 5; i++) {
-        await sendMessage(testContacts[i].id, testTexterUser, {
-          userId: testTexterUser.id,
-          contactNumber: testContacts[i].cell,
-          text: "test text",
-          assignmentId
-        });
-      }
+
+      await Promise.all(
+        testContacts.slice(0, 5).map(contact =>
+          sendMessage(contact.id, testTexterUser, {
+            userId: testTexterUser.id,
+            contactNumber: contact.cell,
+            text: "test text",
+            assignmentId: assignmentId.toString()
+          })
+        )
+      );
+
       // should only have done updates and inserts
       expect(
         queryLog
@@ -465,7 +469,7 @@ describe("Reassignments", () => {
           isOptedOut: false,
           validTimezone: true
         },
-        assignmentId,
+        assignmentId: assignmentId.toString(),
         organizationId
       },
       testTexterUser
@@ -479,14 +483,17 @@ describe("Reassignments", () => {
       NUMBER_OF_CONTACTS
     );
     // send some texts
-    for (let i = 0; i < 5; i++) {
-      await sendMessage(testContacts[i].id, testTexterUser, {
-        userId: testTexterUser.id,
-        contactNumber: testContacts[i].cell,
-        text: "test text",
-        assignmentId
-      });
-    }
+    await Promise.all(
+      testContacts.slice(0, 5).map(contact =>
+        sendMessage(contact.id.toString(), testTexterUser, {
+          userId: testTexterUser.id.toString(),
+          contactNumber: contact.cell,
+          text: "test text",
+          assignmentId: assignmentId.toString()
+        })
+      )
+    );
+
     // TEXTER 1 (95 needsMessage, 5 needsResponse)
     texterCampaignDataResults = await runGql(
       TexterTodoQuery,
@@ -496,7 +503,7 @@ describe("Reassignments", () => {
           isOptedOut: false,
           validTimezone: true
         },
-        assignmentId,
+        assignmentId: assignmentId.toString(),
         organizationId
       },
       testTexterUser
@@ -512,11 +519,11 @@ describe("Reassignments", () => {
     // using editCampaign
     await assignTexter(testAdminUser, testTexterUser, testCampaign, [
       {
-        id: testTexterUser.id,
+        id: testTexterUser.id.toString(),
         needsMessageCount: 70,
         contactsCount: NUMBER_OF_CONTACTS
       },
-      { id: testTexterUser2.id, needsMessageCount: 20 }
+      { id: testTexterUser2.id.toString(), needsMessageCount: 20 }
     ]);
     // TEXTER 1 (70 needsMessage, 5 messaged)
     // TEXTER 2 (20 needsMessage)
@@ -528,7 +535,7 @@ describe("Reassignments", () => {
           isOptedOut: false,
           validTimezone: true
         },
-        assignmentId,
+        assignmentId: assignmentId.toString(),
         organizationId
       },
       testTexterUser
@@ -555,7 +562,7 @@ describe("Reassignments", () => {
           validTimezone: true
         },
         organizationId,
-        assignmentId: assignmentId2
+        assignmentId: assignmentId2.toString()
       },
       testTexterUser2
     );
@@ -567,19 +574,23 @@ describe("Reassignments", () => {
     );
     const assignmentContacts2 =
       texterCampaignDataResults.data.assignment.contacts;
-    for (let i = 0; i < 5; i++) {
-      const contact = testContacts.filter(
-        c => assignmentContacts2[i].id === c.id.toString()
-      )[0];
-      const messageRes = await sendMessage(contact.id, testTexterUser2, {
-        userId: testTexterUser2.id,
-        contactNumber: contact.cell,
-        text: "test text autorespond",
-        assignmentId: assignmentId2
-      });
-    }
+
+    await Promise.all(
+      assignmentContacts2.slice(0, 5).map(assignmentContact => {
+        const contact = testContacts.filter(
+          c => assignmentContact.id === c.id.toString()
+        )[0];
+        return sendMessage(contact.id.toString(), testTexterUser2, {
+          userId: testTexterUser2.id.toString(),
+          contactNumber: contact.cell,
+          text: "test text autorespond",
+          assignmentId: assignmentId2.toString()
+        });
+      })
+    );
+
     // does this sleep fix the "sometimes 4 instead of 5" below?
-    await sleep(5);
+    await sleep(50);
     // TEXTER 1 (70 needsMessage, 5 messaged)
     // TEXTER 2 (15 needsMessage, 5 needsResponse)
     texterCampaignDataResults = await runGql(
@@ -591,7 +602,7 @@ describe("Reassignments", () => {
           validTimezone: true
         },
         organizationId,
-        assignmentId: assignmentId2
+        assignmentId: assignmentId2.toString()
       },
       testTexterUser2
     );
@@ -610,7 +621,7 @@ describe("Reassignments", () => {
           validTimezone: true
         },
         organizationId,
-        assignmentId: assignmentId2
+        assignmentId: assignmentId2.toString()
       },
       testTexterUser2
     );
@@ -623,19 +634,24 @@ describe("Reassignments", () => {
     );
     const makeFilterFunction = contactToMatch => contactToTest =>
       contactToMatch.id === contactToTest.id.toString();
-    for (let i = 0; i < 3; i++) {
-      const contact = testContacts.filter(
-        makeFilterFunction(
-          texterCampaignDataResults.data.assignment.contacts[i]
-        )
-      )[0];
-      await sendMessage(contact.id, testTexterUser2, {
-        userId: testTexterUser2.id,
-        contactNumber: contact.cell,
-        text: "keep talking",
-        assignmentId: assignmentId2
-      });
-    }
+
+    await Promise.all(
+      texterCampaignDataResults.data.assignment.contacts
+        .slice(0, 3)
+        .map(assignmentContact => {
+          const contact = testContacts.filter(
+            makeFilterFunction(assignmentContact)
+          )[0];
+
+          return sendMessage(contact.id.toString(), testTexterUser2, {
+            userId: testTexterUser2.id.toString(),
+            contactNumber: contact.cell,
+            text: "keep talking",
+            assignmentId: assignmentId2.toString()
+          });
+        })
+    );
+
     // TEXTER 1 (70 needsMessage, 5 messaged)
     // TEXTER 2 (15 needsMessage, 2 needsResponse, 3 convo)
     texterCampaignDataResults = await runGql(
@@ -647,7 +663,7 @@ describe("Reassignments", () => {
           validTimezone: true
         },
         organizationId,
-        assignmentId: assignmentId2
+        assignmentId: assignmentId2.toString()
       },
       testTexterUser2
     );
@@ -666,7 +682,7 @@ describe("Reassignments", () => {
           validTimezone: true
         },
         organizationId,
-        assignmentId: assignmentId2
+        assignmentId: assignmentId2.toString()
       },
       testTexterUser2
     );
@@ -677,10 +693,21 @@ describe("Reassignments", () => {
       20
     );
     await assignTexter(testAdminUser, testTexterUser, testCampaign, [
-      { id: testTexterUser.id, needsMessageCount: 60, contactsCount: 75 },
+      {
+        id: testTexterUser.id.toString(),
+        needsMessageCount: 60,
+        contactsCount: 75
+      },
       // contactsCount: 30 = 25 (desired needsMessage) + 5 (messaged)
-      { id: testTexterUser2.id, needsMessageCount: 25, contactsCount: 30 }
+      {
+        id: testTexterUser2.id.toString(),
+        needsMessageCount: 25,
+        contactsCount: 30
+      }
     ]);
+
+    await sleep(20);
+
     // TEXTER 1 (60 needsMessage, 5 messaged)
     // TEXTER 2 (25 needsMessage, 2 needsResponse, 3 convo)
     texterCampaignDataResults = await runGql(
@@ -691,7 +718,7 @@ describe("Reassignments", () => {
           isOptedOut: false,
           validTimezone: true
         },
-        assignmentId,
+        assignmentId: assignmentId.toString(),
         organizationId
       },
       testTexterUser
@@ -705,7 +732,7 @@ describe("Reassignments", () => {
           validTimezone: true
         },
         organizationId,
-        assignmentId: assignmentId2
+        assignmentId: assignmentId2.toString()
       },
       testTexterUser2
     );
@@ -728,7 +755,7 @@ describe("Reassignments", () => {
       reassignCampaignContactsMutation,
       {
         organizationId,
-        newTexterUserId: testTexterUser2.id,
+        newTexterUserId: testTexterUser2.id.toString(),
         campaignIdsContactIds: [
           {
             campaignId: testCampaign.id,
@@ -741,6 +768,7 @@ describe("Reassignments", () => {
       },
       testAdminUser
     );
+
     // TEXTER 1 (60 needsMessage, 4 messaged)
     // TEXTER 2 (25 needsMessage, 2 needsResponse, 3 convo, 1 messaged)
     texterCampaignDataResults = await runGql(
@@ -751,7 +779,7 @@ describe("Reassignments", () => {
           isOptedOut: false,
           validTimezone: true
         },
-        assignmentId,
+        assignmentId: assignmentId.toString(),
         organizationId
       },
       testTexterUser
@@ -765,7 +793,7 @@ describe("Reassignments", () => {
           validTimezone: true
         },
         organizationId,
-        assignmentId: assignmentId2
+        assignmentId: assignmentId2.toString()
       },
       testTexterUser2
     );
@@ -787,13 +815,13 @@ describe("Reassignments", () => {
       bulkReassignCampaignContactsMutation,
       {
         organizationId,
-        newTexterUserId: testTexterUser.id,
+        newTexterUserId: testTexterUser.id.toString(),
         contactsFilter: {
           messageStatus: "needsResponse",
           isOptedOut: false,
           validTimezone: true
         },
-        campaignsFilter: { campaignId: testCampaign.id },
+        campaignsFilter: { campaignId: parseInt(testCampaign.id, 10) },
         assignmentsFilter: { texterId: testTexterUser2.id },
         messageTextFilter: ""
       },
@@ -809,7 +837,7 @@ describe("Reassignments", () => {
           isOptedOut: false,
           validTimezone: true
         },
-        assignmentId,
+        assignmentId: assignmentId.toString(),
         organizationId
       },
       testTexterUser
@@ -823,7 +851,7 @@ describe("Reassignments", () => {
           isOptedOut: false,
           validTimezone: true
         },
-        assignmentId: assignmentId2,
+        assignmentId: assignmentId2.toString(),
         organizationId
       },
       testTexterUser2
@@ -877,7 +905,7 @@ describe("Bulk Send", () => {
           isOptedOut: false,
           validTimezone: true
         },
-        assignmentId,
+        assignmentId: assignmentId.toString(),
         organizationId
       },
       testTexterUser
@@ -904,7 +932,7 @@ describe("Bulk Send", () => {
           isOptedOut: false,
           validTimezone: true
         },
-        assignmentId,
+        assignmentId: assignmentId.toString(),
         organizationId
       },
       testTexterUser
@@ -1046,11 +1074,11 @@ describe("campaigns query", () => {
 
   it("correctly filters by a single campaign id", async () => {
     const campaignsFilter = {
-      campaignId: testCampaign.id
+      campaignId: parseInt(testCampaign.id, 10)
     };
     const variables = {
       cursor,
-      organizationId,
+      organizationId: organizationId.toString(),
       campaignsFilter
     };
 
@@ -1061,11 +1089,14 @@ describe("campaigns query", () => {
 
   it("correctly filter by more than one campaign id", async () => {
     const campaignsFilter = {
-      campaignIds: [testCampaign.id, testCampaign2.id]
+      campaignIds: [
+        parseInt(testCampaign.id, 10),
+        parseInt(testCampaign2.id, 10)
+      ]
     };
     const variables = {
       cursor,
-      organizationId,
+      organizationId: organizationId.toString(),
       campaignsFilter
     };
 
@@ -1176,7 +1207,7 @@ describe("all interaction steps fields travel round trip", () => {
       `;
 
       variables = {
-        assignmentId
+        assignmentId: assignmentId.toString()
       };
     });
 
diff --git a/__test__/server/api/campaign/updateQuestionResponses.test.js b/__test__/server/api/campaign/updateQuestionResponses.test.js
index 7073188a5..7a86104af 100644
--- a/__test__/server/api/campaign/updateQuestionResponses.test.js
+++ b/__test__/server/api/campaign/updateQuestionResponses.test.js
@@ -94,7 +94,8 @@ describe("mutations.updateQuestionResponses", () => {
     // these are the answers to the question "what's your favorite color?"
     const toReturnColorInteractionSteps = returnedInteractionSteps.filter(
       interactionStep =>
-        interactionStep.parentInteractionId === returnedInteractionSteps[0].id
+        interactionStep.parentInteractionId ===
+        returnedInteractionSteps[0].id.toString()
     );
 
     // this is the interaction step representing the answer "Red"
@@ -105,15 +106,16 @@ describe("mutations.updateQuestionResponses", () => {
     // these are the answers to the question "what's your favorite shade of red"
     const toReturnShadesOfRedInteractionSteps = returnedInteractionSteps.filter(
       interactionStep =>
-        interactionStep.parentInteractionId === toReturnRedInteractionStep.id
+        interactionStep.parentInteractionId ===
+        toReturnRedInteractionStep.id.toString()
     );
 
     // send initial messages to 2 contacts
     const promises = contacts.slice(0, numberOfContacts).map(contact => {
-      return sendMessage(contact.id, texterUser, {
+      return sendMessage(contact.id.toString(), texterUser, {
         text: returnedInteractionSteps[0].script,
         contactNumber: contact.cell,
-        assignmentId: assignment.id,
+        assignmentId: assignment.id.toString(),
         userId: texterUser.id.toString()
       });
     });
@@ -238,13 +240,13 @@ describe("mutations.updateQuestionResponses", () => {
 
       questionResponses = [
         {
-          campaignContactId: contacts[0].id,
-          interactionStepId: interactionSteps[0].id,
+          campaignContactId: contacts[0].id.toString(),
+          interactionStepId: interactionSteps[0].id.toString(),
           value: colorInteractionSteps[0].answerOption
         },
         {
-          campaignContactId: contacts[0].id,
-          interactionStepId: redInteractionStep.id,
+          campaignContactId: contacts[0].id.toString(),
+          interactionStepId: redInteractionStep.id.toString(),
           value: shadesOfRedInteractionSteps[0].answerOption
         }
       ];
@@ -276,7 +278,7 @@ describe("mutations.updateQuestionResponses", () => {
     `;
 
       const variables = {
-        ccid: contacts[0].id,
+        ccid: contacts[0].id.toString(),
         qr: questionResponses
       };
 
@@ -357,8 +359,8 @@ describe("mutations.updateQuestionResponses", () => {
       `;
 
         const getAssignmentVariables = {
-          assignmentId: assignment.id,
-          contactIds: contacts[0].id,
+          assignmentId: assignment.id.toString(),
+          contactIds: contacts[0].id.toString(),
           findNew: false
         };
 
diff --git a/__test__/server/api/createOptOut.test.js b/__test__/server/api/createOptOut.test.js
index 4f302c417..9795fed82 100644
--- a/__test__/server/api/createOptOut.test.js
+++ b/__test__/server/api/createOptOut.test.js
@@ -26,13 +26,13 @@ describe("createOptOut", () => {
     optOutContact = startedCampaign.testContacts[20];
     optOut = {
       cell: optOutContact.cell,
-      assignmentId: startedCampaign.assignmentId,
+      assignmentId: startedCampaign.assignmentId.toString(),
       reason: "they were snotty"
     };
 
     variables = {
       optOut,
-      campaignContactId: optOutContact.id
+      campaignContactId: optOutContact.id.toString()
     };
   }, global.DATABASE_SETUP_TEARDOWN_TIMEOUT);
 
diff --git a/__test__/server/api/editOrganization.test.js b/__test__/server/api/editOrganization.test.js
index e244cebc6..aec9681df 100644
--- a/__test__/server/api/editOrganization.test.js
+++ b/__test__/server/api/editOrganization.test.js
@@ -1,9 +1,7 @@
 /* eslint-disable no-unused-expressions, consistent-return */
 import { r } from "../../../src/server/models/";
 import { getFeatures } from "../../../src/server/api/lib/config";
-import { getCampaignsQuery } from "../../../src/containers/AdminCampaignList";
 import { editOrganizationGql } from "../../../src/containers/Settings";
-import { GraphQLError } from "graphql/error";
 
 import {
   cleanupTest,
diff --git a/__test__/server/api/errors.test.js b/__test__/server/api/errors.test.js
index f2aee7d70..e7eb56b8e 100644
--- a/__test__/server/api/errors.test.js
+++ b/__test__/server/api/errors.test.js
@@ -40,10 +40,8 @@ describe("errors.js", () => {
       }
 
       expect(error).toBeDefined();
-      expect(error.message).toEqual({
-        message: "You must login to access that resource.",
-        status: 401
-      });
+      expect(error.message).toEqual("You must login to access that resource.");
+      expect(error.extensions).toMatchObject({ status: 401 });
     });
   });
 
diff --git a/__test__/server/api/organization.test.js b/__test__/server/api/organization.test.js
index fbdfd4083..0a7f75f98 100644
--- a/__test__/server/api/organization.test.js
+++ b/__test__/server/api/organization.test.js
@@ -2,7 +2,7 @@
 import { isSqlite, r } from "../../../src/server/models/";
 import { getCampaignsQuery } from "../../../src/containers/AdminCampaignList";
 import { GraphQLError } from "graphql/error";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import * as messagingServices from "../../../src/extensions/service-vendors";
 
 import {
@@ -92,7 +92,7 @@ describe("organization", () => {
 
     it("filters by a single campaign id", async () => {
       variables.campaignsFilter = {
-        campaignId: testCampaign.id
+        campaignId: parseInt(testCampaign.id, 10)
       };
 
       const result = await runGql(getCampaignsQuery, variables, testAdminUser);
@@ -104,7 +104,10 @@ describe("organization", () => {
 
     it("filter by more than one campaign id", async () => {
       const campaignsFilter = {
-        campaignIds: [testCampaign.id, testCampaign2.id]
+        campaignIds: [
+          parseInt(testCampaign.id, 10),
+          parseInt(testCampaign2.id, 10)
+        ]
       };
       variables.campaignsFilter = campaignsFilter;
 
@@ -235,7 +238,7 @@ describe("organization", () => {
       organizationQuery = `
         query q($organizationId: String!) {
           organization(id: $organizationId) {
-            id 
+            id
             name
             availableActions {
               name
@@ -314,7 +317,7 @@ describe("organization", () => {
         }
       `;
 
-      variables = { organizationId: 1 };
+      variables = { organizationId: "1" };
 
       jest.spyOn(messagingServices, "fullyConfigured").mockResolvedValue(false);
     });
diff --git a/__test__/server/api/people.test.js b/__test__/server/api/people.test.js
index beeb84700..97f23fafd 100644
--- a/__test__/server/api/people.test.js
+++ b/__test__/server/api/people.test.js
@@ -6,7 +6,7 @@ import { r } from "../../../src/server/models/";
 import { getUsersGql } from "../../../src/containers/PeopleList";
 import { GraphQLError } from "graphql/error";
 import { resolvers } from "../../../src/server/api/schema";
-import { validate as uuidValidate } from 'uuid';
+import { validate as uuidValidate } from "uuid";
 
 import {
   setupTest,
@@ -62,14 +62,14 @@ describe("people", () => {
     await updateUserRoles(
       testAdminUsers[0],
       organizationId,
-      testAdminUsers[0].id,
+      testAdminUsers[0].id.toString(),
       ["OWNER"]
     );
 
     await updateUserRoles(
       testAdminUsers[0],
       organizationId,
-      testAdminUsers[1].id,
+      testAdminUsers[1].id.toString(),
       ["ADMIN"]
     );
 
@@ -158,23 +158,23 @@ describe("people", () => {
 
     // assign contacts
     await assignTexter(testAdminUsers[0], null, testCampaigns[0], [
-      { id: testTexterUsers[0].id, needsMessageCount: 3 },
-      { id: testTexterUsers[1].id, needsMessageCount: 3 }
+      { id: testTexterUsers[0].id.toString(), needsMessageCount: 3 },
+      { id: testTexterUsers[1].id.toString(), needsMessageCount: 3 }
     ]);
 
     await assignTexter(testAdminUsers[0], null, testCampaigns[1], [
-      { id: testTexterUsers[2].id, needsMessageCount: 3 },
-      { id: testTexterUsers[3].id, needsMessageCount: 3 }
+      { id: testTexterUsers[2].id.toString(), needsMessageCount: 3 },
+      { id: testTexterUsers[3].id.toString(), needsMessageCount: 3 }
     ]);
 
     await assignTexter(testAdminUsers[0], null, testCampaigns[2], [
-      { id: testTexterUsers[0].id, needsMessageCount: 3 },
-      { id: testTexterUsers[4].id, needsMessageCount: 3 }
+      { id: testTexterUsers[0].id.toString(), needsMessageCount: 3 },
+      { id: testTexterUsers[4].id.toString(), needsMessageCount: 3 }
     ]);
 
     await assignTexter(testAdminUsers[0], null, testCampaigns[3], [
-      { id: testTexterUsers[1].id, needsMessageCount: 3 },
-      { id: testTexterUsers[3].id, needsMessageCount: 3 }
+      { id: testTexterUsers[1].id.toString(), needsMessageCount: 3 },
+      { id: testTexterUsers[3].id.toString(), needsMessageCount: 3 }
     ]);
 
     // other stuff
@@ -208,7 +208,7 @@ describe("people", () => {
 
     it("filters users to those assigned to a single campaign", async () => {
       const campaignsFilter = {
-        campaignId: testCampaigns[0].id
+        campaignId: parseInt(testCampaigns[0].id, 10)
       };
       variables.campaignsFilter = campaignsFilter;
       const result = await runGql(getUsersGql, variables, testAdminUsers[0]);
@@ -217,7 +217,10 @@ describe("people", () => {
 
     it("filters users to those assigned to multiple campaigns", async () => {
       const campaignsFilter = {
-        campaignIds: [testCampaigns[0].id, testCampaigns[3].id]
+        campaignIds: [
+          parseInt(testCampaigns[0].id, 10),
+          parseInt(testCampaigns[3].id, 10)
+        ]
       };
       variables.campaignsFilter = campaignsFilter;
       const result = await runGql(getUsersGql, variables, testAdminUsers[0]);
@@ -334,7 +337,7 @@ describe("people", () => {
       expect(result.data).toBeUndefined();
       expect(result.errors).toEqual([
         new GraphQLError(
-          'Variable "$filterBy" got invalid value "any"; Expected type FilterPeopleBy; did you mean ANY?'
+          'Variable "$filterBy" got invalid value "any"; Value "any" does not exist in "FilterPeopleBy" enum. Did you mean the enum value "ANY"?'
         )
       ]);
     });
@@ -488,29 +491,37 @@ describe("people", () => {
   describe("reset password", () => {
     /**
      * Run the resetUserPassword mutation
-     * @param {number} organizationId 
-     * @param {number} texterId 
-     * @param {number} userId 
+     * @param {number} organizationId
+     * @param {number} texterId
+     * @param {number} userId
      * @returns Promise
      */
     function resetUserPassword(admin, organizationId, texterId) {
-      return resolvers.RootMutation.resetUserPassword(null, {
-        organizationId: organizationId,
-        userId: texterId
-      }, {
-        loaders: {
-          organization: {
-            load: async id => {
-              return (await r.knex("organization").where({ id }))[0];
-            }
-          }
+      return resolvers.RootMutation.resetUserPassword(
+        null,
+        {
+          organizationId: organizationId,
+          userId: texterId.toString()
         },
-        user: admin
-      });
+        {
+          loaders: {
+            organization: {
+              load: async id => {
+                return (await r.knex("organization").where({ id }))[0];
+              }
+            }
+          },
+          user: admin
+        }
+      );
     }
 
     it("reset local password", () => {
-      resetUserPassword(testAdminUsers[0], organizationId, testTexterUsers[0].id).then(uuid => {
+      resetUserPassword(
+        testAdminUsers[0],
+        organizationId,
+        testTexterUsers[0].id
+      ).then(uuid => {
         // Non-Auth0 password reset will return verion 4 UUID
         expect(uuidValidate(uuid)).toBeTruthy();
       });
@@ -520,9 +531,15 @@ describe("people", () => {
       // Remove PASSPORT_STRATEGY env var. PASSPORT_STRATEGY will default to "auth0" if there's nothing explicitly set
       delete window.PASSPORT_STRATEGY;
 
-      resetUserPassword(testAdminUsers[0], organizationId, testTexterUsers[0].id).catch(e => {
+      resetUserPassword(
+        testAdminUsers[0],
+        organizationId,
+        testTexterUsers[0].id
+      ).catch(e => {
         // Auth0 password reset will attempt to make HTTP request, which will fail in Jest test
-        const match = e.message.match(/Error: Request id (.*) failed; all 2 retries exhausted/);
+        const match = e.message.match(
+          /Error: Request id (.*) failed; all 2 retries exhausted/
+        );
 
         expect(match).toHaveLength(2);
         expect(uuidValidate(match[1])).toBeTruthy();
diff --git a/__test__/server/api/updateContactTags.test.js b/__test__/server/api/updateContactTags.test.js
index df336e76f..ef0fc57b1 100644
--- a/__test__/server/api/updateContactTags.test.js
+++ b/__test__/server/api/updateContactTags.test.js
@@ -106,7 +106,7 @@ describe("mutations.updateContactTags", () => {
 
     const result = await wrappedMutations.updateContactTags(
       contactTags,
-      contacts[0].id
+      contacts[0].id.toString()
     );
 
     expect(result.data.updateContactTags).toEqual({
@@ -154,7 +154,7 @@ describe("mutations.updateContactTags", () => {
           id: tag.id,
           value: tag.value
         })),
-        999999 // this will cause cacheableData.campaignContact.load to throw an exception
+        "999999" // this will cause cacheableData.campaignContact.load to throw an exception
       );
 
       expect(result.errors[0].message).toEqual(
diff --git a/__test__/server/texter.test/correctContactsAfterReassignment.test.js b/__test__/server/texter.test/correctContactsAfterReassignment.test.js
index face6557b..93dda28f4 100644
--- a/__test__/server/texter.test/correctContactsAfterReassignment.test.js
+++ b/__test__/server/texter.test/correctContactsAfterReassignment.test.js
@@ -41,7 +41,7 @@ it("should return contacts after they are reassigned", async () => {
         messageIds: []
       };
     }),
-    testTexterUser2.id
+    testTexterUser2.id.toString()
   );
 
   const [
@@ -51,10 +51,10 @@ it("should return contacts after they are reassigned", async () => {
     {
       messageStatus: "needsMessage",
       params: {
-        assignmentId
+        assignmentId: assignmentId.toString()
       }
     },
-    testContacts.map(e => e.id),
+    testContacts.map(e => e.id.toString()),
     false
   );
 
@@ -78,10 +78,10 @@ it("should return contacts after they are reassigned", async () => {
     {
       messageStatus: "needsMessage",
       params: {
-        assignmentId: newAssignmentId
+        assignmentId: newAssignmentId.toString()
       }
     },
-    testContacts.map(e => e.id),
+    testContacts.map(e => e.id.toString()),
     false
   );
 
diff --git a/__test__/server/texter.test/texter.test.js b/__test__/server/texter.test/texter.test.js
index 09f362f17..ad8f19cf4 100644
--- a/__test__/server/texter.test/texter.test.js
+++ b/__test__/server/texter.test/texter.test.js
@@ -31,6 +31,19 @@ const getContactsQuery = texterTodoOps.queries.contactData.query;
 const getContactsVars = props =>
   texterTodoOps.queries.contactData.options(props).variables;
 
+function getIndexOfMinId(returnValue) {
+  const { index: indexOfMinId } = returnValue.data.getAssignmentContacts.reduce(
+    ({ index, id }, currentValue, currentIndex) => {
+      if (parseInt(id, 10) > parseInt(currentValue.id, 10)) {
+        return { index: currentIndex, id: currentValue.id };
+      }
+      return { index, id };
+    },
+    { index: Number.MAX_SAFE_INTEGER, id: Number.MAX_SAFE_INTEGER }
+  );
+  return indexOfMinId;
+}
+
 /*
 * NOTE:
 * beforeEach and afterEach are defined in ./common and are run before the tests in the
@@ -42,7 +55,7 @@ it("should send an initial message to test contacts", async () => {
   const organizationId = testOrganization.data.createOrganization.id;
   const texterTodoProps = {
     messageStatus: "needsMessage",
-    params: { assignmentId, organizationId },
+    params: { assignmentId: assignmentId.toString(), organizationId },
     location: { query: {} }
   };
 
@@ -59,13 +72,13 @@ it("should send an initial message to test contacts", async () => {
   );
 
   const ret2 = await runGql(getAssignmentContacts, assignVars, testTexterUser);
-  const contact = ret2.data.getAssignmentContacts[0];
+  const contact = ret2.data.getAssignmentContacts[getIndexOfMinId(ret2)];
 
   const message = {
     contactNumber: contact.cell,
-    userId: testTexterUser.id,
+    userId: testTexterUser.id.toString(),
     text: "test text",
-    assignmentId
+    assignmentId: assignmentId.toString()
   };
 
   const [messageMutation, messageVars] = sendMessageMutAndVars(
@@ -108,14 +121,16 @@ it("should send an initial message to test contacts", async () => {
 
   // Refetch the contacts via gql to check the caching
   const ret3 = await runGql(getAssignmentContacts, assignVars, testTexterUser);
-  expect(ret3.data.getAssignmentContacts[0].messageStatus).toEqual("messaged");
+  expect(
+    ret3.data.getAssignmentContacts[getIndexOfMinId(ret3)].messageStatus
+  ).toEqual("messaged");
 });
 
 it("should be able to receive a response and reply (using fakeService)", async () => {
   const organizationId = testOrganization.data.createOrganization.id;
   const texterTodoProps = {
     messageStatus: "needsMessage",
-    params: { assignmentId, organizationId },
+    params: { assignmentId: assignmentId.toString(), organizationId },
     location: { query: {} }
   };
 
@@ -132,13 +147,13 @@ it("should be able to receive a response and reply (using fakeService)", async (
   );
 
   const ret2 = await runGql(getAssignmentContacts, assignVars, testTexterUser);
-  const contact = ret2.data.getAssignmentContacts[0];
+  const contact = ret2.data.getAssignmentContacts[getIndexOfMinId(ret2)];
 
   const message = {
     contactNumber: contact.cell,
-    userId: testTexterUser.id,
+    userId: testTexterUser.id.toString(),
     text: "test text autorespond",
-    assignmentId
+    assignmentId: assignmentId.toString()
   };
 
   const [messageMutation, messageVars] = sendMessageMutAndVars(
@@ -150,7 +165,7 @@ it("should be able to receive a response and reply (using fakeService)", async (
 
   // wait for fakeservice to autorespond
   await waitForExpect(async () => {
-    const dbMessage = await r.knex("message");
+    const dbMessage = await r.knex("message").orderBy("created_at");
     expect(dbMessage.length).toEqual(2);
     expect(dbMessage[1]).toEqual(
       expect.objectContaining({
@@ -171,16 +186,16 @@ it("should be able to receive a response and reply (using fakeService)", async (
 
   // Refetch the contacts via gql to check the caching
   const ret3 = await runGql(getAssignmentContacts, assignVars, testTexterUser);
-  expect(ret3.data.getAssignmentContacts[0].messageStatus).toEqual(
-    "needsResponse"
-  );
+  expect(
+    ret3.data.getAssignmentContacts[getIndexOfMinId(ret3)].messageStatus
+  ).toEqual("needsResponse");
 
   // Then we reply
   const message2 = {
     contactNumber: contact.cell,
-    userId: testTexterUser.id,
+    userId: testTexterUser.id.toString(),
     text: "reply",
-    assignmentId
+    assignmentId: assignmentId.toString()
   };
 
   const [replyMutation, replyVars] = sendMessageMutAndVars(
@@ -192,7 +207,7 @@ it("should be able to receive a response and reply (using fakeService)", async (
 
   // wait for fakeservice to mark the message as sent
   await waitForExpect(async () => {
-    const dbMessage = await r.knex("message");
+    const dbMessage = await r.knex("message").orderBy("created_at");
     expect(dbMessage.length).toEqual(3);
     expect(dbMessage[2]).toEqual(
       expect.objectContaining({
@@ -205,5 +220,7 @@ it("should be able to receive a response and reply (using fakeService)", async (
 
   // Refetch the contacts via gql to check the caching
   const ret4 = await runGql(getAssignmentContacts, assignVars, testTexterUser);
-  expect(ret4.data.getAssignmentContacts[0].messageStatus).toEqual("convo");
+  expect(
+    ret4.data.getAssignmentContacts[getIndexOfMinId(ret4)].messageStatus
+  ).toEqual("convo");
 });
diff --git a/__test__/test_helpers.js b/__test__/test_helpers.js
index 377a92a8b..058762cd2 100644
--- a/__test__/test_helpers.js
+++ b/__test__/test_helpers.js
@@ -1,15 +1,16 @@
-import _ from "lodash";
+import { makeExecutableSchema } from "@graphql-tools/schema";
+import { graphql } from "graphql";
+import apiSchema from "../src/api/schema";
+import { resolvers } from "../src/server/api/schema";
 import {
+  CampaignContact,
+  User,
   cacheableData,
   createLoaders,
   createTables,
   dropTables,
-  User,
-  CampaignContact,
   r
-} from "../src/server/models/";
-import { graphql } from "graphql";
-import gql from "graphql-tag";
+} from "../src/server/models";
 
 // Cypress integration tests do not use jest but do use these helpers
 // They would benefit from mocking mail services, though, so something to look in to.
@@ -69,7 +70,7 @@ export async function createContacts(campaign, count = 1) {
   const campaignId = campaign.id;
   const contacts = [];
   const startNum = "+15155500000";
-  for (let i = 0; i < count; i++) {
+  for (let i = 0; i < count; i += 1) {
     const contact = new CampaignContact({
       first_name: `Ann${i}`,
       last_name: `Lewis${i}`,
@@ -77,18 +78,18 @@ export async function createContacts(campaign, count = 1) {
       zip: "12345",
       campaign_id: campaignId
     });
+
+    // await in loop to avoid making too many database connections
+    // eslint-disable-next-line no-await-in-loop
     await contact.save();
+
     contacts.push(contact);
   }
   return contacts;
 }
 
-import { makeExecutableSchema } from "graphql-tools";
-import { resolvers } from "../src/server/api/schema";
-import { schema } from "../src/api/schema";
-
-const mySchema = makeExecutableSchema({
-  typeDefs: schema,
+const schema = makeExecutableSchema({
+  typeDefs: apiSchema,
   resolvers,
   allowUndefinedInResolve: true
 });
@@ -101,18 +102,18 @@ function getGqlOperationText(op) {
 }
 
 export async function runGql(operation, vars, user) {
-  const operationText = getGqlOperationText(operation) || operation;
+  const source = getGqlOperationText(operation) || operation;
   const rootValue = {};
-  const context = getContext({ user });
-  const result = await graphql(
-    mySchema,
-    operationText,
+  const contextValue = getContext({ user });
+  const result = await graphql({
+    schema,
+    source,
     rootValue,
-    context,
-    vars
-  );
+    contextValue,
+    variableValues: vars
+  });
   if (result && result.errors) {
-    console.log("runGql failed " + JSON.stringify(result));
+    console.log(`runGql failed ${JSON.stringify(result)}`);
   }
   return result;
 }
@@ -123,15 +124,21 @@ export const updateUserRoles = async (
   userId,
   roles
 ) => {
-  const query = `mutation editOrganizationRoles(
-      $organizationId: String!,
-      $userId: String!,
-      $roles: [String]) {
-    editOrganizationRoles(userId: $userId, organizationId: $organizationId, roles: $roles) {
-      id
+  const query = `
+    mutation editOrganizationRoles(
+      $organizationId: String!
+      $userId: String!
+      $roles: [String]
+    ) {
+      editOrganizationRoles(
+        userId: $userId
+        organizationId: $organizationId
+        roles: $roles
+      ) {
+        id
+      }
     }
-  }`;
-
+  `;
   const variables = {
     organizationId,
     userId,
@@ -139,51 +146,67 @@ export const updateUserRoles = async (
   };
   const result = await runGql(query, variables, adminUser);
   if (result && result.errors) {
-    throw new Error("editOrganizationRoles failed " + JSON.stringify(result));
+    throw new Error(`editOrganizationRoles failed ${JSON.stringify(result)}`);
   }
   return result;
 };
 
 export async function createInvite() {
   const rootValue = {};
-  const inviteQuery = `mutation {
-    createInvite(invite: {is_valid: true}) {
-      id
+  const source = `
+    mutation {
+      createInvite(invite: { is_valid: true }) {
+        id
+      }
     }
-  }`;
-  const context = getContext();
-  return await graphql(mySchema, inviteQuery, rootValue, context);
+  `;
+  const contextValue = getContext();
+  return await graphql({
+    schema,
+    source,
+    rootValue,
+    contextValue
+  });
 }
 
 export async function createOrganization(user, invite) {
   const rootValue = {};
   const name = "Testy test organization";
   const userId = user.id;
+
   const inviteId = invite.data.createInvite.id;
 
-  const context = getContext({ user });
+  const contextValue = getContext({ user });
 
-  const orgQuery = `mutation createOrganization($name: String!, $userId: String!, $inviteId: String!) {
-    createOrganization(name: $name, userId: $userId, inviteId: $inviteId) {
-      id
-      uuid
+  const source = `
+    mutation createOrganization(
+      $name: String!
+      $userId: String!
+      $inviteId: String!
+    ) {
+      createOrganization(name: $name, userId: $userId, inviteId: $inviteId) {
+        id
+        uuid
+      }
     }
-  }`;
+  `;
 
-  const variables = {
-    userId,
+  const variableValues = {
+    userId: userId.toString(),
     name,
     inviteId
   };
-  const result = await graphql(
-    mySchema,
-    orgQuery,
+
+  const result = await graphql({
+    schema,
+    source,
     rootValue,
-    context,
-    variables
-  );
+    contextValue,
+    variableValues
+  });
+
   if (result && result.errors) {
-    throw new Error("createOrganization failed " + JSON.stringify(result));
+    throw new Error(`createOrganization failed ${JSON.stringify(result)}`);
   }
   return result;
 }
@@ -238,9 +261,9 @@ export async function setTwilioAuth(user, organization) {
   const twilioMessageServiceSid = "test_message_service";
   const orgId = organization.data.createOrganization.id;
 
-  const context = getContext({ user });
+  const contextValue = getContext({ user });
 
-  const query = `
+  const source = `
     mutation updateServiceVendorConfig(
       $organizationId: String!
       $serviceName: String!
@@ -263,15 +286,21 @@ export async function setTwilioAuth(user, organization) {
     twilioMessageServiceSid
   };
 
-  const variables = {
+  const variableValues = {
     organizationId: orgId,
     serviceName: "twilio",
     config: JSON.stringify(twilioConfig)
   };
 
-  const result = await graphql(mySchema, query, rootValue, context, variables);
+  const result = await graphql({
+    schema,
+    source,
+    rootValue,
+    contextValue,
+    variableValues
+  });
   if (result && result.errors) {
-    console.log("updateServiceVendorConfig failed " + JSON.stringify(result));
+    console.log(`updateServiceVendorConfig failed ${JSON.stringify(result)}`);
   }
   return result;
 }
@@ -285,14 +314,16 @@ export async function createCampaign(
   const rootValue = {};
   const description = "test description";
   const organizationId = organization.data.createOrganization.id;
-  const context = getContext({ user });
+  const contextValue = getContext({ user });
 
-  const campaignQuery = `mutation createCampaign($input: CampaignInput!) {
-    createCampaign(campaign: $input) {
-      id
+  const source = `
+    mutation createCampaign($input: CampaignInput!) {
+      createCampaign(campaign: $input) {
+        id
+      }
     }
-  }`;
-  const variables = {
+  `;
+  const variableValues = {
     input: {
       title,
       description,
@@ -300,15 +331,15 @@ export async function createCampaign(
       ...args
     }
   };
-  const result = await graphql(
-    mySchema,
-    campaignQuery,
+  const result = await graphql({
+    schema,
+    source,
     rootValue,
-    context,
-    variables
-  );
+    contextValue,
+    variableValues
+  });
   if (result.errors) {
-    throw new Error("Create campaign failed " + JSON.stringify(result));
+    throw new Error(`Create campaign failed ${JSON.stringify(result)}`);
   }
   return result.data.createCampaign;
 }
@@ -322,19 +353,20 @@ export async function saveCampaign(
 ) {
   const rootValue = {};
   const description = "test description";
-  const organizationId = campaign.organizationId;
+  const { organizationId } = campaign;
   const campaignId = campaign.id;
-  const context = getContext({ user });
+  const contextValue = getContext({ user });
 
-  const campaignQuery = `mutation editCampaign($campaignId: String!, $campaign: CampaignInput!) {
-    editCampaign(id: $campaignId, campaign: $campaign) {
-      id
-      title
-      useOwnMessagingService
+  const source = `
+    mutation editCampaign($campaignId: String!, $campaign: CampaignInput!) {
+      editCampaign(id: $campaignId, campaign: $campaign) {
+        id
+        title
+        useOwnMessagingService
+      }
     }
-  }`;
-
-  const variables = {
+  `;
+  const variableValues = {
     campaign: {
       title,
       description,
@@ -342,18 +374,19 @@ export async function saveCampaign(
     },
     campaignId
   };
-  const result = await graphql(
-    mySchema,
-    campaignQuery,
+  const result = await graphql({
+    schema,
+    source,
     rootValue,
-    context,
-    variables
-  );
+    contextValue,
+    variableValues
+  });
   if (result.errors) {
-    throw new Error("Create campaign failed " + JSON.stringify(result));
+    throw new Error(`Create campaign failed ${JSON.stringify(result)}`);
   }
   if (useOwnMessagingService !== "false" || inventoryPhoneNumberCounts) {
-    const serviceManagerQuery = `mutation updateServiceManager(
+    const serviceManagerQuery = `
+      mutation updateServiceManager(
         $organizationId: String!
         $campaignId: String!
         $serviceManagerName: String!
@@ -365,28 +398,31 @@ export async function saveCampaign(
           serviceManagerName: $serviceManagerName
           updateData: $updateData
         ) {
-        id
-        name
-        data
-        fullyConfigured
+          id
+          name
+          data
+          fullyConfigured
+        }
       }
-    }`;
-    const managerResult = await graphql(
-      mySchema,
-      serviceManagerQuery,
+    `;
+
+    const serviceManagerVariableValues = {
+      organizationId,
+      serviceManagerName: "per-campaign-messageservices",
+      updateData: {
+        useOwnMessagingService,
+        inventoryPhoneNumberCounts
+      },
+      campaignId
+    };
+    const managerResult = await graphql({
+      schema,
+      source: serviceManagerQuery,
       rootValue,
-      context,
-      {
-        organizationId,
-        serviceManagerName: "per-campaign-messageservices",
-        updateData: {
-          useOwnMessagingService,
-          inventoryPhoneNumberCounts
-        },
-        campaignId
-      }
-    );
-    console.log("managerResult", JSON.stringify(managerResult));
+      contextValue,
+      variableValues: serviceManagerVariableValues
+    });
+    console.log(`managerResult ${JSON.stringify(managerResult)}`);
   }
 
   return result.data.editCampaign;
@@ -394,13 +430,21 @@ export async function saveCampaign(
 
 export async function copyCampaign(campaignId, user) {
   const rootValue = {};
-  const query = `mutation copyCampaign($campaignId: String!) {
-    copyCampaign(id: $campaignId) {
-      id
+  const source = `
+    mutation copyCampaign($campaignId: String!) {
+      copyCampaign(id: $campaignId) {
+        id
+      }
     }
-  }`;
-  const context = getContext({ user });
-  return await graphql(mySchema, query, rootValue, context, { campaignId });
+  `;
+  const contextValue = getContext({ user });
+  return await graphql({
+    schema,
+    source,
+    rootValue,
+    contextValue,
+    variableValues: { campaignId }
+  });
 }
 
 export async function createTexter(organization, userInfo = {}) {
@@ -418,27 +462,28 @@ export async function createTexter(organization, userInfo = {}) {
     "TEXTER"
   );
   if (user.errors) {
-    throw new Error("createUsers failed " + JSON.stringify(user));
+    throw new Error(`createUsers failed ${JSON.stringify(user)}`);
   }
-  const joinQuery = `
-  mutation joinOrganization($organizationUuid: String!) {
-    joinOrganization(organizationUuid: $organizationUuid) {
-      id
+  const source = `
+    mutation joinOrganization($organizationUuid: String!) {
+      joinOrganization(organizationUuid: $organizationUuid) {
+        id
+      }
     }
-  }`;
-  const variables = {
+  `;
+  const variableValues = {
     organizationUuid: organization.data.createOrganization.uuid
   };
-  const context = getContext({ user });
-  const result = await graphql(
-    mySchema,
-    joinQuery,
+  const contextValue = getContext({ user });
+  const result = await graphql({
+    schema,
+    source,
     rootValue,
-    context,
-    variables
-  );
+    contextValue,
+    variableValues
+  });
   if (result.errors) {
-    throw new Error("joinOrganization failed " + JSON.stringify(result));
+    throw new Error(`joinOrganization failed ${JSON.stringify(result)}`);
   }
   return user;
 }
@@ -450,65 +495,73 @@ export async function assignTexter(admin, user, campaign, assignments) {
   // contactsCount: (messagedCount from texter) + needsMessageCount (above)
   // If a userId has an existing assignment, then, also include `contactsCount: <current>`
   const rootValue = {};
-  const campaignEditQuery = `
-  mutation editCampaign($campaignId: String!, $campaign: CampaignInput!) {
-    editCampaign(id: $campaignId, campaign: $campaign) {
-      id
-      assignments {
+  const source = `
+    mutation editCampaign($campaignId: String!, $campaign: CampaignInput!) {
+      editCampaign(id: $campaignId, campaign: $campaign) {
         id
+        assignments {
+          id
+        }
       }
     }
-  }`;
-  const context = getContext({ user: admin });
+  `;
+  const contextValue = getContext({ user: admin });
   const updateCampaign = Object.assign({}, campaign);
   const campaignId = updateCampaign.id;
   updateCampaign.texters = assignments || [
     {
-      id: user.id
+      id: user.id.toString()
     }
   ];
   delete updateCampaign.id;
   delete updateCampaign.contacts;
-  const variables = {
+  const variableValues = {
     campaignId,
     campaign: updateCampaign
   };
-  const result = await graphql(
-    mySchema,
-    campaignEditQuery,
+  const result = await graphql({
+    schema,
+    source,
     rootValue,
-    context,
-    variables
-  );
+    contextValue,
+    variableValues
+  });
   if (result.errors) {
-    throw new Error("assignTexter failed " + JSON.stringify(result));
+    throw new Error(`assignTexter failed ${JSON.stringify(result)}`);
   }
   return result;
 }
 
 export async function sendMessage(campaignContactId, user, message) {
   const rootValue = {};
-  const query = `
+  const source = `
     mutation sendMessage($message: MessageInput!, $campaignContactId: String!) {
-        sendMessage(message: $message, campaignContactId: $campaignContactId) {
+      sendMessage(message: $message, campaignContactId: $campaignContactId) {
+        id
+        messageStatus
+        messages {
           id
-          messageStatus
-          messages {
-            id
-            createdAt
-            text
-            isFromContact
-          }
+          createdAt
+          text
+          isFromContact
         }
-      }`;
-  const context = getContext({ user });
-  const variables = {
+      }
+    }
+  `;
+  const contextValue = getContext({ user });
+  const variableValues = {
     message,
     campaignContactId
   };
-  const result = await graphql(mySchema, query, rootValue, context, variables);
+  const result = await graphql({
+    schema,
+    source,
+    rootValue,
+    contextValue,
+    variableValues
+  });
   if (result.errors) {
-    console.log("sendMessage errors", result);
+    console.log(`sendMessage errors ${JSON.stringify(result)}`);
   }
   return result;
 }
@@ -547,7 +600,7 @@ export function buildScript(steps = 2, choices = 1) {
       return [];
     }
     const rv = [makeStep(step, max)];
-    for (let i = 1; i < choices; i++) {
+    for (let i = 1; i < choices; i += 1) {
       rv.push(makeStep(step, max, i));
     }
     return rv;
@@ -561,7 +614,7 @@ export async function createScript(
   { interactionSteps, steps = 2, choices = 1, campaignGqlFragment } = {}
 ) {
   const rootValue = {};
-  const campaignEditQuery = `
+  const source = `
   mutation editCampaign($campaignId: String!, $campaign: CampaignInput!) {
     editCampaign(id: $campaignId, campaign: $campaign) {
       ${campaignGqlFragment || "id"}
@@ -574,76 +627,80 @@ export async function createScript(
     builtInteractionSteps = buildScript(steps, choices);
   }
 
-  const context = getContext({ user: admin });
-  const campaignId = campaign.id;
-  const variables = {
+  const contextValue = getContext({ user: admin });
+  const campaignId = campaign.id.toString();
+  const variableValues = {
     campaignId,
     campaign: {
       interactionSteps: interactionSteps || builtInteractionSteps[0]
     }
   };
-  return await graphql(
-    mySchema,
-    campaignEditQuery,
+
+  return await graphql({
+    schema,
+    source,
     rootValue,
-    context,
-    variables
-  );
+    contextValue,
+    variableValues
+  });
 }
 
 export async function createCannedResponses(admin, campaign, cannedResponses) {
   // cannedResponses: {title, text}
   const rootValue = {};
-  const campaignEditQuery = `
-  mutation editCampaign($campaignId: String!, $campaign: CampaignInput!) {
-    editCampaign(id: $campaignId, campaign: $campaign) {
-      id
+  const source = `
+    mutation editCampaign($campaignId: String!, $campaign: CampaignInput!) {
+      editCampaign(id: $campaignId, campaign: $campaign) {
+        id
+      }
     }
-  }`;
-  const context = getContext({ user: admin });
+  `;
+  const contextValue = getContext({ user: admin });
   const campaignId = campaign.id;
-  const variables = {
+  const variableValues = {
     campaignId,
     campaign: {
       cannedResponses
     }
   };
-  return await graphql(
-    mySchema,
-    campaignEditQuery,
+  return await graphql({
+    schema,
+    source,
     rootValue,
-    context,
-    variables
-  );
+    contextValue,
+    variableValues
+  });
 }
 
 export async function startCampaign(admin, campaign) {
   const rootValue = {};
-  const startCampaignQuery = `mutation startCampaign($campaignId: String!) {
-    startCampaign(id: $campaignId) {
-      id
+  const source = `
+    mutation startCampaign($campaignId: String!) {
+      startCampaign(id: $campaignId) {
+        id
+      }
     }
-  }`;
-  const context = getContext({ user: admin });
-  const variables = { campaignId: campaign.id };
-  return await graphql(
-    mySchema,
-    startCampaignQuery,
+  `;
+  const contextValue = getContext({ user: admin });
+  const variableValues = { campaignId: campaign.id };
+  return await graphql({
+    schema,
+    source,
     rootValue,
-    context,
-    variables
-  );
+    contextValue,
+    variableValues
+  });
 }
 
 export async function getCampaignContact(id) {
-  return await r
+  return r
     .knex("campaign_contact")
     .where({ id })
     .first();
 }
 
 export async function getOptOut(assignmentId, cell) {
-  return await r
+  return r
     .knex("opt_out")
     .where({
       cell,
@@ -819,7 +876,7 @@ export const runComponentQueries = async (queries, user, ownProps) => {
   const resolvedPromises = await Promise.all(promises);
 
   const queryResults = {};
-  for (let i = 0; i < keys.length; i++) {
+  for (let i = 0; i < keys.length; i += 1) {
     const dataKey = Object.keys(resolvedPromises[i].data)[0];
     const key = keys[i];
     queryResults[key] = {
diff --git a/__test__/workers/assign-texters.test.js b/__test__/workers/assign-texters.test.js
index 9a72f5e60..a30724997 100644
--- a/__test__/workers/assign-texters.test.js
+++ b/__test__/workers/assign-texters.test.js
@@ -5,20 +5,13 @@ import {
   CampaignContact,
   JobRequest,
   Organization,
-  User,
-  ZipCode
+  User
 } from "../../src/server/models";
 import { setupTest, cleanupTest } from "../test_helpers";
 
 describe("test texter assignment in dynamic mode", () => {
-  beforeAll(
-    async () => await setupTest(),
-    global.DATABASE_SETUP_TEARDOWN_TIMEOUT
-  );
-  afterAll(
-    async () => await cleanupTest(),
-    global.DATABASE_SETUP_TEARDOWN_TIMEOUT
-  );
+  beforeAll(async () => setupTest(), global.DATABASE_SETUP_TEARDOWN_TIMEOUT);
+  afterAll(async () => cleanupTest(), global.DATABASE_SETUP_TEARDOWN_TIMEOUT);
 
   const testOrg = new Organization({
     id: "7777777",
@@ -62,10 +55,10 @@ describe("test texter assignment in dynamic mode", () => {
   ];
 
   it("assigns no contacts to texters in dynamic assignment mode", async () => {
-    const organization = await Organization.save(testOrg);
+    await Organization.save(testOrg);
     const campaign = await Campaign.save(testCampaign);
-    contactInfo.map(contact => {
-      CampaignContact.save({ cell: contact, campaign_id: campaign.id });
+    contactInfo.map(async contact => {
+      await CampaignContact.save({ cell: contact, campaign_id: campaign.id });
     });
     texterInfo.map(async texter => {
       await User.save({
@@ -81,7 +74,7 @@ describe("test texter assignment in dynamic mode", () => {
       '{"id": "3","texters":[{"id":"1","needsMessageCount":5,"maxContacts":"","contactsCount":0},{"id":"2","needsMessageCount":5,"maxContacts":"0","contactsCount":0}]}';
     const job = new JobRequest({
       campaign_id: testCampaign.id,
-      payload: payload,
+      payload,
       queue_name: "3:edit_campaign",
       job_type: "assign_texters"
     });
@@ -104,8 +97,8 @@ describe("test texter assignment in dynamic mode", () => {
       .knex("assignment")
       .where({ campaign_id: testCampaign.id, user_id: 1 })
       .select("max_contacts");
-    const maxContactsZero = zero[0]["max_contacts"];
-    const maxContactsBlank = blank[0]["max_contacts"];
+    const maxContactsZero = zero[0].max_contacts;
+    const maxContactsBlank = blank[0].max_contacts;
     expect(maxContactsZero).toEqual(0);
     expect(maxContactsBlank).toEqual(null);
   });
@@ -115,7 +108,7 @@ describe("test texter assignment in dynamic mode", () => {
       '{"id": "3","texters":[{"id":"1","needsMessageCount":0,"maxContacts":"10","contactsCount":0},{"id":"2","needsMessageCount":5,"maxContacts":"15","contactsCount":0}]}';
     const job = new JobRequest({
       campaign_id: testCampaign.id,
-      payload: payload,
+      payload,
       queue_name: "4:edit_campaign",
       job_type: "assign_texters"
     });
@@ -128,8 +121,8 @@ describe("test texter assignment in dynamic mode", () => {
       .knex("assignment")
       .where({ campaign_id: testCampaign.id, user_id: "2" })
       .select("max_contacts");
-    const maxContactsTen = ten[0]["max_contacts"];
-    const maxContactsFifteen = fifteen[0]["max_contacts"];
+    const maxContactsTen = ten[0].max_contacts;
+    const maxContactsFifteen = fifteen[0].max_contacts;
     expect(maxContactsTen).toEqual(10);
     expect(maxContactsFifteen).toEqual(15);
   });
diff --git a/package.json b/package.json
index 480488034..262f800af 100644
--- a/package.json
+++ b/package.json
@@ -95,13 +95,8 @@
     "@date-io/date-fns": "^1.3.13",
     "@trt2/gsm-charset-utils": "^1.0.13",
     "aphrodite": "^2.3.1",
-    "apollo-cache-inmemory": "^1.6.6",
-    "apollo-client": "^2.6.10",
-    "apollo-link": "^1.2.14",
-    "apollo-link-error": "^1.1.13",
-    "apollo-link-http": "^1.5.17",
-    "apollo-server-express": "^1.2.0",
-    "apollo-utilities": "^1.3.4",
+    "@apollo/client": "^3.8.8",
+    "@apollo/server": "^4.9.5",
     "auth0-js": "^9.14.3",
     "aws-serverless-express": "^3.3.6",
     "babel-loader": "^9.1.0",
@@ -112,17 +107,17 @@
     "camelcase-keys": "^4.1.0",
     "color-difference": "^0.3.4",
     "cookie-session": "^2.0.0-alpha.1",
+    "cors": "^2.8.5",
     "dataloader": "^1.2.0",
     "dotenv": "^2.0.0",
     "express": "^4.14.0",
     "fs": "^0.0.2",
     "google-libphonenumber": "^3.0.0",
     "googleapis": "^39.2.0",
-    "graphql": "^0.13.2",
+    "graphql": "^16.8.1",
     "graphql-date": "^1.0.3",
-    "graphql-tag": "^2.10.3",
-    "graphql-tools": "^2.8.0",
-    "graphql-type-json": "^0.1.4",
+    "@graphql-tools/schema": "^10.0.2",
+    "graphql-type-json": "^0.3.2",
     "heroku-ssl-redirect": "^0.1.1",
     "humps": "^1.1.0",
     "is-url": "^1.2.2",
@@ -222,7 +217,6 @@
     "draft-js": "^0.11.7",
     "material-ui-search-bar": "^1.0.0",
     "mui-datatables": "^3.7.7",
-    "react-apollo": "2.5.7",
     "react-async-script": "^0.6.0",
     "react-chartjs-2": "^2.11.1",
     "react-color": "^2.19.3",
diff --git a/src/api/campaign.js b/src/api/campaign.js
index 4a70ea5d1..58fcf97eb 100644
--- a/src/api/campaign.js
+++ b/src/api/campaign.js
@@ -1,4 +1,4 @@
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 // TODO: rename phoneNumbers to messagingServiceNumbers or something like that
 export const schema = gql`
diff --git a/src/api/organization.js b/src/api/organization.js
index d7356bc44..a7aadb3f8 100644
--- a/src/api/organization.js
+++ b/src/api/organization.js
@@ -1,4 +1,4 @@
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 export const schema = gql`
   type ActionChoice {
diff --git a/src/api/schema.js b/src/api/schema.js
index b68f58796..073c2e12e 100644
--- a/src/api/schema.js
+++ b/src/api/schema.js
@@ -1,4 +1,4 @@
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 import { schema as userSchema } from "./user";
 import { schema as conversationSchema } from "./conversations";
@@ -176,6 +176,12 @@ const rootSchema = gql`
     value: String
   }
 
+  type Action {
+    name: String
+    displayName: String
+    instructions: String
+  }
+
   type FoundContact {
     found: Boolean
     assignment: Assignment
@@ -410,7 +416,7 @@ const rootSchema = gql`
   }
 `;
 
-export const schema = [
+export default [
   rootSchema,
   userSchema,
   "scalar Date",
diff --git a/src/api/service.js b/src/api/service.js
index e049f22b2..10badd1b6 100644
--- a/src/api/service.js
+++ b/src/api/service.js
@@ -1,4 +1,4 @@
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 export const schema = gql`
   type ServiceVendor {
diff --git a/src/api/tag.js b/src/api/tag.js
index b23b820d8..efebf9b19 100644
--- a/src/api/tag.js
+++ b/src/api/tag.js
@@ -1,4 +1,4 @@
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 export const schema = gql`
   type Tag {
diff --git a/src/api/user.js b/src/api/user.js
index 4e29d96c2..96607a491 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -1,4 +1,6 @@
-export const schema = `
+import { gql } from "@apollo/client";
+
+export const schema = gql`
   type User {
     id: ID
     firstName: String
diff --git a/src/client/index.jsx b/src/client/index.jsx
index c6da70859..a2a264ba7 100644
--- a/src/client/index.jsx
+++ b/src/client/index.jsx
@@ -4,7 +4,7 @@ import { Router, browserHistory } from "react-router";
 import { StyleSheet } from "aphrodite";
 import errorCatcher from "./error-catcher";
 import makeRoutes from "../routes";
-import { ApolloProvider } from "react-apollo";
+import { ApolloProvider } from "@apollo/client";
 import ApolloClientSingleton from "../network/apollo-client-singleton";
 import { login, logout } from "./auth-service";
 
diff --git a/src/components/AdminDashboard.jsx b/src/components/AdminDashboard.jsx
index 4b0fe57ea..1ac44317a 100644
--- a/src/components/AdminDashboard.jsx
+++ b/src/components/AdminDashboard.jsx
@@ -4,7 +4,7 @@ import { StyleSheet, css } from "aphrodite";
 import theme from "../styles/theme";
 import { hasRole } from "../lib";
 import TopNav from "./TopNav";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { withRouter } from "react-router";
 import loadData from "../containers/hoc/load-data";
 import AdminNavigation from "../containers/AdminNavigation";
diff --git a/src/components/App.jsx b/src/components/App.jsx
index 80b3c6e47..3b84fca86 100644
--- a/src/components/App.jsx
+++ b/src/components/App.jsx
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React, { useState } from "react";
 import { ThemeProvider } from "@material-ui/core/styles";
-import { createMuiTheme } from "@material-ui/core/styles";
+import { createTheme } from "@material-ui/core/styles";
 import CssBaseline from "@material-ui/core/CssBaseline";
 
 import { defaultTheme } from "../styles/mui-theme";
@@ -21,10 +21,10 @@ const formatTheme = newTheme => {
 
 const App = ({ children }) => {
   const [theme, setTheme] = useState(defaultTheme);
-  let muiTheme = createMuiTheme(defaultTheme);
+  let muiTheme = createTheme(defaultTheme);
   try {
     // if a bad value is saved this will fail.
-    muiTheme = createMuiTheme(theme);
+    muiTheme = createTheme(theme);
   } catch (e) {
     console.error("failed to create theme", theme);
   }
diff --git a/src/components/AssignmentTexter/Controls.jsx b/src/components/AssignmentTexter/Controls.jsx
index fe47ed1bd..ef751cf49 100644
--- a/src/components/AssignmentTexter/Controls.jsx
+++ b/src/components/AssignmentTexter/Controls.jsx
@@ -2,6 +2,7 @@ import PropTypes from "prop-types";
 import React from "react";
 import { css } from "aphrodite";
 import { compose } from "recompose";
+import cloneDeep from "lodash/cloneDeep";
 import Toolbar from "./Toolbar";
 import MessageList from "./MessageList";
 import Survey from "./Survey";
@@ -125,7 +126,9 @@ export class AssignmentTexterContactControls extends React.Component {
     let currentInteractionStep = null;
 
     if (availableSteps.length > 0) {
-      currentInteractionStep = availableSteps[availableSteps.length - 1];
+      currentInteractionStep = cloneDeep(
+        availableSteps[availableSteps.length - 1]
+      );
       currentInteractionStep.question.filteredAnswerOptions =
         currentInteractionStep.question.answerOptions;
     }
@@ -509,8 +512,8 @@ export class AssignmentTexterContactControls extends React.Component {
 
     const otherResponsesLink =
       currentInteractionStep &&
-        currentInteractionStep.question.filteredAnswerOptions.length > 6 &&
-        filteredCannedResponses.length ? (
+      currentInteractionStep.question.filteredAnswerOptions.length > 6 &&
+      filteredCannedResponses.length ? (
         <div className={css(flexStyles.popoverLink)} key={"otherresponses"}>
           <a
             href="#otherresponses"
@@ -523,8 +526,8 @@ export class AssignmentTexterContactControls extends React.Component {
 
     const searchBar = currentInteractionStep &&
       currentInteractionStep.question.answerOptions.length +
-      campaign.cannedResponses.length >
-      5 && (
+        campaign.cannedResponses.length >
+        5 && (
         <SearchBar
           onRequestSearch={this.handleSearchChange}
           onChange={this.handleSearchChange}
@@ -662,12 +665,12 @@ export class AssignmentTexterContactControls extends React.Component {
                   margin: "9px",
                   color:
                     this.state.optOutMessageText ===
-                      this.props.campaign.organization.optOutMessage
+                    this.props.campaign.organization.optOutMessage
                       ? "white"
                       : "#494949",
                   backgroundColor:
                     this.state.optOutMessageText ===
-                      this.props.campaign.organization.optOutMessage
+                    this.props.campaign.organization.optOutMessage
                       ? "#727272"
                       : "white"
                 }}
@@ -880,9 +883,9 @@ export class AssignmentTexterContactControls extends React.Component {
       shortCannedResponses = shortCannedResponses.filter(script => {
         var textLength = global.HIDE_BRANCHED_SCRIPTS
           ? this.getShortButtonText(
-            script.title,
-            cannedResponseScript ? 40 : 13
-          ).length
+              script.title,
+              cannedResponseScript ? 40 : 13
+            ).length
           : script.title.length;
 
         if (joinedLength + 1 + textLength < 80) {
@@ -966,7 +969,7 @@ export class AssignmentTexterContactControls extends React.Component {
       <div className={css(flexStyles.subButtonsExitButtons)}>
         <Button
           onClick={
-            !disabled ? this.handleOpenAnswerResponsePopover : noAction => { }
+            !disabled ? this.handleOpenAnswerResponsePopover : noAction => {}
           }
           style={{
             backgroundColor: this.props.muiTheme.palette.background.default,
@@ -1198,40 +1201,40 @@ export class AssignmentTexterContactControls extends React.Component {
     const content = firstMessage
       ? this.renderFirstMessage(enabledSideboxes)
       : [
-        this.renderToolbar(enabledSideboxes),
-        <div
-          key="superSectionMessagePage"
-          className={css(flexStyles.superSectionMessagePage)}
-        >
-          {this.state.contactListOpen &&
-            this.renderAssignmentContactsList(
-              this.props.assignment.contacts,
-              this.props.contact,
-              this.props.updateCurrentContactById
-            )}
-          <div className={css(flexStyles.superSectionMessageListAndControls)}>
-            <ContactToolbar
-              campaignContact={this.props.contact}
-              campaign={this.props.campaign}
-              navigationToolbarChildren={this.props.navigationToolbarChildren}
-              toggleContactList={this.toggleContactList}
-            />
-            {this.renderMessageBox(
-              <MessageList
-                contact={this.props.contact}
-                currentUser={this.props.currentUser}
-                messages={this.props.contact.messages}
-                organizationId={this.props.organizationId}
-                review={this.props.review}
-                styles={messageListStyles}
-                hideMedia={this.state.hideMedia}
-              />,
-              enabledSideboxes
-            )}
-            {this.renderMessageControls(enabledSideboxes)}
+          this.renderToolbar(enabledSideboxes),
+          <div
+            key="superSectionMessagePage"
+            className={css(flexStyles.superSectionMessagePage)}
+          >
+            {this.state.contactListOpen &&
+              this.renderAssignmentContactsList(
+                this.props.assignment.contacts,
+                this.props.contact,
+                this.props.updateCurrentContactById
+              )}
+            <div className={css(flexStyles.superSectionMessageListAndControls)}>
+              <ContactToolbar
+                campaignContact={this.props.contact}
+                campaign={this.props.campaign}
+                navigationToolbarChildren={this.props.navigationToolbarChildren}
+                toggleContactList={this.toggleContactList}
+              />
+              {this.renderMessageBox(
+                <MessageList
+                  contact={this.props.contact}
+                  currentUser={this.props.currentUser}
+                  messages={this.props.contact.messages}
+                  organizationId={this.props.organizationId}
+                  review={this.props.review}
+                  styles={messageListStyles}
+                  hideMedia={this.state.hideMedia}
+                />,
+                enabledSideboxes
+              )}
+              {this.renderMessageControls(enabledSideboxes)}
+            </div>
           </div>
-        </div>
-      ];
+        ];
     return (
       <div
         className={css(flexStyles.topContainer)}
diff --git a/src/components/CampaignCannedResponsesForm.jsx b/src/components/CampaignCannedResponsesForm.jsx
index 90b23e9b8..e42238ca6 100644
--- a/src/components/CampaignCannedResponsesForm.jsx
+++ b/src/components/CampaignCannedResponsesForm.jsx
@@ -24,7 +24,7 @@ import theme from "../styles/theme";
 import { StyleSheet, css } from "aphrodite";
 import { dataTest } from "../lib/attributes";
 import loadData from "../containers/hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import TagChips from "./TagChips";
 import { parseCannedResponseCsv } from "../lib/parse_csv";
 
diff --git a/src/components/IncomingMessageList/ConversationPreviewModal.jsx b/src/components/IncomingMessageList/ConversationPreviewModal.jsx
index f3703a8b9..f7297b6e9 100644
--- a/src/components/IncomingMessageList/ConversationPreviewModal.jsx
+++ b/src/components/IncomingMessageList/ConversationPreviewModal.jsx
@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { compose } from "recompose";
 import { StyleSheet, css } from "aphrodite";
 
diff --git a/src/components/IncomingMessageList/MessageResponse.jsx b/src/components/IncomingMessageList/MessageResponse.jsx
index edfbd857c..fd9f4b6b8 100644
--- a/src/components/IncomingMessageList/MessageResponse.jsx
+++ b/src/components/IncomingMessageList/MessageResponse.jsx
@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import PropTypes from "prop-types";
 import Form from "react-formal";
 import * as yup from "yup";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { StyleSheet, css } from "aphrodite";
 
 import Button from "@material-ui/core/Button";
diff --git a/src/components/IncomingMessageList/index.jsx b/src/components/IncomingMessageList/index.jsx
index cea61c634..f4724ad8c 100644
--- a/src/components/IncomingMessageList/index.jsx
+++ b/src/components/IncomingMessageList/index.jsx
@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import type from "prop-types";
 import moment from "moment";
 import { Link as RouterLink, withRouter } from "react-router";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { compose } from "recompose";
 
 import MUIDataTable from "mui-datatables";
diff --git a/src/components/OrganizationWrapper.jsx b/src/components/OrganizationWrapper.jsx
index 6c6c5c4a7..f41e1d5ed 100644
--- a/src/components/OrganizationWrapper.jsx
+++ b/src/components/OrganizationWrapper.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { withRouter } from "react-router";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { compose, lifecycle } from "recompose";
 
 import loadData from "../containers/hoc/load-data";
diff --git a/src/components/Slider.jsx b/src/components/Slider.jsx
index 78efff076..f4c0000c1 100644
--- a/src/components/Slider.jsx
+++ b/src/components/Slider.jsx
@@ -1,6 +1,6 @@
 import type from "prop-types";
 import React from "react";
-import { compose } from "react-apollo";
+import { compose } from "recompose";
 import withMuiTheme from "./../containers/hoc/withMuiTheme";
 
 const Slider = ({ maxValue, value, color, direction, muiTheme }) => {
diff --git a/src/containers/AdminBulkScriptEditor.jsx b/src/containers/AdminBulkScriptEditor.jsx
index bd88cca83..37d98d97c 100644
--- a/src/containers/AdminBulkScriptEditor.jsx
+++ b/src/containers/AdminBulkScriptEditor.jsx
@@ -1,7 +1,7 @@
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import pick from "lodash/pick";
 import React, { Component } from "react";
-import { compose } from "react-apollo";
+import { compose } from "recompose";
 
 import Paper from "@material-ui/core/Paper";
 import Dialog from "@material-ui/core/Dialog";
diff --git a/src/containers/AdminCampaignCopy.jsx b/src/containers/AdminCampaignCopy.jsx
index e7a3fd457..9f654bc9e 100644
--- a/src/containers/AdminCampaignCopy.jsx
+++ b/src/containers/AdminCampaignCopy.jsx
@@ -5,7 +5,7 @@ import Snackbar from "@material-ui/core/Snackbar";
 
 import { withRouter, Link } from "react-router";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { dataTest } from "../lib/attributes";
 import { getButtonProps } from "../components/utils";
 
diff --git a/src/containers/AdminCampaignEdit.jsx b/src/containers/AdminCampaignEdit.jsx
index 5931189b3..26dde2a82 100644
--- a/src/containers/AdminCampaignEdit.jsx
+++ b/src/containers/AdminCampaignEdit.jsx
@@ -1,6 +1,6 @@
 import PropTypes from "prop-types";
 import React from "react";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { Link } from "react-router";
 import { compose } from "recompose";
 
diff --git a/src/containers/AdminCampaignList.jsx b/src/containers/AdminCampaignList.jsx
index 00eeca58a..7f3bd177e 100644
--- a/src/containers/AdminCampaignList.jsx
+++ b/src/containers/AdminCampaignList.jsx
@@ -2,7 +2,7 @@ import PropTypes from "prop-types";
 import React from "react";
 import { StyleSheet, css } from "aphrodite";
 import { withRouter } from "react-router";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 import Fab from "@material-ui/core/Fab";
 import AddIcon from "@material-ui/icons/Add";
diff --git a/src/containers/AdminCampaignMessagingService.jsx b/src/containers/AdminCampaignMessagingService.jsx
index c6562798f..5a4a5f0cf 100644
--- a/src/containers/AdminCampaignMessagingService.jsx
+++ b/src/containers/AdminCampaignMessagingService.jsx
@@ -2,7 +2,7 @@ import PropTypes from "prop-types";
 import React from "react";
 import loadData from "./hoc/load-data";
 import { withRouter } from "react-router";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import theme from "../styles/theme";
 import DisplayLink from "../components/DisplayLink";
 import { StyleSheet, css } from "aphrodite";
diff --git a/src/containers/AdminCampaignStats.jsx b/src/containers/AdminCampaignStats.jsx
index abbdadbc3..7db3bc25a 100644
--- a/src/containers/AdminCampaignStats.jsx
+++ b/src/containers/AdminCampaignStats.jsx
@@ -18,7 +18,7 @@ import AdminCampaignCopy from "./AdminCampaignCopy";
 import { withRouter, Link as RouterLink } from "react-router";
 import { StyleSheet, css } from "aphrodite";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import theme from "../styles/theme";
 import { dataTest } from "../lib/attributes";
 
diff --git a/src/containers/AdminIncomingMessageList.jsx b/src/containers/AdminIncomingMessageList.jsx
index f6a5e0806..49c166f5c 100644
--- a/src/containers/AdminIncomingMessageList.jsx
+++ b/src/containers/AdminIncomingMessageList.jsx
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React, { Component } from "react";
 import _ from "lodash";
-import { compose } from "react-apollo";
+import { compose } from "recompose";
 
 import IncomingMessageActions from "../components/IncomingMessageActions";
 import IncomingMessageFilter, {
@@ -9,7 +9,7 @@ import IncomingMessageFilter, {
 } from "../components/IncomingMessageFilter";
 import IncomingMessageList from "../components/IncomingMessageList";
 import PaginatedCampaignsRetriever from "./PaginatedCampaignsRetriever";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import loadData from "./hoc/load-data";
 import { withRouter } from "react-router";
 import PaginatedUsersRetriever from "./PaginatedUsersRetriever";
diff --git a/src/containers/AdminOrganizationsDashboard.jsx b/src/containers/AdminOrganizationsDashboard.jsx
index a9892728f..fd0dbff23 100644
--- a/src/containers/AdminOrganizationsDashboard.jsx
+++ b/src/containers/AdminOrganizationsDashboard.jsx
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import TopNav from "../components/TopNav";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import loadData from "./hoc/load-data";
 import { withRouter, Link as RouterLink } from "react-router";
 
diff --git a/src/containers/AdminPersonList.jsx b/src/containers/AdminPersonList.jsx
index f66216791..5a786fa79 100644
--- a/src/containers/AdminPersonList.jsx
+++ b/src/containers/AdminPersonList.jsx
@@ -16,7 +16,7 @@ import MenuItem from "@material-ui/core/MenuItem";
 
 import theme from "../styles/theme";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { dataTest } from "../lib/attributes";
 import PeopleList from "../containers/PeopleList";
 import { StyleSheet, css } from "aphrodite";
diff --git a/src/containers/AdminPhoneNumberInventory.js b/src/containers/AdminPhoneNumberInventory.js
index 20547861a..9ba03ccb1 100644
--- a/src/containers/AdminPhoneNumberInventory.js
+++ b/src/containers/AdminPhoneNumberInventory.js
@@ -1,6 +1,6 @@
 import PropTypes from "prop-types";
 import React from "react";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import * as yup from "yup";
 import Form from "react-formal";
 
diff --git a/src/containers/AdminReplySender.jsx b/src/containers/AdminReplySender.jsx
index 04a8d9142..e74ba59f3 100644
--- a/src/containers/AdminReplySender.jsx
+++ b/src/containers/AdminReplySender.jsx
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import { compose } from "recompose";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import Form from "react-formal";
 import * as yup from "yup";
 import { StyleSheet, css } from "aphrodite";
diff --git a/src/containers/AssignmentTexterContact.jsx b/src/containers/AssignmentTexterContact.jsx
index 5f4867a04..2d3a9989b 100644
--- a/src/containers/AssignmentTexterContact.jsx
+++ b/src/containers/AssignmentTexterContact.jsx
@@ -3,7 +3,7 @@ import React from "react";
 import { StyleSheet, css } from "aphrodite";
 import Controls from "../components/AssignmentTexter/Controls";
 import { applyScript } from "../lib/scripts";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import loadData from "./hoc/load-data";
 import * as yup from "yup";
 import BulkSendButton from "../components/AssignmentTexter/BulkSendButton";
diff --git a/src/containers/CreateAdditionalOrganization.jsx b/src/containers/CreateAdditionalOrganization.jsx
index 5b40c8402..4ca9d4e85 100644
--- a/src/containers/CreateAdditionalOrganization.jsx
+++ b/src/containers/CreateAdditionalOrganization.jsx
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import Form from "react-formal";
 import * as yup from "yup";
 import { StyleSheet, css } from "aphrodite";
diff --git a/src/containers/CreateOrganization.jsx b/src/containers/CreateOrganization.jsx
index 0732a02a6..319754d1d 100644
--- a/src/containers/CreateOrganization.jsx
+++ b/src/containers/CreateOrganization.jsx
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import Form from "react-formal";
 import * as yup from "yup";
 import { StyleSheet, css } from "aphrodite";
diff --git a/src/containers/DashboardLoader.jsx b/src/containers/DashboardLoader.jsx
index b53b15bfa..7d7083586 100644
--- a/src/containers/DashboardLoader.jsx
+++ b/src/containers/DashboardLoader.jsx
@@ -1,6 +1,6 @@
 import PropTypes from "prop-types";
 import React from "react";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { withRouter } from "react-router";
 import loadData from "./hoc/load-data";
 
diff --git a/src/containers/Home.jsx b/src/containers/Home.jsx
index 16c997a8e..d21493ae6 100644
--- a/src/containers/Home.jsx
+++ b/src/containers/Home.jsx
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { StyleSheet, css } from "aphrodite";
 import theme from "../styles/theme";
 import { withRouter } from "react-router";
diff --git a/src/containers/JoinTeam.jsx b/src/containers/JoinTeam.jsx
index d7b8ff48a..342fc26e2 100644
--- a/src/containers/JoinTeam.jsx
+++ b/src/containers/JoinTeam.jsx
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { withRouter } from "react-router";
 import { StyleSheet, css } from "aphrodite";
 import theme from "../styles/theme";
diff --git a/src/containers/PaginatedCampaignsRetriever.jsx b/src/containers/PaginatedCampaignsRetriever.jsx
index 5e3c3a1c4..5a6ab0003 100644
--- a/src/containers/PaginatedCampaignsRetriever.jsx
+++ b/src/containers/PaginatedCampaignsRetriever.jsx
@@ -1,6 +1,6 @@
 import { Component } from "react";
 import PropTypes from "prop-types";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import isEqual from "lodash/isEqual";
 
 import apolloClient from "../network/apollo-client-singleton";
diff --git a/src/containers/PaginatedUsersRetriever.jsx b/src/containers/PaginatedUsersRetriever.jsx
index 9d45420c1..c9b260ba6 100644
--- a/src/containers/PaginatedUsersRetriever.jsx
+++ b/src/containers/PaginatedUsersRetriever.jsx
@@ -1,6 +1,6 @@
 import { Component } from "react";
 import PropTypes from "prop-types";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import isEqual from "lodash/isEqual";
 
 import apolloClient from "../network/apollo-client-singleton";
diff --git a/src/containers/PeopleList.jsx b/src/containers/PeopleList.jsx
index 5a6aded8d..bd7da0c7b 100644
--- a/src/containers/PeopleList.jsx
+++ b/src/containers/PeopleList.jsx
@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import { Link } from "react-router";
 import type from "prop-types";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import LoadingIndicator from "../components/LoadingIndicator";
 
 import OpenInNewIcon from "@material-ui/icons/OpenInNew";
diff --git a/src/containers/Settings/index.jsx b/src/containers/Settings/index.jsx
index c3eba80ae..9698a24d3 100644
--- a/src/containers/Settings/index.jsx
+++ b/src/containers/Settings/index.jsx
@@ -1,7 +1,7 @@
 /* eslint no-console: 0 */
 import PropTypes from "prop-types";
 import React from "react";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import Form from "react-formal";
 import moment from "moment";
 import * as yup from "yup";
diff --git a/src/containers/Settings/themeEditor.jsx b/src/containers/Settings/themeEditor.jsx
index 3df8c9b72..c1afd2f48 100644
--- a/src/containers/Settings/themeEditor.jsx
+++ b/src/containers/Settings/themeEditor.jsx
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React, { useState } from "react";
 import { compose } from "recompose";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import * as yup from "yup";
 import Form from "react-formal";
 import colorDifference from "color-difference";
diff --git a/src/containers/Tags.jsx b/src/containers/Tags.jsx
index 941485343..b0b2242c5 100644
--- a/src/containers/Tags.jsx
+++ b/src/containers/Tags.jsx
@@ -2,7 +2,7 @@ import React from "react";
 import * as yup from "yup";
 import Form from "react-formal";
 import { StyleSheet, css } from "aphrodite";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { withRouter } from "react-router";
 import PropTypes from "prop-types";
 
diff --git a/src/containers/Terms.jsx b/src/containers/Terms.jsx
index 15ac7e426..a04955269 100644
--- a/src/containers/Terms.jsx
+++ b/src/containers/Terms.jsx
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 import Button from "@material-ui/core/Button";
 import Stepper from "@material-ui/core/Stepper";
diff --git a/src/containers/TexterTodo.jsx b/src/containers/TexterTodo.jsx
index 70e9c0ec4..d69cca96e 100644
--- a/src/containers/TexterTodo.jsx
+++ b/src/containers/TexterTodo.jsx
@@ -3,7 +3,7 @@ import React from "react";
 import ContactController from "../components/AssignmentTexter/ContactController";
 import { withRouter } from "react-router";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 export const contactDataFragment = `
         id
diff --git a/src/containers/TexterTodoList.jsx b/src/containers/TexterTodoList.jsx
index d0f058f6e..2280e30a2 100644
--- a/src/containers/TexterTodoList.jsx
+++ b/src/containers/TexterTodoList.jsx
@@ -6,7 +6,7 @@ import LoadingIndicator from "../components/LoadingIndicator";
 import AssignmentSummary from "../components/AssignmentSummary";
 import Snackbar from "@material-ui/core/Snackbar";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { withRouter } from "react-router";
 
 let refreshOnReturn = false;
diff --git a/src/containers/UserEdit.jsx b/src/containers/UserEdit.jsx
index 7bd1cd570..58243ff90 100644
--- a/src/containers/UserEdit.jsx
+++ b/src/containers/UserEdit.jsx
@@ -22,7 +22,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { withRouter } from "react-router";
 import { compose } from "recompose";
 import GSForm from "../components/forms/GSForm";
diff --git a/src/containers/UserMenu.jsx b/src/containers/UserMenu.jsx
index dab748d93..043e36431 100644
--- a/src/containers/UserMenu.jsx
+++ b/src/containers/UserMenu.jsx
@@ -1,8 +1,8 @@
 import PropTypes from "prop-types";
 import React, { Component } from "react";
-import { compose } from "react-apollo";
+import { compose } from "recompose";
 import { withRouter } from "react-router";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 import MenuItem from "@material-ui/core/MenuItem";
 import MenuList from "@material-ui/core/MenuList";
diff --git a/src/containers/hoc/load-data.jsx b/src/containers/hoc/load-data.jsx
index b0e6b22d2..a8a74d6c9 100644
--- a/src/containers/hoc/load-data.jsx
+++ b/src/containers/hoc/load-data.jsx
@@ -1,6 +1,6 @@
 import React from "react";
-import { graphql, compose } from "react-apollo";
-import { withProps, branch, renderComponent } from "recompose";
+import { graphql } from "@apollo/client/react/hoc";
+import { compose, withProps, branch, renderComponent } from "recompose";
 
 import Card from "@material-ui/core/Card";
 import CardHeader from "@material-ui/core/CardHeader";
diff --git a/src/extensions/texter-sideboxes/contact-notes/react-component.js b/src/extensions/texter-sideboxes/contact-notes/react-component.js
index 3c634379e..085f8c51a 100644
--- a/src/extensions/texter-sideboxes/contact-notes/react-component.js
+++ b/src/extensions/texter-sideboxes/contact-notes/react-component.js
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import { withRouter } from "react-router";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import _ from "lodash";
 
 import TextField from "@material-ui/core/TextField";
diff --git a/src/extensions/texter-sideboxes/default-dynamicassignment/react-component.js b/src/extensions/texter-sideboxes/default-dynamicassignment/react-component.js
index 72a0ec0da..05889770c 100644
--- a/src/extensions/texter-sideboxes/default-dynamicassignment/react-component.js
+++ b/src/extensions/texter-sideboxes/default-dynamicassignment/react-component.js
@@ -5,7 +5,7 @@ import Form from "react-formal";
 import Badge from "@material-ui/core/Badge";
 import Button from "@material-ui/core/Button";
 import { withRouter } from "react-router";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import GSTextField from "../../../components/forms/GSTextField";
 import { dataTest } from "../../../lib/attributes";
 
diff --git a/src/extensions/texter-sideboxes/default-releasecontacts/react-component.js b/src/extensions/texter-sideboxes/default-releasecontacts/react-component.js
index 149c746db..2c991c8e1 100644
--- a/src/extensions/texter-sideboxes/default-releasecontacts/react-component.js
+++ b/src/extensions/texter-sideboxes/default-releasecontacts/react-component.js
@@ -8,7 +8,7 @@ import Button from "@material-ui/core/Button";
 import Switch from "@material-ui/core/Switch";
 import FormControlLabel from "@material-ui/core/FormControlLabel";
 
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import GSTextField from "../../../components/forms/GSTextField";
 import loadData from "../../../containers/hoc/load-data";
 import theme from "../../../styles/mui-theme";
diff --git a/src/extensions/texter-sideboxes/take-conversations/react-component.js b/src/extensions/texter-sideboxes/take-conversations/react-component.js
index 1ebaf95f7..d8d24030d 100644
--- a/src/extensions/texter-sideboxes/take-conversations/react-component.js
+++ b/src/extensions/texter-sideboxes/take-conversations/react-component.js
@@ -3,7 +3,7 @@ import React from "react";
 import * as yup from "yup";
 import Form from "react-formal";
 import { withRouter } from "react-router";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 import Button from "@material-ui/core/Button";
 import FormControlLabel from "@material-ui/core/FormControlLabel";
diff --git a/src/extensions/texter-sideboxes/texter-feedback/AssignmentTexterFeedback.jsx b/src/extensions/texter-sideboxes/texter-feedback/AssignmentTexterFeedback.jsx
index 006d1886e..a385324b2 100644
--- a/src/extensions/texter-sideboxes/texter-feedback/AssignmentTexterFeedback.jsx
+++ b/src/extensions/texter-sideboxes/texter-feedback/AssignmentTexterFeedback.jsx
@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React, { Component } from "react";
 import { StyleSheet, css } from "aphrodite";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { compose } from "recompose";
 
 import Stepper from "@material-ui/core/Stepper";
diff --git a/src/extensions/texter-sideboxes/texter-feedback/react-component.js b/src/extensions/texter-sideboxes/texter-feedback/react-component.js
index d055f8e79..ae1ea2708 100644
--- a/src/extensions/texter-sideboxes/texter-feedback/react-component.js
+++ b/src/extensions/texter-sideboxes/texter-feedback/react-component.js
@@ -4,7 +4,7 @@ import { withRouter } from "react-router";
 import ReactTooltip from "react-tooltip";
 import * as yup from "yup";
 import Form from "react-formal";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import _ from "lodash";
 import { compose } from "recompose";
 
diff --git a/src/lib/permissions.js b/src/lib/permissions.js
index a5fe5cc00..8ccb4d586 100644
--- a/src/lib/permissions.js
+++ b/src/lib/permissions.js
@@ -13,8 +13,10 @@ export const isRoleGreater = (role1, role2) =>
 export const hasRoleAtLeast = (hasRole, wantsRole) =>
   ROLE_HIERARCHY.indexOf(hasRole) >= ROLE_HIERARCHY.indexOf(wantsRole);
 
-export const getHighestRole = roles =>
-  roles.sort(isRoleGreater)[roles.length - 1];
+export const getHighestRole = roles => {
+  const tempRoles = [...roles];
+  return tempRoles.sort(isRoleGreater)[tempRoles.length - 1];
+};
 
 export const hasRole = (role, roles) =>
   hasRoleAtLeast(getHighestRole(roles), role);
diff --git a/src/lib/scripts.js b/src/lib/scripts.js
index 90dbe5d4d..6e7d37c6f 100644
--- a/src/lib/scripts.js
+++ b/src/lib/scripts.js
@@ -52,6 +52,9 @@ export const allScriptFields = (customFields, includeDeprecated) =>
     .concat(includeDeprecated ? DEPRECATED_SCRIPT_FIELDS : []);
 
 const capitalize = str => {
+  if (!str) {
+    return str;
+  }
   const strTrimmed = str.trim();
   if (
     strTrimmed.charAt(0).toUpperCase() === strTrimmed.charAt(0) &&
diff --git a/src/network/apollo-client-singleton.js b/src/network/apollo-client-singleton.js
index d100c3e29..a479c1d07 100644
--- a/src/network/apollo-client-singleton.js
+++ b/src/network/apollo-client-singleton.js
@@ -1,10 +1,12 @@
+import {
+  ApolloClient,
+  ApolloLink,
+  InMemoryCache,
+  createHttpLink
+} from "@apollo/client";
+import { getMainDefinition } from "@apollo/client/utilities";
+import { onError } from "@apollo/client/link/error";
 import fetch from "isomorphic-fetch";
-import { ApolloClient } from "apollo-client";
-import { ApolloLink } from "apollo-link";
-import { createHttpLink } from "apollo-link-http";
-import { onError } from "apollo-link-error";
-import { InMemoryCache } from "apollo-cache-inmemory";
-import { getMainDefinition } from "apollo-utilities";
 import omitDeep from "omit-deep-lodash";
 
 const httpLink = createHttpLink({
@@ -41,25 +43,24 @@ const link = cleanTypenameLink.concat(errorLink).concat(httpLink);
 const cache = new InMemoryCache({
   addTypename: true,
   dataIdFromObject: result => {
+    let toReturn = null;
     if (result.__typename === "ContactTag") {
       // This is all a hacky way to resolve the issue of using ContactTag.id for the tagId
       if (result.campaignContactId && result.id) {
         return (
           result.__typename + ":" + result.campaignContactId + ":" + result.id
         );
-      } else {
-        return null; // can't cache
       }
     }
     if (result.__typename) {
       if (result.id !== undefined) {
-        return result.__typename + ":" + result.id;
+        toReturn = result.__typename + ":" + result.id;
       }
       if (result._id !== undefined) {
-        return result.__typename + ":" + result._id;
+        toReturn = result.__typename + ":" + result._id;
       }
     }
-    return null;
+    return toReturn;
   },
   // FUTURE: Apollo Client 3.0 allows this much more easily:
   typePolicies: {
@@ -74,7 +75,19 @@ const ApolloClientSingleton = new ApolloClient({
   link,
   cache,
   connectToDevTools: true,
-  queryDeduplication: true
+  queryDeduplication: true,
+  // make the cache work like it did in apollo v2
+  // https://www.apollographql.com/docs/react/migrating/apollo-client-3-migration/#breaking-cache-changes
+  defaultOptions: {
+    watchQuery: {
+      fetchPolicy: "cache-and-network",
+      nextFetchPolicy: "cache-first"
+    },
+    query: {
+      fetchPolicy: "cache-and-network",
+      nextFetchPolicy: "cache-first"
+    }
+  }
 });
 
 export default ApolloClientSingleton;
diff --git a/src/network/response-middleware-network-interface.js b/src/network/response-middleware-network-interface.js
index 6778f6bc1..fc2e82989 100644
--- a/src/network/response-middleware-network-interface.js
+++ b/src/network/response-middleware-network-interface.js
@@ -1,5 +1,4 @@
-import { createNetworkInterface } from "apollo-client";
-import fetch from "isomorphic-fetch";
+import { createNetworkInterface } from "@apollo/client";
 
 class ResponseMiddlewareNetworkInterface {
   constructor(endpoint = "/graphql", options = {}) {
diff --git a/src/server/api/errors.js b/src/server/api/errors.js
index 617b00d05..471b072e3 100644
--- a/src/server/api/errors.js
+++ b/src/server/api/errors.js
@@ -3,9 +3,10 @@ import { r, cacheableData } from "../models";
 
 export function authRequired(user) {
   if (!user) {
-    throw new GraphQLError({
-      status: 401,
-      message: "You must login to access that resource."
+    throw new GraphQLError("You must login to access that resource.", {
+      extensions: {
+        status: 401
+      }
     });
   }
 }
@@ -27,9 +28,13 @@ export async function accessRequired(
   const hasRole = await cacheableData.user.userHasRole(user, orgId, role);
   if (!hasRole) {
     const error = new GraphQLError(
-      "You are not authorized to access that resource."
+      "You are not authorized to access that resource.",
+      {
+        extensions: {
+          code: "UNAUTHORIZED"
+        }
+      }
     );
-    error.code = "UNAUTHORIZED";
     throw error;
   }
 }
@@ -73,9 +78,13 @@ export async function assignmentRequiredOrAdminRole(
   );
   if (!hasPermission) {
     const error = new GraphQLError(
-      "You are not authorized to access that resource."
+      "You are not authorized to access that resource.",
+      {
+        extensions: {
+          code: "UNAUTHORIZED"
+        }
+      }
     );
-    error.code = "UNAUTHORIZED";
     throw error;
   }
   return userHasAssignment || true;
diff --git a/src/server/api/mutations/bulkSendMessages.js b/src/server/api/mutations/bulkSendMessages.js
index 8750f2a66..f80e7d84c 100644
--- a/src/server/api/mutations/bulkSendMessages.js
+++ b/src/server/api/mutations/bulkSendMessages.js
@@ -25,9 +25,8 @@ export const bulkSendMessages = async (
     !getConfig("ALLOW_SEND_ALL_ENABLED", organization)
   ) {
     log.error("Not allowed to send all messages at once");
-    throw new GraphQLError({
-      status: 403,
-      message: "Not allowed to send all messages at once"
+    throw new GraphQLError("Not allowed to send all messages at once", {
+      extensions: { http: { status: 403 } }
     });
   }
 
diff --git a/src/server/api/mutations/joinOrganization.js b/src/server/api/mutations/joinOrganization.js
index a865295d7..5ef0ae038 100644
--- a/src/server/api/mutations/joinOrganization.js
+++ b/src/server/api/mutations/joinOrganization.js
@@ -6,9 +6,9 @@ import { getConfig } from "../lib/config";
 import telemetry from "../../telemetry";
 
 const INVALID_JOIN = () => {
-  const error = new GraphQLError("Invalid join request");
-  error.code = "INVALID_JOIN";
-  return error;
+  return new GraphQLError("Invalid join request", {
+    extensions: { code: "INVALID_JOIN" }
+  });
 };
 
 export const joinOrganization = async (
@@ -43,9 +43,10 @@ export const joinOrganization = async (
         );
         if (campaignTexterCount >= maxTextersPerCampaign) {
           const error = new GraphQLError(
-            "Sorry, this campaign has too many texters already"
+            "Sorry, this campaign has too many texters already",
+            { extensions: { code: "FAILEDJOIN_TOOMANYTEXTERS" } }
           );
-          error.code = "FAILEDJOIN_TOOMANYTEXTERS";
+
           throw error;
         }
       }
diff --git a/src/server/api/mutations/releaseContacts.js b/src/server/api/mutations/releaseContacts.js
index 2ee36a4b4..33c61a885 100644
--- a/src/server/api/mutations/releaseContacts.js
+++ b/src/server/api/mutations/releaseContacts.js
@@ -1,5 +1,4 @@
-import { log } from "../../../lib";
-import { Assignment, r, cacheableData } from "../../models";
+import { r, cacheableData } from "../../models";
 import { assignmentRequiredOrAdminRole } from "../errors";
 
 export const releaseContacts = async (
diff --git a/src/server/api/mutations/sendMessage.js b/src/server/api/mutations/sendMessage.js
index 8c285655e..3a821495b 100644
--- a/src/server/api/mutations/sendMessage.js
+++ b/src/server/api/mutations/sendMessage.js
@@ -16,8 +16,7 @@ const JOBS_SAME_PROCESS = !!(
 );
 
 const newError = (message, code, details = {}) => {
-  const err = new GraphQLError(message);
-  err.code = code;
+  const err = new GraphQLError(message, { extensions: { code } });
   if (process.env.DEBUGGING_EMAILS) {
     sendEmail({
       to: process.env.DEBUGGING_EMAILS.split(","),
@@ -176,7 +175,7 @@ export const sendMessage = async (
   // const offsetData = zipData ? { offset: zipData.timezone_offset, hasDST: zipData.has_dst } : null
   // if (!isBetweenTextingHours(offsetData, config)) {
   //   throw new GraphQLError({
-  //     status: 400,
+  //     extensions: { http: { { status: 400 } },
   //     message: "Skipped sending because it's now outside texting hours for this contact"
   //   })
   // }
diff --git a/src/server/api/mutations/updateServiceManager.js b/src/server/api/mutations/updateServiceManager.js
index d6e74b395..ae54c5cc1 100644
--- a/src/server/api/mutations/updateServiceManager.js
+++ b/src/server/api/mutations/updateServiceManager.js
@@ -1,5 +1,3 @@
-import { GraphQLError } from "graphql/error";
-import { getConfig } from "../../../server/api/lib/config";
 import { cacheableData } from "../../../server/models";
 import { processServiceManagers } from "../../../extensions/service-managers";
 import { accessRequired } from "../errors";
diff --git a/src/server/api/phone.js b/src/server/api/phone.js
index c1b4203ad..3f6d112e8 100644
--- a/src/server/api/phone.js
+++ b/src/server/api/phone.js
@@ -16,12 +16,14 @@ export const GraphQLPhone = new GraphQLScalarType({
     if (ast.kind !== Kind.STRING) {
       throw new GraphQLError(
         `Query error: Can only parse strings got a: ${ast.kind}`,
-        [ast]
+        { nodes: [ast] }
       );
     }
 
     if (!pattern.test(ast.value)) {
-      throw new GraphQLError("Query error: Not a valid Phone", [ast]);
+      throw new GraphQLError("Query error: Not a valid Phone", {
+        nodes: [ast]
+      });
     }
 
     return ast.value;
diff --git a/src/server/api/schema.js b/src/server/api/schema.js
index 4d15b33cf..d63934da4 100644
--- a/src/server/api/schema.js
+++ b/src/server/api/schema.js
@@ -518,12 +518,10 @@ const rootMutations = {
         .limit(1);
 
       if (!lastMessage) {
-        const errorStatusAndMessage = {
-          status: 400,
-          message:
-            "Cannot fake a reply to a contact that has no existing thread yet"
-        };
-        throw new GraphQLError(errorStatusAndMessage);
+        throw new GraphQLError(
+          "Cannot fake a reply to a contact that has no existing thread yet",
+          { extensions: { http: { status: 400 } } }
+        );
       }
 
       const userNumber = lastMessage.user_number;
@@ -665,7 +663,8 @@ const rootMutations = {
 
       const organization = await loaders.organization.load(organizationId);
 
-      const passportStrategy = getConfig("PASSPORT_STRATEGY", organization) || "auth0";
+      const passportStrategy =
+        getConfig("PASSPORT_STRATEGY", organization) || "auth0";
       if (passportStrategy === "auth0") {
         const { email } = await r
           .knex("user")
@@ -1052,10 +1051,10 @@ const rootMutations = {
         campaign.hasOwnProperty("contacts") &&
         campaign.contacts
       ) {
-        throw new GraphQLError({
-          status: 400,
-          message: "Not allowed to add contacts after the campaign starts"
-        });
+        throw new GraphQLError(
+          "Not allowed to add contacts after the campaign starts",
+          { extensions: { http: { status: 400 } } }
+        );
       }
       return editCampaign(id, campaign, loaders, user, origCampaign);
     },
@@ -1109,9 +1108,8 @@ const rootMutations = {
       authRequired(user);
       const invite = await Invite.get(inviteId);
       if (!invite || !invite.is_valid) {
-        throw new GraphQLError({
-          status: 400,
-          message: "That invitation is no longer valid"
+        throw new GraphQLError("That invitation is no longer valid", {
+          extensions: { http: { status: 400 } }
         });
       }
 
diff --git a/src/server/index.js b/src/server/index.js
index bf539ef76..e4fe3e478 100644
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -1,16 +1,25 @@
 import "babel-polyfill";
 import bodyParser from "body-parser";
 import express from "express";
+import { ApolloServer } from "@apollo/server";
+import { expressMiddleware } from "@apollo/server/express4";
+import { ApolloServerPluginDrainHttpServer } from "@apollo/server/plugin/drainHttpServer";
+import http from "http";
+import cors from "cors";
+import { makeExecutableSchema } from "@graphql-tools/schema";
+import passport from "passport";
+import cookieSession from "cookie-session";
+import { existsSync } from "fs";
+import herokuSslRedirect from "heroku-ssl-redirect";
+import { GraphQLError } from "graphql/error";
 import appRenderer from "./middleware/app-renderer";
-import { graphqlExpress, graphiqlExpress } from "apollo-server-express";
-import { makeExecutableSchema } from "graphql-tools";
+import { ApolloServerPluginLandingPageLocalDefault } from "@apollo/server/plugin/landingPage/default";
+import { ApolloServerPluginLandingPageDisabled } from "@apollo/server/plugin/disabled";
+
 // ORDERING: ./models import must be imported above ./api to help circular imports
-import { replaceEasyGsmWins } from "../lib/gsm";
 import { createLoaders, createTablesIfNecessary, r } from "./models";
 import { resolvers } from "./api/schema";
-import { schema } from "../api/schema";
-import passport from "passport";
-import cookieSession from "cookie-session";
+import schema from "../api/schema";
 import passportSetup from "./auth-passport";
 import { log } from "../lib";
 import telemetry from "./telemetry";
@@ -18,10 +27,7 @@ import { addServerEndpoints as messagingServicesAddServerEndpoints } from "../ex
 import { getConfig } from "./api/lib/config";
 import { seedZipCodes } from "./seeds/seed-zip-codes";
 import { setupUserNotificationObservers } from "./notifications";
-import { existsSync } from "fs";
 import { rawAllMethods } from "../extensions/contact-loaders";
-import herokuSslRedirect from "heroku-ssl-redirect";
-import { GraphQLError } from "graphql/error";
 
 process.on("uncaughtException", ex => {
   log.error(ex);
@@ -53,153 +59,178 @@ const app = express();
 // Heroku requires you to use process.env.PORT
 const port = process.env.DEV_APP_PORT || process.env.PORT;
 
-// Don't rate limit heroku
-app.enable("trust proxy");
+const httpServer = http.createServer(app);
 
-if (process.env.HEROKU_APP_NAME) {
-  // if on Heroku redirect to https if accessed via http
-  app.use(herokuSslRedirect());
-}
+const executableSchema = makeExecutableSchema({
+  typeDefs: schema,
+  resolvers,
+  allowUndefinedInResolve: false
+});
 
-// Serve static assets
-if (existsSync(process.env.ASSETS_DIR)) {
-  app.use(
-    "/assets",
-    express.static(process.env.ASSETS_DIR, {
-      maxAge: "180 days"
-    })
-  );
-}
+const errorReportingPlugin = {
+  async requestDidStart() {
+    return {
+      async didEncounterErrors(requestContext) {
+        requestContext.errors.forEach(error => {
+          log.error({
+            userId: requestContext?.contextValue?.user?.id,
+            code: (error && error?.extensions?.code) || "INTERNAL_SERVER_ERROR",
+            error,
+            msg: "GraphQL error"
+          });
+          telemetry
+            .formatRequestError(error, requestContext.contextValue)
+            // drop if this fails
+            .catch(() => {})
+            .then(() => {});
+        });
+      }
+    };
+  }
+};
 
-app.use(bodyParser.json({ limit: "50mb" }));
-app.use(bodyParser.urlencoded({ extended: true }));
-
-app.use(
-  cookieSession({
-    cookie: {
-      httpOnly: true,
-      secure: !DEBUG,
-      maxAge: null
-    },
-    secret: process.env.SESSION_SECRET || global.SESSION_SECRET
-  })
-);
-app.use(passport.initialize());
-app.use(passport.session());
-
-app.use((req, res, next) => {
-  const getContext = app.get("awsContextGetter");
-  if (typeof getContext === "function") {
-    const [event, context] = getContext(req, res);
-    req.awsEvent = event;
-    req.awsContext = context;
+const server = new ApolloServer({
+  resolvers,
+  schema: executableSchema,
+  introspection: true,
+  plugins: [
+    ApolloServerPluginDrainHttpServer({ httpServer }),
+
+    errorReportingPlugin,
+
+    // display the graphql IDE on the /graphql endpoint
+    // when invoked with no query and when not in production
+    process.env.NODE_ENV !== "production"
+      ? ApolloServerPluginLandingPageLocalDefault({ embed: true })
+      : // no default landing page in production
+        ApolloServerPluginLandingPageDisabled()
+  ],
+  formatError: (error, originalError) => {
+    if (process.env.SHOW_SERVER_ERROR || process.env.DEBUG) {
+      if (error instanceof GraphQLError) {
+        return error;
+      }
+      return new GraphQLError(error.message);
+    }
+
+    return new GraphQLError(
+      error && error?.extensions?.code === "UNAUTHORIZED"
+        ? "UNAUTHORIZED"
+        : "Internal server error"
+    );
   }
-  next();
 });
 
-// Simulate latency in local development
-if (process.env.SIMULATE_DELAY_MILLIS) {
+server.start().then(() => {
+  // Don't rate limit heroku
+  app.enable("trust proxy");
+
+  if (process.env.HEROKU_APP_NAME) {
+    // if on Heroku redirect to https if accessed via http
+    app.use(herokuSslRedirect());
+  }
+
+  // Serve static assets
+  if (existsSync(process.env.ASSETS_DIR)) {
+    app.use(
+      "/assets",
+      express.static(process.env.ASSETS_DIR, {
+        maxAge: "180 days"
+      })
+    );
+  }
+
+  app.use(bodyParser.json({ limit: "50mb" }));
+  app.use(bodyParser.urlencoded({ extended: true }));
+
+  app.use(
+    cookieSession({
+      cookie: {
+        httpOnly: true,
+        secure: !DEBUG,
+        maxAge: null
+      },
+      secret: process.env.SESSION_SECRET || global.SESSION_SECRET
+    })
+  );
+  app.use(passport.initialize());
+  app.use(passport.session());
+
   app.use((req, res, next) => {
-    setTimeout(next, Number(process.env.SIMULATE_DELAY_MILLIS));
+    const getContext = app.get("awsContextGetter");
+    if (typeof getContext === "function") {
+      const [event, context] = getContext(req, res);
+      req.awsEvent = event;
+      req.awsContext = context;
+    }
+    next();
   });
-}
 
-// give contact loaders a chance
-const configuredIngestMethods = rawAllMethods();
-Object.keys(configuredIngestMethods).forEach(ingestMethodName => {
-  const ingestMethod = configuredIngestMethods[ingestMethodName];
-  if (ingestMethod && ingestMethod.addServerEndpoints) {
-    ingestMethod.addServerEndpoints(app);
+  // Simulate latency in local development
+  if (process.env.SIMULATE_DELAY_MILLIS) {
+    app.use((req, res, next) => {
+      setTimeout(next, Number(process.env.SIMULATE_DELAY_MILLIS));
+    });
   }
-});
 
-const routeAdders = {
-  get: (_app, route, ...handlers) => _app.get(route, ...handlers),
-  post: (_app, route, ...handlers) => _app.post(route, ...handlers)
-};
+  // give contact loaders a chance
+  const configuredIngestMethods = rawAllMethods();
+  Object.keys(configuredIngestMethods).forEach(ingestMethodName => {
+    const ingestMethod = configuredIngestMethods[ingestMethodName];
+    if (ingestMethod && ingestMethod.addServerEndpoints) {
+      ingestMethod.addServerEndpoints(app);
+    }
+  });
 
-messagingServicesAddServerEndpoints(app, routeAdders);
+  const routeAdders = {
+    get: (_app, route, ...handlers) => _app.get(route, ...handlers),
+    post: (_app, route, ...handlers) => _app.post(route, ...handlers)
+  };
 
-app.get("/logout-callback", (req, res) => {
-  req.logOut();
-  res.redirect("/");
-});
+  messagingServicesAddServerEndpoints(app, routeAdders);
 
-const loginCallbacks = passportSetup[
-  process.env.PASSPORT_STRATEGY || global.PASSPORT_STRATEGY || "auth0"
-](app);
+  app.get("/logout-callback", (req, res) => {
+    req.logOut();
+    res.redirect("/");
+  });
 
-if (loginCallbacks) {
-  app.get("/login-callback", ...loginCallbacks.loginCallback);
-  app.post("/login-callback", ...loginCallbacks.loginCallback);
-}
+  const loginCallbacks = passportSetup[
+    process.env.PASSPORT_STRATEGY || global.PASSPORT_STRATEGY || "auth0"
+  ](app);
 
-const executableSchema = makeExecutableSchema({
-  typeDefs: schema,
-  resolvers,
-  allowUndefinedInResolve: false
-});
+  if (loginCallbacks) {
+    app.get("/login-callback", ...loginCallbacks.loginCallback);
+    app.post("/login-callback", ...loginCallbacks.loginCallback);
+  }
 
-app.use(
-  "/graphql",
-  graphqlExpress(request => ({
-    schema: executableSchema,
-    context: {
-      loaders: createLoaders(),
-      user: request.user,
-      awsContext: request.awsContext || null,
-      awsEvent: request.awsEvent || null,
-      remainingMilliseconds: () =>
-        request.awsContext && request.awsContext.getRemainingTimeInMillis
-          ? request.awsContext.getRemainingTimeInMillis()
-          : 5 * 60 * 1000 // default saying 5 min, no matter what
-    },
-    formatError: error => {
-      log.error({
-        userId: request.user && request.user.id,
-        code:
-          (error && error.originalError && error.originalError.code) ||
-          "INTERNAL_SERVER_ERROR",
-        error,
-        msg: "GraphQL error"
-      });
-      telemetry
-        .formatRequestError(error, request)
-        // drop if this fails
-        .catch(() => {})
-        .then(() => {});
-
-      if (process.env.SHOW_SERVER_ERROR || process.env.DEBUG) {
-        if (error instanceof GraphQLError) {
-          return error;
-        }
-        return new GraphQLError(error.message);
+  app.use(
+    "/graphql",
+    cors(),
+    expressMiddleware(server, {
+      schema: executableSchema,
+      context: async request => {
+        return {
+          loaders: createLoaders(),
+          user: request.req.user,
+          awsContext: request.awsContext || null,
+          awsEvent: request.awsEvent || null,
+          remainingMilliseconds: () =>
+            request.awsContext && request.awsContext.getRemainingTimeInMillis
+              ? request.awsContext.getRemainingTimeInMillis()
+              : 5 * 60 * 1000 // default saying 5 min, no matter what
+        };
       }
+    })
+  );
 
-      return new GraphQLError(
-        error &&
-        error.originalError &&
-        error.originalError.code === "UNAUTHORIZED"
-          ? "UNAUTHORIZED"
-          : "Internal server error"
-      );
-    }
-  }))
-);
-app.get(
-  "/graphiql",
-  graphiqlExpress({
-    endpointURL: "/graphql"
-  })
-);
-
-// This middleware should be last. Return the React app only if no other route is hit.
-app.use(appRenderer);
-
-if (port) {
-  app.listen(port, () => {
-    log.info(`Node app is running on port ${port}`);
-  });
-}
+  // This middleware should be last. Return the React app only if no other route is hit.
+  app.use(appRenderer);
+
+  if (port) {
+    httpServer.listen({ port }, () => {
+      log.info(`Node app is running on port ${port}`);
+    });
+  }
+});
 
 export default app;
diff --git a/src/server/telemetry.js b/src/server/telemetry.js
index fd59c5dab..85f2c4b70 100644
--- a/src/server/telemetry.js
+++ b/src/server/telemetry.js
@@ -172,8 +172,8 @@ async function reportError(err, details) {
 
 async function formatRequestError(err, req) {
   let code = "UNKNOWN";
-  if (err.originalError) {
-    code = err.originalError.code || "INTERNAL_SERVER_ERROR";
+  if (err) {
+    code = err?.extensions?.code || "INTERNAL_SERVER_ERROR";
   }
   err.code = code;
   await Promise.all(formatRequestErrorCallbacks.map(cb => cb(err, req)));
diff --git a/src/styles/mui-theme.js b/src/styles/mui-theme.js
index 7ea92aae9..fcfcff066 100644
--- a/src/styles/mui-theme.js
+++ b/src/styles/mui-theme.js
@@ -1,4 +1,4 @@
-import { createMuiTheme } from "@material-ui/core/styles";
+import { createTheme } from "@material-ui/core/styles";
 
 /**
  * This is the default theme to be used in the app
@@ -22,7 +22,7 @@ const defaultTheme = {
   }
 };
 
-let theme = createMuiTheme(defaultTheme);
+const theme = createTheme(defaultTheme);
 
 export { defaultTheme };
 
diff --git a/yarn.lock b/yarn.lock
index 4bdae6ad2..8d2c14bd2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -38,6 +38,171 @@
   dependencies:
     lodash.flatten "^4.4.0"
 
+"@apollo/cache-control-types@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@apollo/cache-control-types/-/cache-control-types-1.0.3.tgz#5da62cf64c3b4419dabfef4536b57a40c8ff0b47"
+  integrity sha512-F17/vCp7QVwom9eG7ToauIKdAxpSoadsJnqIfyryLFSkLSOEqu+eC5Z3N8OXcUVStuOMcNHlyraRsA6rRICu4g==
+
+"@apollo/client@^3.8.8":
+  version "3.8.8"
+  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.8.8.tgz#1a004b2e6de4af38668249a7d7790f6a3431e475"
+  integrity sha512-omjd9ryGDkadZrKW6l5ktUAdS4SNaFOccYQ4ZST0HLW83y8kQaSZOCTNlpkoBUK8cv6qP8+AxOKwLm2ho8qQ+Q==
+  dependencies:
+    "@graphql-typed-document-node/core" "^3.1.1"
+    "@wry/equality" "^0.5.6"
+    "@wry/trie" "^0.5.0"
+    graphql-tag "^2.12.6"
+    hoist-non-react-statics "^3.3.2"
+    optimism "^0.18.0"
+    prop-types "^15.7.2"
+    response-iterator "^0.2.6"
+    symbol-observable "^4.0.0"
+    ts-invariant "^0.10.3"
+    tslib "^2.3.0"
+    zen-observable-ts "^1.2.5"
+
+"@apollo/protobufjs@1.2.7":
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.7.tgz#3a8675512817e4a046a897e5f4f16415f16a7d8a"
+  integrity sha512-Lahx5zntHPZia35myYDBRuF58tlwPskwHc5CWBZC/4bMKB6siTBWwtMrkqXcsNwQiFSzSx5hKdRPUmemrEp3Gg==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/long" "^4.0.0"
+    long "^4.0.0"
+
+"@apollo/server-gateway-interface@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@apollo/server-gateway-interface/-/server-gateway-interface-1.1.1.tgz#a79632aa921edefcd532589943f6b97c96fa4d3c"
+  integrity sha512-pGwCl/po6+rxRmDMFgozKQo2pbsSwE91TpsDBAOgf74CRDPXHHtM88wbwjab0wMMZh95QfR45GGyDIdhY24bkQ==
+  dependencies:
+    "@apollo/usage-reporting-protobuf" "^4.1.1"
+    "@apollo/utils.fetcher" "^2.0.0"
+    "@apollo/utils.keyvaluecache" "^2.1.0"
+    "@apollo/utils.logger" "^2.0.0"
+
+"@apollo/server@^4.9.5":
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/@apollo/server/-/server-4.9.5.tgz#388b3e00bef370fbdb89dd22d5a56127afaf87ba"
+  integrity sha512-eDBfArYbZaTm1AGa82M1aL7lOscVhnZsH85+OWmHMIR98qntzEjNpWpQPYDTru63Qxs4kHcY29NUx/kMGZfGEA==
+  dependencies:
+    "@apollo/cache-control-types" "^1.0.3"
+    "@apollo/server-gateway-interface" "^1.1.1"
+    "@apollo/usage-reporting-protobuf" "^4.1.1"
+    "@apollo/utils.createhash" "^2.0.0"
+    "@apollo/utils.fetcher" "^2.0.0"
+    "@apollo/utils.isnodelike" "^2.0.0"
+    "@apollo/utils.keyvaluecache" "^2.1.0"
+    "@apollo/utils.logger" "^2.0.0"
+    "@apollo/utils.usagereporting" "^2.1.0"
+    "@apollo/utils.withrequired" "^2.0.0"
+    "@graphql-tools/schema" "^9.0.0"
+    "@josephg/resolvable" "^1.0.0"
+    "@types/express" "^4.17.13"
+    "@types/express-serve-static-core" "^4.17.30"
+    "@types/node-fetch" "^2.6.1"
+    async-retry "^1.2.1"
+    body-parser "^1.20.0"
+    cors "^2.8.5"
+    express "^4.17.1"
+    loglevel "^1.6.8"
+    lru-cache "^7.10.1"
+    negotiator "^0.6.3"
+    node-abort-controller "^3.1.1"
+    node-fetch "^2.6.7"
+    uuid "^9.0.0"
+    whatwg-mimetype "^3.0.0"
+
+"@apollo/usage-reporting-protobuf@^4.1.0", "@apollo/usage-reporting-protobuf@^4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@apollo/usage-reporting-protobuf/-/usage-reporting-protobuf-4.1.1.tgz#407c3d18c7fbed7a264f3b9a3812620b93499de1"
+  integrity sha512-u40dIUePHaSKVshcedO7Wp+mPiZsaU6xjv9J+VyxpoU/zL6Jle+9zWeG98tr/+SZ0nZ4OXhrbb8SNr0rAPpIDA==
+  dependencies:
+    "@apollo/protobufjs" "1.2.7"
+
+"@apollo/utils.createhash@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.createhash/-/utils.createhash-2.0.1.tgz#9d982a166833ce08265ff70f8ef781d65109bdaa"
+  integrity sha512-fQO4/ZOP8LcXWvMNhKiee+2KuKyqIcfHrICA+M4lj/h/Lh1H10ICcUtk6N/chnEo5HXu0yejg64wshdaiFitJg==
+  dependencies:
+    "@apollo/utils.isnodelike" "^2.0.1"
+    sha.js "^2.4.11"
+
+"@apollo/utils.dropunuseddefinitions@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-2.0.1.tgz#916cd912cbd88769d3b0eab2d24f4674eeda8124"
+  integrity sha512-EsPIBqsSt2BwDsv8Wu76LK5R1KtsVkNoO4b0M5aK0hx+dGg9xJXuqlr7Fo34Dl+y83jmzn+UvEW+t1/GP2melA==
+
+"@apollo/utils.fetcher@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.fetcher/-/utils.fetcher-2.0.1.tgz#2f6e3edc8ce79fbe916110d9baaddad7e13d955f"
+  integrity sha512-jvvon885hEyWXd4H6zpWeN3tl88QcWnHp5gWF5OPF34uhvoR+DFqcNxs9vrRaBBSY3qda3Qe0bdud7tz2zGx1A==
+
+"@apollo/utils.isnodelike@^2.0.0", "@apollo/utils.isnodelike@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.isnodelike/-/utils.isnodelike-2.0.1.tgz#08a7e50f08d2031122efa25af089d1c6ee609f31"
+  integrity sha512-w41XyepR+jBEuVpoRM715N2ZD0xMD413UiJx8w5xnAZD2ZkSJnMJBoIzauK83kJpSgNuR6ywbV29jG9NmxjK0Q==
+
+"@apollo/utils.keyvaluecache@^2.1.0":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-2.1.1.tgz#f3f79a2f00520c6ab7a77a680a4e1fec4d19e1a6"
+  integrity sha512-qVo5PvUUMD8oB9oYvq4ViCjYAMWnZ5zZwEjNF37L2m1u528x5mueMlU+Cr1UinupCgdB78g+egA1G98rbJ03Vw==
+  dependencies:
+    "@apollo/utils.logger" "^2.0.1"
+    lru-cache "^7.14.1"
+
+"@apollo/utils.logger@^2.0.0", "@apollo/utils.logger@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.logger/-/utils.logger-2.0.1.tgz#74faeb97d7ad9f22282dfb465bcb2e6873b8a625"
+  integrity sha512-YuplwLHaHf1oviidB7MxnCXAdHp3IqYV8n0momZ3JfLniae92eYqMIx+j5qJFX6WKJPs6q7bczmV4lXIsTu5Pg==
+
+"@apollo/utils.printwithreducedwhitespace@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-2.0.1.tgz#f4fadea0ae849af2c19c339cc5420d1ddfaa905e"
+  integrity sha512-9M4LUXV/fQBh8vZWlLvb/HyyhjJ77/I5ZKu+NBWV/BmYGyRmoEP9EVAy7LCVoY3t8BDcyCAGfxJaLFCSuQkPUg==
+
+"@apollo/utils.removealiases@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.removealiases/-/utils.removealiases-2.0.1.tgz#2873c93d72d086c60fc0d77e23d0f75e66a2598f"
+  integrity sha512-0joRc2HBO4u594Op1nev+mUF6yRnxoUH64xw8x3bX7n8QBDYdeYgY4tF0vJReTy+zdn2xv6fMsquATSgC722FA==
+
+"@apollo/utils.sortast@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.sortast/-/utils.sortast-2.0.1.tgz#58c90bb8bd24726346b61fa51ba7fcf06e922ef7"
+  integrity sha512-eciIavsWpJ09za1pn37wpsCGrQNXUhM0TktnZmHwO+Zy9O4fu/WdB4+5BvVhFiZYOXvfjzJUcc+hsIV8RUOtMw==
+  dependencies:
+    lodash.sortby "^4.7.0"
+
+"@apollo/utils.stripsensitiveliterals@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-2.0.1.tgz#2f3350483be376a98229f90185eaf19888323132"
+  integrity sha512-QJs7HtzXS/JIPMKWimFnUMK7VjkGQTzqD9bKD1h3iuPAqLsxd0mUNVbkYOPTsDhUKgcvUOfOqOJWYohAKMvcSA==
+
+"@apollo/utils.usagereporting@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.usagereporting/-/utils.usagereporting-2.1.0.tgz#11bca6a61fcbc6e6d812004503b38916e74313f4"
+  integrity sha512-LPSlBrn+S17oBy5eWkrRSGb98sWmnEzo3DPTZgp8IQc8sJe0prDgDuppGq4NeQlpoqEHz0hQeYHAOA0Z3aQsxQ==
+  dependencies:
+    "@apollo/usage-reporting-protobuf" "^4.1.0"
+    "@apollo/utils.dropunuseddefinitions" "^2.0.1"
+    "@apollo/utils.printwithreducedwhitespace" "^2.0.1"
+    "@apollo/utils.removealiases" "2.0.1"
+    "@apollo/utils.sortast" "^2.0.1"
+    "@apollo/utils.stripsensitiveliterals" "^2.0.1"
+
+"@apollo/utils.withrequired@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@apollo/utils.withrequired/-/utils.withrequired-2.0.1.tgz#e72bc512582a6f26af150439f7eb7473b46ba874"
+  integrity sha512-YBDiuAX9i1lLc6GeTy1m7DGLFn/gMnvXqlalOIMjM7DeOgIacEjjfwPqb0M1CQ2v11HhR15d1NmxJoRCfrNqcA==
+
 "@babel/cli@^7.19.3":
   version "7.19.3"
   resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.19.3.tgz#55914ed388e658e0b924b3a95da1296267e278e2"
@@ -1366,6 +1531,65 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
+"@graphql-tools/merge@^8.4.1":
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.4.2.tgz#95778bbe26b635e8d2f60ce9856b388f11fe8288"
+  integrity sha512-XbrHAaj8yDuINph+sAfuq3QCZ/tKblrTLOpirK0+CAgNlZUCHs0Fa+xtMUURgwCVThLle1AF7svJCxFizygLsw==
+  dependencies:
+    "@graphql-tools/utils" "^9.2.1"
+    tslib "^2.4.0"
+
+"@graphql-tools/merge@^9.0.1":
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-9.0.1.tgz#693f15da152339284469b1ce5c6827e3ae350a29"
+  integrity sha512-hIEExWO9fjA6vzsVjJ3s0cCQ+Q/BEeMVJZtMXd7nbaVefVy0YDyYlEkeoYYNV3NVVvu1G9lr6DM1Qd0DGo9Caw==
+  dependencies:
+    "@graphql-tools/utils" "^10.0.10"
+    tslib "^2.4.0"
+
+"@graphql-tools/schema@^10.0.2":
+  version "10.0.2"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-10.0.2.tgz#21bc2ee25a65fb4890d2e5f9f22ef1f733aa81da"
+  integrity sha512-TbPsIZnWyDCLhgPGnDjt4hosiNU2mF/rNtSk5BVaXWnZqvKJ6gzJV4fcHcvhRIwtscDMW2/YTnK6dLVnk8pc4w==
+  dependencies:
+    "@graphql-tools/merge" "^9.0.1"
+    "@graphql-tools/utils" "^10.0.10"
+    tslib "^2.4.0"
+    value-or-promise "^1.0.12"
+
+"@graphql-tools/schema@^9.0.0":
+  version "9.0.19"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.19.tgz#c4ad373b5e1b8a0cf365163435b7d236ebdd06e7"
+  integrity sha512-oBRPoNBtCkk0zbUsyP4GaIzCt8C0aCI4ycIRUL67KK5pOHljKLBBtGT+Jr6hkzA74C8Gco8bpZPe7aWFjiaK2w==
+  dependencies:
+    "@graphql-tools/merge" "^8.4.1"
+    "@graphql-tools/utils" "^9.2.1"
+    tslib "^2.4.0"
+    value-or-promise "^1.0.12"
+
+"@graphql-tools/utils@^10.0.10":
+  version "10.0.11"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-10.0.11.tgz#1238fbe37e8d6c662c48ab2477c98269d6fd851a"
+  integrity sha512-vVjXgKn6zjXIlYBd7yJxCVMYGb5j18gE3hx3Qw3mNsSEsYQXbJbPdlwb7Fc9FogsJei5AaqiQerqH4kAosp1nQ==
+  dependencies:
+    "@graphql-typed-document-node/core" "^3.1.1"
+    cross-inspect "1.0.0"
+    dset "^3.1.2"
+    tslib "^2.4.0"
+
+"@graphql-tools/utils@^9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.1.tgz#1b3df0ef166cfa3eae706e3518b17d5922721c57"
+  integrity sha512-WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A==
+  dependencies:
+    "@graphql-typed-document-node/core" "^3.1.1"
+    tslib "^2.4.0"
+
+"@graphql-typed-document-node/core@^3.1.1":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861"
+  integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==
+
 "@humanwhocodes/config-array@^0.11.6":
   version "0.11.7"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.7.tgz#38aec044c6c828f6ed51d5d7ae3d9b9faf6dbb0f"
@@ -1656,6 +1880,11 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
+"@josephg/resolvable@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@josephg/resolvable/-/resolvable-1.0.1.tgz#69bc4db754d79e1a2f17a650d3466e038d94a5eb"
+  integrity sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg==
+
 "@jridgewell/gen-mapping@^0.1.0":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
@@ -1882,6 +2111,59 @@
     schema-utils "^3.0.0"
     source-map "^0.7.3"
 
+"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
+  integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==
+
+"@protobufjs/base64@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
+  integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==
+
+"@protobufjs/codegen@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
+  integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==
+
+"@protobufjs/eventemitter@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
+  integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==
+
+"@protobufjs/fetch@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
+  integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.1"
+    "@protobufjs/inquire" "^1.1.0"
+
+"@protobufjs/float@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
+  integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==
+
+"@protobufjs/inquire@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
+  integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==
+
+"@protobufjs/path@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
+  integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==
+
+"@protobufjs/pool@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
+  integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==
+
+"@protobufjs/utf8@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
+  integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
+
 "@react-dnd/asap@^4.0.0":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@react-dnd/asap/-/asap-4.0.1.tgz#5291850a6b58ce6f2da25352a64f1b0674871aab"
@@ -2208,6 +2490,16 @@
     "@types/qs" "*"
     "@types/range-parser" "*"
 
+"@types/express-serve-static-core@^4.17.30":
+  version "4.17.41"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz#5077defa630c2e8d28aa9ffc2c01c157c305bef6"
+  integrity sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+    "@types/send" "*"
+
 "@types/express@*", "@types/express@^4.17.13":
   version "4.17.14"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c"
@@ -2287,17 +2579,35 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.189.tgz#975ff8c38da5ae58b751127b19ad5e44b5b7f6d2"
   integrity sha512-kb9/98N6X8gyME9Cf7YaqIMvYGnBSWqEci6tiettE6iJWH1XdJz/PO8LB0GtLCG7x8dU3KWhZT+lA1a35127tA==
 
+"@types/long@^4.0.0":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
+  integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
+
 "@types/mime@*":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
   integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
 
+"@types/mime@^1":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690"
+  integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==
+
 "@types/minimatch@*":
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
-"@types/node@*", "@types/node@>=6":
+"@types/node-fetch@^2.6.1":
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.9.tgz#15f529d247f1ede1824f7e7acdaa192d5f28071e"
+  integrity sha512-bQVlnMLFJ2d35DkPNjEPmd9ueO/rh5EiaZt2bhqiSarPjZIuIV6bPQVqcrEyvNo+AfTrRGVazle1tl597w3gfA==
+  dependencies:
+    "@types/node" "*"
+    form-data "^4.0.0"
+
+"@types/node@*":
   version "18.11.9"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4"
   integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==
@@ -2375,6 +2685,14 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
   integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
 
+"@types/send@*":
+  version "0.17.4"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a"
+  integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
 "@types/serve-index@^1.9.1":
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278"
@@ -2450,11 +2768,6 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/zen-observable@^0.8.0":
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3"
-  integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==
-
 "@typescript-eslint/eslint-plugin@^5.5.0":
   version "5.44.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.44.0.tgz#105788f299050c917eb85c4d9fd04b089e3740de"
@@ -2735,20 +3048,40 @@
   resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1"
   integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
 
-"@wry/context@^0.4.0":
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.4.4.tgz#e50f5fa1d6cfaabf2977d1fda5ae91717f8815f8"
-  integrity sha512-LrKVLove/zw6h2Md/KZyWxIkFM6AoyKp71OqpH9Hiip1csjPVoD3tPxlbQUNxEnHENks3UGgNpSBCAfq9KWuag==
+"@wry/caches@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@wry/caches/-/caches-1.0.1.tgz#8641fd3b6e09230b86ce8b93558d44cf1ece7e52"
+  integrity sha512-bXuaUNLVVkD20wcGBWRyo7j9N3TxePEWFZj2Y+r9OoUzfqmavM84+mFykRicNsBqatba5JLay1t48wxaXaWnlA==
+  dependencies:
+    tslib "^2.3.0"
+
+"@wry/context@^0.7.0":
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.7.4.tgz#e32d750fa075955c4ab2cfb8c48095e1d42d5990"
+  integrity sha512-jmT7Sb4ZQWI5iyu3lobQxICu2nC/vbUhP0vIdd6tHC9PTfenmRmuIFqktc6GH9cgi+ZHnsLWPvfSvc4DrYmKiQ==
   dependencies:
-    "@types/node" ">=6"
-    tslib "^1.9.3"
+    tslib "^2.3.0"
 
-"@wry/equality@^0.1.2":
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.11.tgz#35cb156e4a96695aa81a9ecc4d03787bc17f1790"
-  integrity sha512-mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA==
+"@wry/equality@^0.5.6":
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.5.7.tgz#72ec1a73760943d439d56b7b1e9985aec5d497bb"
+  integrity sha512-BRFORjsTuQv5gxcXsuDXx6oGRhuVsEGwZy6LOzRRfgu+eSfxbhUQ9L9YtSEIuIjY/o7g3iWFjrc5eSY1GXP2Dw==
   dependencies:
-    tslib "^1.9.3"
+    tslib "^2.3.0"
+
+"@wry/trie@^0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.4.3.tgz#077d52c22365871bf3ffcbab8e95cb8bc5689af4"
+  integrity sha512-I6bHwH0fSf6RqQcnnXLJKhkSXG45MFral3GxPaY4uAl0LYDZM+YDVDAiU9bYwjTuysy1S0IeecWtmq1SZA3M1w==
+  dependencies:
+    tslib "^2.3.0"
+
+"@wry/trie@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.5.0.tgz#11e783f3a53f6e4cd1d42d2d1323f5bc3fa99c94"
+  integrity sha512-FNoYzHawTMk/6KMQoEG5O4PuioX19UbwdQKF44yw0nLfOypfQdjtfZzo/UIJWAJ23sNIFbD1Ug9lbaDGMwbqQA==
+  dependencies:
+    tslib "^2.3.0"
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -3046,122 +3379,6 @@ aphrodite@^2.3.1:
     inline-style-prefixer "^5.1.0"
     string-hash "^1.1.3"
 
-apollo-cache-control@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.1.1.tgz#173d14ceb3eb9e7cb53de7eb8b61bee6159d4171"
-  integrity sha512-XJQs167e9u+e5ybSi51nGYr70NPBbswdvTEHtbtXbwkZ+n9t0SLPvUcoqceayOSwjK1XYOdU/EKPawNdb3rLQA==
-  dependencies:
-    graphql-extensions "^0.0.x"
-
-apollo-cache-inmemory@^1.6.6:
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.6.tgz#56d1f2a463a6b9db32e9fa990af16d2a008206fd"
-  integrity sha512-L8pToTW/+Xru2FFAhkZ1OA9q4V4nuvfoPecBM34DecAugUZEBhI2Hmpgnzq2hTKZ60LAMrlqiASm0aqAY6F8/A==
-  dependencies:
-    apollo-cache "^1.3.5"
-    apollo-utilities "^1.3.4"
-    optimism "^0.10.0"
-    ts-invariant "^0.4.0"
-    tslib "^1.10.0"
-
-apollo-cache@1.3.5, apollo-cache@^1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.5.tgz#9dbebfc8dbe8fe7f97ba568a224bca2c5d81f461"
-  integrity sha512-1XoDy8kJnyWY/i/+gLTEbYLnoiVtS8y7ikBr/IfmML4Qb+CM7dEEbIUOjnY716WqmZ/UpXIxTfJsY7rMcqiCXA==
-  dependencies:
-    apollo-utilities "^1.3.4"
-    tslib "^1.10.0"
-
-apollo-client@^2.6.10:
-  version "2.6.10"
-  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.10.tgz#86637047b51d940c8eaa771a4ce1b02df16bea6a"
-  integrity sha512-jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA==
-  dependencies:
-    "@types/zen-observable" "^0.8.0"
-    apollo-cache "1.3.5"
-    apollo-link "^1.0.0"
-    apollo-utilities "1.3.4"
-    symbol-observable "^1.0.2"
-    ts-invariant "^0.4.0"
-    tslib "^1.10.0"
-    zen-observable "^0.8.0"
-
-apollo-link-error@^1.1.13:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/apollo-link-error/-/apollo-link-error-1.1.13.tgz#c1a1bb876ffe380802c8df0506a32c33aad284cd"
-  integrity sha512-jAZOOahJU6bwSqb2ZyskEK1XdgUY9nkmeclCrW7Gddh1uasHVqmoYc4CKdb0/H0Y1J9lvaXKle2Wsw/Zx1AyUg==
-  dependencies:
-    apollo-link "^1.2.14"
-    apollo-link-http-common "^0.2.16"
-    tslib "^1.9.3"
-
-apollo-link-http-common@^0.2.16:
-  version "0.2.16"
-  resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz#756749dafc732792c8ca0923f9a40564b7c59ecc"
-  integrity sha512-2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg==
-  dependencies:
-    apollo-link "^1.2.14"
-    ts-invariant "^0.4.0"
-    tslib "^1.9.3"
-
-apollo-link-http@^1.5.17:
-  version "1.5.17"
-  resolved "https://registry.yarnpkg.com/apollo-link-http/-/apollo-link-http-1.5.17.tgz#499e9f1711bf694497f02c51af12d82de5d8d8ba"
-  integrity sha512-uWcqAotbwDEU/9+Dm9e1/clO7hTB2kQ/94JYcGouBVLjoKmTeJTUPQKcJGpPwUjZcSqgYicbFqQSoJIW0yrFvg==
-  dependencies:
-    apollo-link "^1.2.14"
-    apollo-link-http-common "^0.2.16"
-    tslib "^1.9.3"
-
-apollo-link@^1.0.0, apollo-link@^1.2.1, apollo-link@^1.2.14:
-  version "1.2.14"
-  resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.14.tgz#3feda4b47f9ebba7f4160bef8b977ba725b684d9"
-  integrity sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg==
-  dependencies:
-    apollo-utilities "^1.3.0"
-    ts-invariant "^0.4.0"
-    tslib "^1.9.3"
-    zen-observable-ts "^0.8.21"
-
-apollo-server-core@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-1.4.0.tgz#4faff7f110bfdd6c3f47008302ae24140f94c592"
-  integrity sha512-BP1Vh39krgEjkQxbjTdBURUjLHbFq1zeOChDJgaRsMxGtlhzuLWwwC6lLdPatN8jEPbeHq8Tndp9QZ3iQZOKKA==
-  dependencies:
-    apollo-cache-control "^0.1.0"
-    apollo-tracing "^0.1.0"
-    graphql-extensions "^0.0.x"
-
-apollo-server-express@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-1.4.0.tgz#7d7c58d6d6f9892b83fe575669093bb66738b125"
-  integrity sha512-zkH00nxhLnJfO0HgnNPBTfZw8qI5ILaPZ5TecMCI9+Y9Ssr2b0bFr9pBRsXy9eudPhI+/O4yqegSUsnLdF/CPw==
-  dependencies:
-    apollo-server-core "^1.4.0"
-    apollo-server-module-graphiql "^1.4.0"
-
-apollo-server-module-graphiql@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.4.0.tgz#c559efa285578820709f1769bb85d3b3eed3d8ec"
-  integrity sha512-GmkOcb5he2x5gat+TuiTvabnBf1m4jzdecal3XbXBh/Jg+kx4hcvO3TTDFQ9CuTprtzdcVyA11iqG7iOMOt7vA==
-
-apollo-tracing@^0.1.0:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.1.4.tgz#5b8ae1b01526b160ee6e552a7f131923a9aedcc7"
-  integrity sha512-Uv+1nh5AsNmC3m130i2u3IqbS+nrxyVV3KYimH5QKsdPjxxIQB3JAT+jJmpeDxBel8gDVstNmCh82QSLxLSIdQ==
-  dependencies:
-    graphql-extensions "~0.0.9"
-
-apollo-utilities@1.3.4, apollo-utilities@^1.0.1, apollo-utilities@^1.3.0, apollo-utilities@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.4.tgz#6129e438e8be201b6c55b0f13ce49d2c7175c9cf"
-  integrity sha512-pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig==
-  dependencies:
-    "@wry/equality" "^0.1.2"
-    fast-json-stable-stringify "^2.0.0"
-    ts-invariant "^0.4.0"
-    tslib "^1.10.0"
-
 "aproba@^1.0.3 || ^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
@@ -3419,6 +3636,13 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
+async-retry@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280"
+  integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==
+  dependencies:
+    retry "0.13.1"
+
 async@^2.6.1, async@^2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
@@ -3966,6 +4190,24 @@ body-parser@1.20.1, body-parser@^1.15.2:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
+body-parser@^1.20.0:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
+  dependencies:
+    bytes "3.1.2"
+    content-type "~1.0.5"
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    on-finished "2.4.1"
+    qs "6.11.0"
+    raw-body "2.5.2"
+    type-is "~1.6.18"
+    unpipe "1.0.0"
+
 bonjour-service@^1.0.11:
   version "1.0.14"
   resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.14.tgz#c346f5bc84e87802d08f8d5a60b93f758e514ee7"
@@ -4935,6 +5177,11 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
+content-type@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
+
 convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
@@ -5005,7 +5252,7 @@ core-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
   integrity sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==
 
-core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.5.3, core-js@^2.6.5:
+core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.6.5:
   version "2.6.12"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
@@ -5025,6 +5272,14 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
+cors@^2.8.5:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
+  dependencies:
+    object-assign "^4"
+    vary "^1"
+
 cosmiconfig@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
@@ -5103,6 +5358,13 @@ cross-fetch@^3.0.4:
   dependencies:
     node-fetch "2.6.7"
 
+cross-inspect@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cross-inspect/-/cross-inspect-1.0.0.tgz#5fda1af759a148594d2d58394a9e21364f6849af"
+  integrity sha512-4PFfn4b5ZN6FMNGSZlyb7wUhuN8wvj8t/VQHZdM4JsDcruGJ8L2kf9zao98QIrBPFCpdk27qst/AGTl7pL3ypQ==
+  dependencies:
+    tslib "^2.4.0"
+
 cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -5686,11 +5948,6 @@ depd@^1.1.2, depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
-deprecated-decorator@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz#00966317b7a12fe92f3cc831f7583af329b86c37"
-  integrity sha512-MHidOOnCHGlZDKsI21+mbIIhf4Fff+hhCTB7gtVg4uoIqjcrTZc5v6M+GS2zVI0sV7PqK415rb8XaOSQsQkHOw==
-
 deps-sort@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.1.tgz#9dfdc876d2bcec3386b6829ac52162cda9fa208d"
@@ -5995,6 +6252,11 @@ draft-js@^0.11.7:
     immutable "~3.7.4"
     object-assign "^4.1.1"
 
+dset@^3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.3.tgz#c194147f159841148e8e34ca41f638556d9542d2"
+  integrity sha512-20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ==
+
 duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
@@ -7790,43 +8052,22 @@ graphql-date@^1.0.3:
   dependencies:
     assert-err "^1.0.0"
 
-graphql-extensions@^0.0.x, graphql-extensions@~0.0.9:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.0.10.tgz#34bdb2546d43f6a5bc89ab23c295ec0466c6843d"
-  integrity sha512-TnQueqUDCYzOSrpQb3q1ngDSP2otJSF+9yNLrQGPzkMsvnQ+v6e2d5tl+B35D4y+XpmvVnAn4T3ZK28mkILveA==
-  dependencies:
-    core-js "^2.5.3"
-    source-map-support "^0.5.1"
-
-graphql-tag@^2.10.3:
+graphql-tag@^2.12.6:
   version "2.12.6"
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
   integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==
   dependencies:
     tslib "^2.1.0"
 
-graphql-tools@^2.8.0:
-  version "2.24.0"
-  resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-2.24.0.tgz#bbacaad03924012a0edb8735a5e65df5d5563675"
-  integrity sha512-Mz9I7jyizrd+RafC/5EogJKTVzBbIddDCrW0sP5QLmsVVM3ujfhqVYu2lEXOaJW8Sy18f3ZICHirmKcn6oMAcA==
-  dependencies:
-    apollo-link "^1.2.1"
-    apollo-utilities "^1.0.1"
-    deprecated-decorator "^0.1.6"
-    iterall "^1.1.3"
-    uuid "^3.1.0"
-
-graphql-type-json@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/graphql-type-json/-/graphql-type-json-0.1.4.tgz#89f13f5d32ce08c9a76c79fdf9c1968384d81a4e"
-  integrity sha512-B1zeWRF50alRvW94s/hpkGbVqvRLTtJD0yEyMs6KAvDSlNyBzJCu/d51fLZalqrVntuJAVgXYh13GbUEqe9MrQ==
+graphql-type-json@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/graphql-type-json/-/graphql-type-json-0.3.2.tgz#f53a851dbfe07bd1c8157d24150064baab41e115"
+  integrity sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg==
 
-graphql@^0.13.2:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.13.2.tgz#4c740ae3c222823e7004096f832e7b93b2108270"
-  integrity sha512-QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==
-  dependencies:
-    iterall "^1.2.1"
+graphql@^16.8.1:
+  version "16.8.1"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.8.1.tgz#1930a965bef1170603702acdb68aedd3f3cf6f07"
+  integrity sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==
 
 gtoken@^2.3.2:
   version "2.3.3"
@@ -9111,11 +9352,6 @@ items@2.x.x:
   resolved "https://registry.yarnpkg.com/items/-/items-2.1.2.tgz#0849354595805d586dac98e7e6e85556ea838558"
   integrity sha512-kezcEqgB97BGeZZYtX/MA8AG410ptURstvnz5RAgyFZ8wQFPMxHY8GpTq+/ZHKT3frSlIthUq7EvLt9xn3TvXg==
 
-iterall@^1.1.3, iterall@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea"
-  integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==
-
 jake@^10.8.5:
   version "10.8.5"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
@@ -10498,6 +10734,11 @@ loglevel@^1.6.8:
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.1.tgz#5c621f83d5b48c54ae93b6156353f555963377b4"
   integrity sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==
 
+long@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
+  integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
+
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -10542,6 +10783,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@^7.10.1, lru-cache@^7.14.1:
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
+  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
+
 lru-cache@~2.2.1:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
@@ -11102,7 +11348,7 @@ needle@^1.4.2:
     debug "^2.1.2"
     iconv-lite "^0.4.4"
 
-negotiator@0.6.3, negotiator@^0.6.2:
+negotiator@0.6.3, negotiator@^0.6.2, negotiator@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -11155,6 +11401,11 @@ node-abort-controller@^1.0.4:
   resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-1.2.1.tgz#1eddb57eb8fea734198b11b28857596dc6165708"
   integrity sha512-79PYeJuj6S9+yOHirR0JBLFOgjB6sQCir10uN6xRx25iD+ZD4ULqgRn3MwWBRaQGB0vEgReJzWwJo42T1R6YbQ==
 
+node-abort-controller@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548"
+  integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==
+
 node-addon-api@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
@@ -11353,7 +11604,7 @@ oauth@0.9.x:
   resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1"
   integrity sha512-a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA==
 
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
@@ -11548,12 +11799,15 @@ opn@^5.5.0:
   dependencies:
     is-wsl "^1.1.0"
 
-optimism@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.10.3.tgz#163268fdc741dea2fb50f300bedda80356445fd7"
-  integrity sha512-9A5pqGoQk49H6Vhjb9kPgAeeECfUDF6aIICbMDL23kDLStBn1MWk3YvcZ4xWF9CsSf6XEgvRLkXy4xof/56vVw==
+optimism@^0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.18.0.tgz#e7bb38b24715f3fdad8a9a7fc18e999144bbfa63"
+  integrity sha512-tGn8+REwLRNFnb9WmcY5IfpOqeX2kpaYJ1s6Ae3mn12AeydLkR3j+jSCmVQFoXqU8D41PAJ1RG1rCRNWmNZVmQ==
   dependencies:
-    "@wry/context" "^0.4.0"
+    "@wry/caches" "^1.0.0"
+    "@wry/context" "^0.7.0"
+    "@wry/trie" "^0.4.3"
+    tslib "^2.3.0"
 
 optionator@^0.8.1:
   version "0.8.3"
@@ -13104,18 +13358,15 @@ raw-body@2.5.1, raw-body@^2.2.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-react-apollo@2.5.7:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-2.5.7.tgz#782b7f09a56fd9850520d112d3fdc2928f22bf1f"
-  integrity sha512-xNVnl3+XSFuPeSPJQncBuQt0tEazBSMtoCltEagreiYND+x/YlPhWVQX2shNQlnxe4g6yxlATaMHgur6iwQIhA==
+raw-body@2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
   dependencies:
-    apollo-utilities "^1.3.0"
-    fast-json-stable-stringify "^2.0.0"
-    hoist-non-react-statics "^3.3.0"
-    lodash.isequal "^4.5.0"
-    prop-types "^15.7.2"
-    ts-invariant "^0.4.2"
-    tslib "^1.9.3"
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
 
 react-app-polyfill@^3.0.0:
   version "3.0.0"
@@ -13866,6 +14117,11 @@ resolve@^2.0.0-next.3:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+response-iterator@^0.2.6:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/response-iterator/-/response-iterator-0.2.6.tgz#249005fb14d2e4eeb478a3f735a28fd8b4c9f3da"
+  integrity sha512-pVzEEzrsg23Sh053rmDUvLSkGXluZio0qu8VT6ukrYuvtjVfCbDZH9d6PGXb8HZfzdNZt8feXv/jvUzlhRgLnw==
+
 restore-cursor@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
@@ -13904,16 +14160,16 @@ rethinkdbdash@~2.3.0:
   dependencies:
     bluebird ">= 3.0.1"
 
+retry@0.13.1, retry@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
+  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
+
 retry@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
   integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
 
-retry@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
-  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
-
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
@@ -14298,7 +14554,7 @@ setprototypeof@1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-sha.js@^2.4.0, sha.js@^2.4.8:
+sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
   integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
@@ -14523,7 +14779,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.1, source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.20:
+source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.20:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -15120,11 +15376,16 @@ svgo@^2.7.0:
     picocolors "^1.0.0"
     stable "^0.1.8"
 
-symbol-observable@^1.0.2, symbol-observable@^1.0.4, symbol-observable@^1.1.0:
+symbol-observable@^1.0.4, symbol-observable@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
+symbol-observable@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz#5b425f192279e87f2f9b937ac8540d1984b39205"
+  integrity sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==
+
 symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -15496,12 +15757,12 @@ tryer@^1.0.1:
   resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
   integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
 
-ts-invariant@^0.4.0, ts-invariant@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.4.tgz#97a523518688f93aafad01b0e80eb803eb2abd86"
-  integrity sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA==
+ts-invariant@^0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.10.3.tgz#3e048ff96e91459ffca01304dbc7f61c1f642f6c"
+  integrity sha512-uivwYcQaxAucv1CzRp2n/QdYPo4ILf9VXgH19zEIjFx2EJufV16P0JtJVpYHy89DItG6Kwj2oIUjrcK5au+4tQ==
   dependencies:
-    tslib "^1.9.3"
+    tslib "^2.1.0"
 
 tsconfig-paths@^3.14.1:
   version "3.14.1"
@@ -15513,7 +15774,7 @@ tsconfig-paths@^3.14.1:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
@@ -15523,6 +15784,11 @@ tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
+tslib@^2.3.0, tslib@^2.4.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+
 tsscmp@1.0.6, tsscmp@~1.0.0:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
@@ -15900,7 +16166,7 @@ uuid@^2.0.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
   integrity sha512-FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg==
 
-uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2:
+uuid@^3.2.1, uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
@@ -15949,7 +16215,12 @@ validator@~3.34.0:
   resolved "https://registry.yarnpkg.com/validator/-/validator-3.34.0.tgz#67cb418121f8fbaef597d97376d61b0db5937cc6"
   integrity sha512-MhsDIQ9JAK5nq2szXjfXSJBpLetXd1laLqB5rPCQ9Xvuv5nRs0Wu8Uk3jORaiun7Egmh6VKYL7a7u7hhV9QFZQ==
 
-vary@~1.1.2:
+value-or-promise@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c"
+  integrity sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q==
+
+vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
@@ -16287,6 +16558,11 @@ whatwg-mimetype@^2.3.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
+whatwg-mimetype@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
+  integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
+
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
@@ -16784,15 +17060,14 @@ yup@>=0.32.3:
     property-expr "^2.0.4"
     toposort "^2.0.2"
 
-zen-observable-ts@^0.8.21:
-  version "0.8.21"
-  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz#85d0031fbbde1eba3cd07d3ba90da241215f421d"
-  integrity sha512-Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg==
+zen-observable-ts@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.2.5.tgz#6c6d9ea3d3a842812c6e9519209365a122ba8b58"
+  integrity sha512-QZWQekv6iB72Naeake9hS1KxHlotfRpe+WGNbNx5/ta+R3DNjVO2bswf63gXlWDcs+EMd7XY8HfVQyP1X6T4Zg==
   dependencies:
-    tslib "^1.9.3"
-    zen-observable "^0.8.0"
+    zen-observable "0.8.15"
 
-zen-observable@^0.8.0:
+zen-observable@0.8.15:
   version "0.8.15"
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
   integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==