diff --git a/packages/cli/src/ui/components/FolderTrustDialog.test.tsx b/packages/cli/src/ui/components/FolderTrustDialog.test.tsx
index df7d7b60..bdc6a2af 100644
--- a/packages/cli/src/ui/components/FolderTrustDialog.test.tsx
+++ b/packages/cli/src/ui/components/FolderTrustDialog.test.tsx
@@ -30,7 +30,7 @@ describe('FolderTrustDialog', () => {
 
     expect(lastFrame()).toContain('Do you trust this folder?');
     expect(lastFrame()).toContain(
-      'Trusting a folder allows Gemini to execute commands it suggests.',
+      'Trusting a folder allows Qwen Code to execute commands it suggests.',
     );
   });
 
diff --git a/packages/cli/src/ui/components/SettingsDialog.test.tsx b/packages/cli/src/ui/components/SettingsDialog.test.tsx
index 65154e76..c6490512 100644
--- a/packages/cli/src/ui/components/SettingsDialog.test.tsx
+++ b/packages/cli/src/ui/components/SettingsDialog.test.tsx
@@ -429,7 +429,7 @@ describe('SettingsDialog', () => {
         <KeypressProvider kittyProtocolEnabled={false}>
           <SettingsDialog
             settings={settings}
-            onSelect={() => { }}
+            onSelect={() => {}}
             onRestartRequest={onRestartRequest}
           />
         </KeypressProvider>,
@@ -450,7 +450,7 @@ describe('SettingsDialog', () => {
         <KeypressProvider kittyProtocolEnabled={false}>
           <SettingsDialog
             settings={settings}
-            onSelect={() => { }}
+            onSelect={() => {}}
             onRestartRequest={onRestartRequest}
           />
         </KeypressProvider>,
@@ -973,7 +973,7 @@ describe('SettingsDialog', () => {
         <KeypressProvider kittyProtocolEnabled={false}>
           <SettingsDialog
             settings={settings}
-            onSelect={() => { }}
+            onSelect={() => {}}
             onRestartRequest={onRestartRequest}
           />
         </KeypressProvider>,
diff --git a/packages/cli/src/ui/components/SettingsDialog.tsx b/packages/cli/src/ui/components/SettingsDialog.tsx
index 5fedeede..223e1eba 100644
--- a/packages/cli/src/ui/components/SettingsDialog.tsx
+++ b/packages/cli/src/ui/components/SettingsDialog.tsx
@@ -544,16 +544,16 @@ export function SettingsDialog({
                     ? defaultValue
                     : false
                   : typeof defaultValue === 'number' ||
-                    typeof defaultValue === 'string'
+                      typeof defaultValue === 'string'
                     ? defaultValue
                     : undefined;
               const immediateSettingsObject =
                 toSaveValue !== undefined
                   ? setPendingSettingValueAny(
-                    currentSetting.value,
-                    toSaveValue,
-                    {} as Settings,
-                  )
+                      currentSetting.value,
+                      toSaveValue,
+                      {} as Settings,
+                    )
                   : ({} as Settings);
 
               saveModifiedSettings(
diff --git a/packages/cli/src/ui/contexts/KeypressContext.tsx b/packages/cli/src/ui/contexts/KeypressContext.tsx
index 8741614e..0bdc4168 100644
--- a/packages/cli/src/ui/contexts/KeypressContext.tsx
+++ b/packages/cli/src/ui/contexts/KeypressContext.tsx
@@ -495,8 +495,6 @@ export function KeypressProvider({
     stdin,
     setRawMode,
     kittyProtocolEnabled,
-    config,
-    subscribers,
     debugKeystrokeLogging,
     pasteWorkaround,
     config,
diff --git a/packages/core/src/services/gitService.test.ts b/packages/core/src/services/gitService.test.ts
index 122bbdf9..bd38a96f 100644
--- a/packages/core/src/services/gitService.test.ts
+++ b/packages/core/src/services/gitService.test.ts
@@ -176,7 +176,7 @@ describe('GitService', () => {
       await service.setupShadowGitRepository();
 
       const expectedConfigContent =
-        '[user]\n  name = Qwen Code\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n';
+        '[user]\n  name = Qwen Code\n  email = qwen-code@qwen.ai\n[commit]\n  gpgsign = false\n';
       const actualConfigContent = await fs.readFile(gitConfigPath, 'utf-8');
       expect(actualConfigContent).toBe(expectedConfigContent);
     });