Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.183.0",
+  "version": "4.183.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.183.0",
+  "version": "4.183.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.12.10",

website/common/script/fns/randomDrop.js

@@ -179,7 +179,7 @@ export default function randomDrop (user, options, req = {}, analytics) {
       });
     }
 
-    if (isEnrolledInDropCapTest) {
+    if (isEnrolledInDropCapTest && dropCapReached) {
       analytics.track('drop cap reached', {
         uuid: user._id,
         dropCap: maxDropCount,

website/server/libs/analyticsService.js

@@ -251,6 +251,11 @@ function _sendDataToGoogle (eventType, data) {
 function _sendPurchaseDataToAmplitude (data) {
   const amplitudeData = _formatDataForAmplitude(data);
 
+  // Stripe transactions come via webhook. We can log these as Web events
+  if (data.paymentMethod === 'Stripe' && amplitudeData.platform === 'Unknown') {
+    amplitudeData.platform = 'Web';
+  }
+
   amplitudeData.event_type = 'purchase';
   amplitudeData.revenue = data.purchaseValue;