Merge branch 'develop' into sabrecat/usernames-master

website/client/components/challenges/challengeDetail.vue

@@ -317,7 +317,7 @@ export default {
     },
     createTask (type) {
       this.taskFormPurpose = 'create';
-      this.creatingTask = taskDefaults({type, text: ''});
+      this.creatingTask = taskDefaults({type, text: ''}, this.user);
       this.workingTask = this.creatingTask;
       // Necessary otherwise the first time the modal is not rendered
       Vue.nextTick(() => {

website/client/components/chat/copyAsTodoModal.vue

@@ -45,7 +45,7 @@ export default {
         type: 'todo',
         notes,
       };
-      this.task = taskDefaults(newTask);
+      this.task = taskDefaults(newTask, this.$store.state.user.data);
       this.$root.$emit('bv::show::modal', 'copyAsTodo');
     });
   },

website/client/components/group-plans/taskInformation.vue

@@ -401,7 +401,7 @@ export default {
     },
     createTask (type) {
       this.taskFormPurpose = 'create';
-      this.creatingTask = taskDefaults({type, text: ''});
+      this.creatingTask = taskDefaults({type, text: ''}, this.user);
       this.workingTask = this.creatingTask;
       // Necessary otherwise the first time the modal is not rendered
       Vue.nextTick(() => {

website/client/components/inventory/items/index.vue

@@ -373,9 +373,12 @@ export default {
       if (potion === null || egg === null)
         return false;
 
-      let petKey = `${egg.key}-${potion.key}`;
+      const petKey = `${egg.key}-${potion.key}`;
 
-      if (!this.content.petInfo[petKey])
+      const petInfo = this.content.petInfo[petKey];
+
+      // Check pet exists and is hatchable
+      if (!petInfo || !petInfo.potion)
         return false;
 
       return !this.userHasPet(potion.key, egg.key);

website/client/components/tasks/column.vue

@@ -540,7 +540,7 @@ export default {
       const tasks = text.split('\n').reverse().filter(taskText => {
         return taskText ? true : false;
       }).map(taskText => {
-        const task = taskDefaults({type: this.type, text: taskText});
+        const task = taskDefaults({type: this.type, text: taskText}, this.user);
         task.tags = this.selectedTags;
         return task;
       });

website/client/components/tasks/task.vue

@@ -435,7 +435,7 @@
       cursor: default !important;
     }
 
-    .svg-icon.check {
+    .svg-icon.check:not(.display-check-icon) {
       display: none !important;
     }
   }

website/client/components/tasks/user.vue

@@ -445,7 +445,7 @@ export default {
     },
     createTask (type) {
       this.openCreateBtn = false;
-      this.creatingTask = taskDefaults({type, text: ''});
+      this.creatingTask = taskDefaults({type, text: ''}, this.user);
       this.creatingTask.tags = this.selectedTags;
 
       // Necessary otherwise the first time the modal is not rendered