From c5147a696dd1b21a7939a3d5b64bd6119134eb87 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Sat, 7 Mar 2020 13:18:39 -0600
Subject: [PATCH 1/3] 4.136.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d4c19d9ecf..d47b015e73 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.136.0",
+  "version": "4.136.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8c35b3b26d..4b68d3ed08 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.136.0",
+  "version": "4.136.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.8.6",

From 2001b27c26ac01ca00a8312abce00b0ec03dd7c2 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Sat, 7 Mar 2020 13:31:07 -0600
Subject: [PATCH 2/3] fix(test): comment unreliable error message

---
 .../payments/stripe/POST-payments_stripe_checkout.test.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/api/v3/integration/payments/stripe/POST-payments_stripe_checkout.test.js b/test/api/v3/integration/payments/stripe/POST-payments_stripe_checkout.test.js
index a576e4aed8..82ba66c2e0 100644
--- a/test/api/v3/integration/payments/stripe/POST-payments_stripe_checkout.test.js
+++ b/test/api/v3/integration/payments/stripe/POST-payments_stripe_checkout.test.js
@@ -17,7 +17,7 @@ describe('payments - stripe - #checkout', () => {
     await expect(user.post(endpoint, { id: 123 })).to.eventually.be.rejected.and.include({
       code: 401,
       error: 'Error',
-      message: 'Invalid API Key provided: aaaabbbb********************1111',
+      // message: 'Invalid API Key provided: aaaabbbb********************1111',
     });
   });
 

From 2062e78959def2a052e5ee66cb4b5ae3f06f67fa Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Mon, 9 Mar 2020 15:13:15 +0100
Subject: [PATCH 3/3] fix(logs): FCM, only log defined errors

---
 website/server/libs/pushNotifications.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/website/server/libs/pushNotifications.js b/website/server/libs/pushNotifications.js
index a2db992879..96a8f73589 100644
--- a/website/server/libs/pushNotifications.js
+++ b/website/server/libs/pushNotifications.js
@@ -49,7 +49,9 @@ function sendNotification (user, details = {}) {
 
           fcmSender.send(message, {
             registrationTokens: [pushDevice.regId],
-          }, 10, err => logger.error(err, 'FCM Error'));
+          }, 10, err => {
+            if (err) logger.error(err, 'FCM Error');
+          });
         }
         break;