From 953c84260f1812c4c6ae1a11ed6778a468294651 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Fri, 11 Sep 2020 19:53:28 +0200
Subject: [PATCH 1/2] fix(tasks and groupd): do not apply default due filter to
 challenges, fix edge case in group loading

---
 website/client/src/components/group-plans/index.vue | 3 ++-
 website/client/src/components/tasks/column.vue      | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/website/client/src/components/group-plans/index.vue b/website/client/src/components/group-plans/index.vue
index 53da4f72d2..bd4fd903da 100644
--- a/website/client/src/components/group-plans/index.vue
+++ b/website/client/src/components/group-plans/index.vue
@@ -51,7 +51,8 @@ export default {
       groupPlans: 'groupPlans.data',
     }),
     currentGroup () {
-      const groupFound = this.groupPlans.find(group => group._id === this.groupId);
+      const groupFound = this.groupPlans
+        && this.groupPlans.find(group => group._id === this.groupId);
 
       return groupFound;
     },
diff --git a/website/client/src/components/tasks/column.vue b/website/client/src/components/tasks/column.vue
index cf3e767668..b22aa18fc1 100644
--- a/website/client/src/components/tasks/column.vue
+++ b/website/client/src/components/tasks/column.vue
@@ -637,7 +637,10 @@ export default {
       // as default filter for daily
       // and set the filter as 'due' only when the component first
       // loads and not on subsequent reloads.
-      if (type === 'daily' && filter === '' && this.user.preferences.dailyDueDefaultView) {
+      if (
+        type === 'daily' && filter === '' && !this.challenge
+        && this.user.preferences.dailyDueDefaultView
+      ) {
         filter = 'due'; // eslint-disable-line no-param-reassign
       }
 

From da796c305d0deade9e2531527537b232de4997cc Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Fri, 11 Sep 2020 12:56:06 -0500
Subject: [PATCH 2/2] 4.156.3

---
 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 f4af436428..97040543ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.156.2",
+  "version": "4.156.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 22043becce..01ff91801c 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.156.2",
+  "version": "4.156.3",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.11.6",