From 32ccb004d018236226a2ab6d282df21341a02e5c Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Wed, 3 Jun 2026 11:53:49 +0100
Subject: [PATCH] Re-order the call buttons to match the Figma and Element Web.
 (#5696)

---
 .../View/RoomCallControlsToolbar.swift          | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomCallControlsToolbar.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomCallControlsToolbar.swift
index a037722fe..a896a1303 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/RoomCallControlsToolbar.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/RoomCallControlsToolbar.swift
@@ -46,14 +46,6 @@ struct RoomCallControlsToolbar: ToolbarContent {
                         .disabled(!viewState.canJoinCall)
                     }
                 } else {
-                    ToolbarItem(placement: .primaryAction) {
-                        Button { onCallTap(true) } label: {
-                            CompoundIcon(\.voiceCallSolid)
-                        }
-                        .accessibilityLabel(L10n.a11yStartVoiceCall)
-                        .accessibilityIdentifier(A11yIdentifiers.roomScreen.startVoiceCall)
-                        .disabled(!viewState.canJoinCall)
-                    }
                     ToolbarItem(placement: .primaryAction) {
                         Button { onCallTap(false) } label: {
                             CompoundIcon(\.videoCallSolid)
@@ -62,6 +54,15 @@ struct RoomCallControlsToolbar: ToolbarContent {
                         .accessibilityIdentifier(A11yIdentifiers.roomScreen.startVideoCall)
                         .disabled(!viewState.canJoinCall)
                     }
+                    
+                    ToolbarItem(placement: .primaryAction) {
+                        Button { onCallTap(true) } label: {
+                            CompoundIcon(\.voiceCallSolid)
+                        }
+                        .accessibilityLabel(L10n.a11yStartVoiceCall)
+                        .accessibilityIdentifier(A11yIdentifiers.roomScreen.startVoiceCall)
+                        .disabled(!viewState.canJoinCall)
+                    }
                 }
             } else {
                 ToolbarItem(placement: .primaryAction) {