From e91ad99f567cb742a2cbbce5008b9503536162ea Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 17 Mar 2023 13:25:59 +0100
Subject: [PATCH 1/3] fix(webapp): join leave button for pending members

---
 webapp/components/Button/JoinLeaveButton.vue | 16 ++++++++--------
 webapp/pages/group/_id/_slug.vue             |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/webapp/components/Button/JoinLeaveButton.vue b/webapp/components/Button/JoinLeaveButton.vue
index 152039eb0..c2836a149 100644
--- a/webapp/components/Button/JoinLeaveButton.vue
+++ b/webapp/components/Button/JoinLeaveButton.vue
@@ -58,14 +58,6 @@ export default {
       }
       return this.$t('group.joinLeaveButton.join')
     },
-    tooltip() {
-      return {
-        content: this.$t('group.joinLeaveButton.tooltip'),
-        placement: 'right',
-        show: this.isMember && !this.isNonePendingMember && this.hovered,
-        trigger: this.isMember && !this.isNonePendingMember ? 'hover' : 'manual',
-      }
-    },
   },
   watch: {
     isMember() {
@@ -80,6 +72,14 @@ export default {
     ...mapMutations({
       commitModalData: 'modal/SET_OPEN',
     }),
+    tooltip() {
+      return {
+        content: this.$t('group.joinLeaveButton.tooltip'),
+        placement: 'right',
+        show: this.isMember && !this.isNonePendingMember && this.hovered,
+        trigger: this.isMember && !this.isNonePendingMember ? 'hover' : 'manual',
+      }
+    },
     onHover() {
       if (!this.disabled && !this.localLoading) {
         this.hovered = true
diff --git a/webapp/pages/group/_id/_slug.vue b/webapp/pages/group/_id/_slug.vue
index 1eda842d3..27b6a3cbc 100644
--- a/webapp/pages/group/_id/_slug.vue
+++ b/webapp/pages/group/_id/_slug.vue
@@ -565,7 +565,7 @@ export default {
     // },
     prepareJoinLeave() {
       // "membersCountStartValue" is updated to avoid counting from 0 when join/leave
-      this.membersCountStartValue = this.GroupMembers.length
+      this.membersCountStartValue = (this.GroupMembers && this.GroupMembers.length) || 0
     },
     updateJoinLeave({ myRoleInGroup }) {
       this.Group[0].myRole = myRoleInGroup

From 15391991f26addd0c972f13daa3ddee13e6a54e5 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Sat, 18 Mar 2023 12:28:28 +0100
Subject: [PATCH 2/3] get the tooltip working

---
 webapp/components/Button/JoinLeaveButton.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapp/components/Button/JoinLeaveButton.vue b/webapp/components/Button/JoinLeaveButton.vue
index c2836a149..f4cc2c009 100644
--- a/webapp/components/Button/JoinLeaveButton.vue
+++ b/webapp/components/Button/JoinLeaveButton.vue
@@ -58,6 +58,14 @@ export default {
       }
       return this.$t('group.joinLeaveButton.join')
     },
+    tooltip() {
+      return {
+        content: this.$t('group.joinLeaveButton.tooltip'),
+        placement: 'right',
+        show: this.isMember && !this.isNonePendingMember && this.hovered,
+        trigger: 'manual',
+      }
+    },
   },
   watch: {
     isMember() {
@@ -72,14 +80,6 @@ export default {
     ...mapMutations({
       commitModalData: 'modal/SET_OPEN',
     }),
-    tooltip() {
-      return {
-        content: this.$t('group.joinLeaveButton.tooltip'),
-        placement: 'right',
-        show: this.isMember && !this.isNonePendingMember && this.hovered,
-        trigger: this.isMember && !this.isNonePendingMember ? 'hover' : 'manual',
-      }
-    },
     onHover() {
       if (!this.disabled && !this.localLoading) {
         this.hovered = true

From a1b12568ef1d486c08e10a1f6892d897d56015d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 20 Mar 2023 13:36:02 +0100
Subject: [PATCH 3/3] Revert PR 'feat(webapp): on newsfeed add bigger y-gap
 between posts' #6121

---
 webapp/components/MasonryGrid/MasonryGrid.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/MasonryGrid/MasonryGrid.vue b/webapp/components/MasonryGrid/MasonryGrid.vue
index f95c0e16e..00afa31af 100644
--- a/webapp/components/MasonryGrid/MasonryGrid.vue
+++ b/webapp/components/MasonryGrid/MasonryGrid.vue
@@ -30,7 +30,7 @@ export default {
 /* dirty fix to override broken styleguide inline-styles */
 .ds-grid {
   grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)) !important;
-  gap: 32px 16px !important;
+  gap: 16px !important;
   grid-auto-rows: 20px;
 }