diff --git a/package-lock.json b/package-lock.json index 720b71cda7..82d2c180bf 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", 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 }