Merge branch 'develop' into alfogrillo/learn_more_sheet

2026-04-29 12:46:58 +02:00 · 2022-11-03 17:29:01 +01:00
parent d5d2508eb1 3141c39cab
commit b4d5c3b904
9 changed files with 83 additions and 79 deletions
@@ -87,7 +87,11 @@ struct UserOtherSessionsToolbar: ToolbarContent {
                }
                .disabled(sessionCount == 0)
                if sessionCount > 0 {
-                    signOutButton()
+                    DestructiveButton {
+                        onSignOut()
+                    } label: {
+                        Label(VectorL10n.userOtherSessionMenuSignOutSessions(String(sessionCount)), systemImage: "rectangle.portrait.and.arrow.forward.fill")
+                    }
                }
            } label: {
                Image(systemName: "ellipsis")
@@ -96,22 +100,4 @@ struct UserOtherSessionsToolbar: ToolbarContent {
            }
        }
    }
-    
-    @ViewBuilder
-    private func signOutButton() -> some View {
-        let label = Label(VectorL10n.userOtherSessionMenuSignOutSessions(String(sessionCount)), systemImage: "rectangle.portrait.and.arrow.forward.fill")
-        if #available(iOS 15, *) {
-            Button(role: .destructive) {
-                onSignOut()
-            } label: {
-                label
-            }
-        } else {
-            Button {
-                onSignOut()
-            } label: {
-                label
-            }
-        }
-    }
 }