Skip to content

Commit

Permalink
[DDW-892] Use fresh locale while rebuilding the application menu (#2813)
Browse files Browse the repository at this point in the history
Co-authored-by: Daniel Main <daniel.main.cernhoff@icloud.com>
  • Loading branch information
szymonmaslowski and danielmain committed Jan 14, 2022
1 parent b5b7664 commit 7ec4afd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Fixes

- Fixed immediate language updates of application top menu bar ([PR 2813](https://github.com/input-output-hk/daedalus/pull/2813))
- Fixed receiver address validation by disallowing rewards addresses ([PR 2781](https://github.com/input-output-hk/daedalus/pull/2781))

### Chores
Expand Down
8 changes: 5 additions & 3 deletions source/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,8 @@ const onAppReady = async () => {
enableApplicationMenuNavigationChannel.onReceive(
() =>
new Promise((resolve) => {
buildAppMenus(mainWindow, cardanoNode, userLocale, {
const locale = getLocale(network);
buildAppMenus(mainWindow, cardanoNode, locale, {
isNavigationEnabled: true,
});
resolve();
Expand All @@ -182,10 +183,11 @@ const onAppReady = async () => {
rebuildApplicationMenu.onReceive(
(data) =>
new Promise((resolve) => {
buildAppMenus(mainWindow, cardanoNode, userLocale, {
const locale = getLocale(network);
buildAppMenus(mainWindow, cardanoNode, locale, {
isNavigationEnabled: data.isNavigationEnabled,
});
mainWindow.updateTitle(userLocale);
mainWindow.updateTitle(locale);
resolve();
})
);
Expand Down

0 comments on commit 7ec4afd

Please sign in to comment.