[DDW-881] Enhance logic for updating menus (#2838)

Co-authored-by: Michael Chappell <[email protected]>

Author: szymonmaslowski

CHANGELOG.md

@@ -11,8 +11,9 @@
 
 ### Fixes
 
+- Fixed behaviour of wallet settings option of the app menu ([PR 2838](https://github.com/input-output-hk/daedalus/pull/2838))
 - Fixed available disk space takes a long time to show ([PR 2849](https://github.com/input-output-hk/daedalus/pull/2849))
-  
+
 ### Chores
 
 - Migrated codebase from javascript to typescript ([PR 2843](https://github.com/input-output-hk/daedalus/pull/2843))

source/common/config/electron-store.config.ts

@@ -10,7 +10,6 @@ export const STORAGE_KEYS: Record<string, StorageKey> = {
   APP_AUTOMATIC_UPDATE_FAILED: 'APP-AUTOMATIC-UPDATE-FAILED',
   APP_UPDATE_COMPLETED: 'APP-UPDATE-COMPLETED',
   ASSET_DATA: 'ASSET-DATA',
-  ASSET_SETTINGS_DIALOG_WAS_OPENED: 'ASSET-SETTINGS-DIALOG-WAS-OPENED',
   CURRENCY_ACTIVE: 'CURRENCY-ACTIVE',
   CURRENCY_SELECTED: 'CURRENCY-SELECTED',
   DATA_LAYER_MIGRATION_ACCEPTANCE: 'DATA-LAYER-MIGRATION-ACCEPTANCE',

source/common/ipc/api.ts

@@ -178,9 +178,15 @@ export type SubmitBugReportRequestMainResponse = void;
 /**
  * Channel to rebuild the electron application menu after the language setting changes
  */
+export enum WalletSettingsStateEnum {
+  hidden = 'hidden',
+  disabled = 'disabled',
+  enabled = 'enabled',
+}
 export const REBUILD_APP_MENU_CHANNEL = 'REBUILD_APP_MENU_CHANNEL';
 export type RebuildAppMenuRendererRequest = {
   isNavigationEnabled: boolean;
+  walletSettingsState: WalletSettingsStateEnum;
 };
 export type RebuildAppMenuMainResponse = void;
 
@@ -312,14 +318,6 @@ export const GENERATE_WALLET_MIGRATION_REPORT_CHANNEL =
 export type GenerateWalletMigrationReportRendererRequest = WalletMigrationReportData;
 export type GenerateWalletMigrationReportMainResponse = void;
 
-/**
- * Channel for enabling application menu navigation
- */
-export const ENABLE_APPLICATION_MENU_NAVIGATION_CHANNEL =
-  'ENABLE_APPLICATION_MENU_NAVIGATION_CHANNEL';
-export type EnableApplicationMenuNavigationRendererRequest = void;
-export type EnableApplicationMenuNavigationMainResponse = void;
-
 /**
  * Channel for generating wallet migration report
  */

source/main/index.ts

@@ -4,6 +4,7 @@ import { app, dialog, BrowserWindow, screen, shell } from 'electron';
 import type { Event } from 'electron';
 import { client } from 'electron-connect';
 import EventEmitter from 'events';
+import { WalletSettingsStateEnum } from '../common/ipc/api';
 import { requestElectronStore } from './ipc/electronStoreConversation';
 import { logger } from './utils/logging';
 import {
@@ -43,7 +44,6 @@ import type {
 import { logUsedVersion } from './utils/logUsedVersion';
 import { setStateSnapshotLogChannel } from './ipc/set-log-state-snapshot';
 import { generateWalletMigrationReportChannel } from './ipc/generateWalletMigrationReportChannel';
-import { enableApplicationMenuNavigationChannel } from './ipc/enableApplicationMenuNavigationChannel';
 import { pauseActiveDownloads } from './ipc/downloadManagerChannel';
 import {
   restoreSavedWindowBounds,
@@ -198,28 +198,20 @@ const onAppReady = async () => {
   // @ts-ignore ts-migrate(2345) FIXME: Argument of type 'unknown' is not assignable to pa... Remove this comment to see the full error message
   buildAppMenus(mainWindow, cardanoNode, userLocale, {
     isNavigationEnabled: false,
+    walletSettingsState: WalletSettingsStateEnum.hidden,
   });
-  enableApplicationMenuNavigationChannel.onReceive(
-    () =>
-      new Promise((resolve) => {
-        const locale = getLocale(network);
-        // @ts-ignore ts-migrate(2345) FIXME: Argument of type 'unknown' is not assignable to pa... Remove this comment to see the full error message
-        buildAppMenus(mainWindow, cardanoNode, locale, {
-          isNavigationEnabled: true,
-        });
-        resolve();
-      })
-  );
   rebuildApplicationMenu.onReceive(
-    (data) =>
+    ({ walletSettingsState, isNavigationEnabled }) =>
       new Promise((resolve) => {
         const locale = getLocale(network);
         // @ts-ignore ts-migrate(2345) FIXME: Argument of type 'unknown' is not assignable to pa... Remove this comment to see the full error message
         buildAppMenus(mainWindow, cardanoNode, locale, {
-          isNavigationEnabled: data.isNavigationEnabled,
+          isNavigationEnabled,
+          walletSettingsState,
         });
         // @ts-ignore ts-migrate(2339) FIXME: Property 'updateTitle' does not exist on type 'Bro... Remove this comment to see the full error message
         mainWindow.updateTitle(locale);
+        // @ts-ignore ts-migrate(2794) FIXME: Expected 1 arguments, but got 0. Did you forget to... Remove this comment to see the full error message
         resolve();
       })
   );

source/main/ipc/enableApplicationMenuNavigationChannel.ts

@@ -8,6 +8,7 @@ import { showUiPartChannel } from '../ipc/control-ui-parts';
 import { NOTIFICATIONS } from '../../common/ipc/constants';
 import { generateSupportRequestLink } from '../../common/utils/reporting';
 import { buildKnownIssueFixesSubmenu } from './submenuBuilders';
+import { WalletSettingsStateEnum } from '../../common/ipc/api';
 
 const id = 'menu';
 export const osxMenu = (
@@ -17,6 +18,7 @@ export const osxMenu = (
   translations: {},
   locale: string,
   isNavigationEnabled: boolean,
+  walletSettingsState: WalletSettingsStateEnum,
   translation: (...args: Array<any>) => any = getTranslation(translations, id)
 ) => [
   {
@@ -65,7 +67,10 @@ export const osxMenu = (
           actions.openWalletSettingsPage();
         },
 
-        enabled: isNavigationEnabled,
+        enabled:
+          isNavigationEnabled &&
+          walletSettingsState === WalletSettingsStateEnum.enabled,
+        visible: walletSettingsState !== WalletSettingsStateEnum.hidden,
       },
       {
         type: 'separator',

source/main/menus/osx.ts

@@ -8,6 +8,7 @@ import { NOTIFICATIONS } from '../../common/ipc/constants';
 import { showUiPartChannel } from '../ipc/control-ui-parts';
 import { generateSupportRequestLink } from '../../common/utils/reporting';
 import { buildKnownIssueFixesSubmenu } from './submenuBuilders';
+import { WalletSettingsStateEnum } from '../../common/ipc/api';
 
 const id = 'menu';
 export const winLinuxMenu = (
@@ -17,6 +18,7 @@ export const winLinuxMenu = (
   translations: {},
   locale: string,
   isNavigationEnabled: boolean,
+  walletSettingsState: WalletSettingsStateEnum,
   translation: (...args: Array<any>) => any = getTranslation(translations, id)
 ) => [
   {
@@ -127,7 +129,10 @@ export const winLinuxMenu = (
           actions.openWalletSettingsPage();
         },
 
-        enabled: isNavigationEnabled,
+        enabled:
+          isNavigationEnabled &&
+          walletSettingsState === WalletSettingsStateEnum.enabled,
+        visible: walletSettingsState !== WalletSettingsStateEnum.hidden,
       },
       {
         type: 'separator',

source/main/menus/win-linux.ts

@@ -1,4 +1,5 @@
 import { app, BrowserWindow, dialog, globalShortcut, Menu } from 'electron';
+import { WalletSettingsStateEnum } from '../../common/ipc/api';
 import { environment } from '../environment';
 import { winLinuxMenu } from '../menus/win-linux';
 import { osxMenu } from '../menus/osx';
@@ -9,13 +10,15 @@ import { DIALOGS, PAGES } from '../../common/ipc/constants';
 import { showUiPartChannel } from '../ipc/control-ui-parts';
 import { getTranslation } from './getTranslation';
 
+interface Data {
+  isNavigationEnabled: boolean;
+  walletSettingsState: WalletSettingsStateEnum;
+}
 export const buildAppMenus = async (
   mainWindow: BrowserWindow,
   cardanoNode: CardanoNode | null | undefined,
   locale: string,
-  data: {
-    isNavigationEnabled: boolean;
-  }
+  { isNavigationEnabled, walletSettingsState }: Data
 ) => {
   const {
     ABOUT,
@@ -24,7 +27,6 @@ export const buildAppMenus = async (
     TOGGLE_RTS_FLAGS_MODE,
   } = DIALOGS;
   const { SETTINGS, WALLET_SETTINGS } = PAGES;
-  const { isNavigationEnabled } = data;
   const { isMacOS, isBlankScreenFixActive } = environment;
 
   const translations = require(`../locales/${locale}`);
@@ -136,7 +138,8 @@ export const buildAppMenus = async (
         menuActions,
         translations,
         locale,
-        isNavigationEnabled
+        isNavigationEnabled,
+        walletSettingsState
       )
     );
     Menu.setApplicationMenu(menu);
@@ -149,7 +152,8 @@ export const buildAppMenus = async (
         menuActions,
         translations,
         locale,
-        isNavigationEnabled
+        isNavigationEnabled,
+        walletSettingsState
       )
     );
     mainWindow.setMenu(menu);

source/main/utils/buildAppMenus.ts

@@ -21,6 +21,7 @@ import type { ActionsMap } from './actions/index';
 import NewsFeedContainer from './containers/news/NewsFeedContainer';
 import ToggleRTSFlagsDialogContainer from './containers/knownIssues/ToggleRTSFlagsDialogContainer';
 import RTSFlagsRecommendationOverlayContainer from './containers/knownIssues/RTSFlagsRecommendationOverlayContainer';
+import { MenuUpdater } from './containers/MenuUpdater';
 
 @observer
 class App extends Component<{
@@ -61,6 +62,7 @@ class App extends Component<{
         {/* @ts-ignore ts-migrate(2769) FIXME: No overload matches this call. */}
         <ThemeManager variables={themeVars} />
         <Provider stores={stores} actions={actions}>
+          <MenuUpdater />
           <ThemeProvider
             theme={daedalusTheme}
             skins={SimpleSkins}

source/renderer/app/App.tsx

@@ -2,14 +2,14 @@ import Action from './lib/Action';
 import type { AssetToken } from '../api/assets/types'; // ======= ASSETS ACTIONS =======
 
 export default class AssetsActions {
-  onAssetSettingsOpen: Action<{
+  setEditedAsset: Action<{
     asset: AssetToken;
   }> = new Action();
   onAssetSettingsSubmit: Action<{
     asset: AssetToken;
     decimals: number;
   }> = new Action();
-  onAssetSettingsCancel: Action<any> = new Action();
+  unsetEditedAsset: Action<any> = new Action();
   onOpenAssetSend: Action<{
     uniqueId: string;
   }> = new Action();