Refactor workspace settings handling in tests and components to use currentWorkspace directly

app/src/components/files/FileActions.test.tsx

@@ -23,7 +23,10 @@ describe('FileActions', () => {
   const mockSetDeleteFileModalVisible = vi.fn();
   const mockSetCommitMessageModalVisible = vi.fn();
 
-  const mockSettings = {
+  const mockCurrentWorkspace = {
+    id: 1,
+    name: 'Test Workspace',
+    createdAt: '2024-01-01T00:00:00Z',
     gitEnabled: true,
     gitAutoCommit: false,
     theme: Theme.Light,
@@ -61,9 +64,8 @@ describe('FileActions', () => {
 
     const { useWorkspace } = await import('../../hooks/useWorkspace');
     vi.mocked(useWorkspace).mockReturnValue({
-      currentWorkspace: null,
+      currentWorkspace: mockCurrentWorkspace,
       workspaces: [],
-      settings: mockSettings,
       updateSettings: vi.fn(),
       loading: false,
       colorScheme: 'light',
@@ -140,9 +142,8 @@ describe('FileActions', () => {
   it('disables git buttons when git is not enabled', async () => {
     const { useWorkspace } = await import('../../hooks/useWorkspace');
     vi.mocked(useWorkspace).mockReturnValue({
-      currentWorkspace: null,
+      currentWorkspace: { ...mockCurrentWorkspace, gitEnabled: false },
       workspaces: [],
-      settings: { ...mockSettings, gitEnabled: false },
       updateSettings: vi.fn(),
       loading: false,
       colorScheme: 'light',
@@ -186,9 +187,8 @@ describe('FileActions', () => {
   it('disables commit button when auto-commit is enabled', async () => {
     const { useWorkspace } = await import('../../hooks/useWorkspace');
     vi.mocked(useWorkspace).mockReturnValue({
-      currentWorkspace: null,
+      currentWorkspace: { ...mockCurrentWorkspace, gitAutoCommit: true },
       workspaces: [],
-      settings: { ...mockSettings, gitAutoCommit: true },
       updateSettings: vi.fn(),
       loading: false,
       colorScheme: 'light',

app/src/components/files/FileActions.tsx

@@ -18,7 +18,7 @@ const FileActions: React.FC<FileActionsProps> = ({
   handlePullChanges,
   selectedFile,
 }) => {
-  const { settings } = useWorkspace();
+  const { currentWorkspace } = useWorkspace();
   const {
     setNewFileModalVisible,
     setDeleteFileModalVisible,
@@ -61,7 +61,7 @@ const FileActions: React.FC<FileActionsProps> = ({
 
       <Tooltip
         label={
-          settings.gitEnabled
+          currentWorkspace?.gitEnabled
             ? 'Pull changes from remote'
             : 'Git is not enabled'
         }
@@ -74,7 +74,7 @@ const FileActions: React.FC<FileActionsProps> = ({
               console.error('Error pulling changes:', error);
             });
           }}
-          disabled={!settings.gitEnabled}
+          disabled={!currentWorkspace?.gitEnabled}
           aria-label="Pull changes from remote"
           data-testid="pull-changes-button"
         >
@@ -84,9 +84,9 @@ const FileActions: React.FC<FileActionsProps> = ({
 
       <Tooltip
         label={
-          !settings.gitEnabled
+          !currentWorkspace?.gitEnabled
             ? 'Git is not enabled'
-            : settings.gitAutoCommit
+            : currentWorkspace.gitAutoCommit
             ? 'Auto-commit is enabled'
             : 'Commit and push changes'
         }
@@ -95,7 +95,9 @@ const FileActions: React.FC<FileActionsProps> = ({
           variant="default"
           size="md"
           onClick={handleCommitAndPush}
-          disabled={!settings.gitEnabled || settings.gitAutoCommit}
+          disabled={
+            !currentWorkspace?.gitEnabled || currentWorkspace.gitAutoCommit
+          }
           aria-label="Commit and push changes"
           data-testid="commit-push-button"
         >