From c94d039da8a6ff8f0709d4ec9fbe400386f91a61 Mon Sep 17 00:00:00 2001
From: Joe Julian <me@joejulian.name>
Date: Fri, 3 Apr 2026 07:18:10 -0700
Subject: [PATCH] Align phone header actions right

---
 main.go      | 13 ++++---------
 main_test.go |  7 ++++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/main.go b/main.go
index 68fedd0..22c094f 100644
--- a/main.go
+++ b/main.go
@@ -603,6 +603,9 @@ func newUIWithState(mode string, sess appstate.CurrentSession, paths statePaths)
 		backgroundResults:             make(chan backgroundActionResult, 8),
 		phoneGroupBrowserExpanded:     true,
 	}
+	if mode == "phone" {
+		u.groupControlsHidden = true
+	}
 	u.apiPolicyAllow.Value = true
 	u.apiPolicyGroupScopeW.Value = true
 	u.state.Session = sess
@@ -625,11 +628,6 @@ func newUIWithState(mode string, sess appstate.CurrentSession, paths statePaths)
 	u.restoreStartupLifecycleTarget()
 	u.requestMasterPassFocus = u.hasSelectedLifecycleTarget()
 	u.loadUIPreferences()
-	if u.mode == "phone" {
-		if _, err := os.Stat(u.uiPreferencesPath); err != nil {
-			u.groupControlsHidden = true
-		}
-	}
 	u.loadSettings()
 	u.loadSettingsFormFromPreferences()
 	u.loadSettingsDraft()
@@ -3911,10 +3909,7 @@ func (u *ui) header(gtx layout.Context) layout.Dimensions {
 		}
 		return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
 			layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-				return layout.Flex{Alignment: layout.Middle}.Layout(gtx,
-					layout.Flexed(1, func(gtx layout.Context) layout.Dimensions { return layout.Dimensions{} }),
-					layout.Rigid(u.headerActions),
-				)
+				return layout.E.Layout(gtx, u.headerActions)
 			}),
 			layout.Rigid(func(gtx layout.Context) layout.Dimensions {
 				if !u.mainMenuOpen {
diff --git a/main_test.go b/main_test.go
index 8917ce7..698cfe6 100644
--- a/main_test.go
+++ b/main_test.go
@@ -778,7 +778,12 @@ func TestUIPhoneGroupBrowserToggleDoesNotChangeCurrentGroupToolsState(t *testing
 func TestUIPhoneStartsWithGroupToolsCollapsed(t *testing.T) {
 	t.Parallel()
 
-	u := newUIWithModel("phone", vault.Model{})
+	u := newUIWithSession("phone", &session.Manager{}, statePaths{
+		DefaultSaveAsPath: filepath.Join(t.TempDir(), "default-save-path.kdbx"),
+		RecentVaultsPath:  filepath.Join(t.TempDir(), "recent-vaults.json"),
+		RecentRemotesPath: filepath.Join(t.TempDir(), "recent-remotes.json"),
+		UIPreferencesPath: filepath.Join(t.TempDir(), "ui-preferences.json"),
+	})
 	if !u.groupControlsHidden {
 		t.Fatal("groupControlsHidden = false, want phone Group Tools collapsed by default")
 	}