Move every Activities.findOne(idOrFirstObjectSelector, options) to the ReactiveCache

models/cardComments.js

@@ -217,7 +217,7 @@ if (Meteor.isServer) {
       listId: card.listId,
       swimlaneId: card.swimlaneId,
     });
-    const activity = Activities.findOne({ commentId: doc._id });
+    const activity = ReactiveCache.getActivity({ commentId: doc._id });
     if (activity) {
       Activities.remove(activity._id);
     }

models/customFields.js

@@ -219,7 +219,7 @@ function customFieldDeletion(userId, doc) {
 // instead it shows undefined, and no listId and swimlaneId.
 function customFieldEdit(userId, doc) {
   const card = ReactiveCache.getCard(doc.cardId);
-  const customFieldValue = Activities.findOne({ customFieldId: doc._id }).value;
+  const customFieldValue = ReactiveCache.getActivity({ customFieldId: doc._id }).value;
   Activities.insert({
     userId,
     activityType: 'setCustomField',