Merge branch 'develop' into fix-clear-sync-data

yanguoyu · Apr 29, 2024 · 02d3deb · 02d3deb · github-actions · Apr 29, 2024
2 parents dd6f616 + 76c3871
commit 02d3deb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/packages/neuron-wallet/src/services/settings.ts b/packages/neuron-wallet/src/services/settings.ts
@@ -100,7 +100,7 @@ export default class SettingsService extends Store {
 
   private onLocaleChanged = (lng: Locale) => {
     BrowserWindow.getAllWindows().forEach(bw => bw.webContents.send('set-locale', lng))
-    updateApplicationMenu(null)
+    updateApplicationMenu(BrowserWindow.getFocusedWindow())
   }
 
   migrateDataPath() {

diff --git a/packages/neuron-wallet/tests/services/setting.test.ts b/packages/neuron-wallet/tests/services/setting.test.ts
@@ -42,6 +42,7 @@ jest.mock('../../src/services/networks', () => {
 jest.mock('electron', () => ({
   BrowserWindow: {
     getAllWindows: jest.fn().mockReturnValue([]),
+    getFocusedWindow: jest.fn().mockReturnValue(null),
   },
 }))