From e9f81ce24f0e53dbff7de70052aeec337d0569a7 Mon Sep 17 00:00:00 2001 From: Yakov karavelov Date: Thu, 21 Jan 2021 02:09:17 -0800 Subject: [PATCH] [DDW-536]: Remove unnecessary channel for disabling menu items --- source/common/ipc/api.js | 8 -------- source/main/index.js | 12 ------------ .../ipc/disableApplicationMenuNavigationChannel.js | 13 ------------- .../ipc/disableApplicationMenuNavigationChannel.js | 13 ------------- source/renderer/app/stores/ProfileStore.js | 3 --- 5 files changed, 49 deletions(-) delete mode 100644 source/main/ipc/disableApplicationMenuNavigationChannel.js delete mode 100644 source/renderer/app/ipc/disableApplicationMenuNavigationChannel.js diff --git a/source/common/ipc/api.js b/source/common/ipc/api.js index 965a0eea57..f4cf75ff1a 100644 --- a/source/common/ipc/api.js +++ b/source/common/ipc/api.js @@ -295,14 +295,6 @@ export const GENERATE_WALLET_MIGRATION_REPORT_CHANNEL = export type GenerateWalletMigrationReportRendererRequest = WalletMigrationReportData; export type GenerateWalletMigrationReportMainResponse = void; -/** - * Channel for entering terms of use page - */ -export const DISABLE_APPLICATION_MENU_NAVIGATION_CHANNEL = - 'DISABLE_APPLICATION_MENU_NAVIGATION_CHANNEL'; -export type DisableApplicationMenuNavigationRendererRequest = void; -export type DisableApplicationMenuNavigationMainResponse = void; - /** * Channel for exiting from terms of use page */ diff --git a/source/main/index.js b/source/main/index.js index 91a59c819f..b982a3d4d3 100644 --- a/source/main/index.js +++ b/source/main/index.js @@ -37,7 +37,6 @@ import type { CheckDiskSpaceResponse } from '../common/types/no-disk-space.types import { logUsedVersion } from './utils/logUsedVersion'; import { setStateSnapshotLogChannel } from './ipc/set-log-state-snapshot'; import { generateWalletMigrationReportChannel } from './ipc/generateWalletMigrationReportChannel'; -import { disableApplicationMenuNavigationChannel } from './ipc/disableApplicationMenuNavigationChannel'; import { enableApplicationMenuNavigationChannel } from './ipc/enableApplicationMenuNavigationChannel'; import { pauseActiveDownloads } from './ipc/downloadManagerChannel'; // import { isHardwareWalletSupportEnabled, isLedgerEnabled } from '../renderer/app/config/hardwareWalletsConfig'; @@ -209,17 +208,6 @@ const onAppReady = async () => { isNavigationEnabled: false, }); - await disableApplicationMenuNavigationChannel.onReceive( - () => - new Promise((resolve) => { - buildAppMenus(mainWindow, cardanoNode, locale, { - isUpdateAvailable: false, - isNavigationEnabled: false, - }); - resolve(); - }) - ); - await enableApplicationMenuNavigationChannel.onReceive( () => new Promise((resolve) => { diff --git a/source/main/ipc/disableApplicationMenuNavigationChannel.js b/source/main/ipc/disableApplicationMenuNavigationChannel.js deleted file mode 100644 index 793123f25f..0000000000 --- a/source/main/ipc/disableApplicationMenuNavigationChannel.js +++ /dev/null @@ -1,13 +0,0 @@ -// @flow -import { MainIpcChannel } from './lib/MainIpcChannel'; -import { DISABLE_APPLICATION_MENU_NAVIGATION_CHANNEL } from '../../common/ipc/api'; -import type { - DisableApplicationMenuNavigationMainResponse, - DisableApplicationMenuNavigationRendererRequest, -} from '../../common/ipc/api'; - -export const disableApplicationMenuNavigationChannel: // IpcChannel -MainIpcChannel< - DisableApplicationMenuNavigationRendererRequest, - DisableApplicationMenuNavigationMainResponse -> = new MainIpcChannel(DISABLE_APPLICATION_MENU_NAVIGATION_CHANNEL); diff --git a/source/renderer/app/ipc/disableApplicationMenuNavigationChannel.js b/source/renderer/app/ipc/disableApplicationMenuNavigationChannel.js deleted file mode 100644 index bd611eee42..0000000000 --- a/source/renderer/app/ipc/disableApplicationMenuNavigationChannel.js +++ /dev/null @@ -1,13 +0,0 @@ -// @flow -import { DISABLE_APPLICATION_MENU_NAVIGATION_CHANNEL } from '../../../common/ipc/api'; -import type { - DisableApplicationMenuNavigationMainResponse, - DisableApplicationMenuNavigationRendererRequest, -} from '../../../common/ipc/api'; -import { RendererIpcChannel } from './lib/RendererIpcChannel'; - -export const disableApplicationMenuNavigationChannel: // IpcChannel -RendererIpcChannel< - DisableApplicationMenuNavigationMainResponse, - DisableApplicationMenuNavigationRendererRequest -> = new RendererIpcChannel(DISABLE_APPLICATION_MENU_NAVIGATION_CHANNEL); diff --git a/source/renderer/app/stores/ProfileStore.js b/source/renderer/app/stores/ProfileStore.js index 48c54bbcae..dac935fa04 100644 --- a/source/renderer/app/stores/ProfileStore.js +++ b/source/renderer/app/stores/ProfileStore.js @@ -14,7 +14,6 @@ import { logger } from '../utils/logging'; import { setStateSnapshotLogChannel } from '../ipc/setStateSnapshotLogChannel'; import { getDesktopDirectoryPathChannel } from '../ipc/getDesktopDirectoryPathChannel'; import { getSystemLocaleChannel } from '../ipc/getSystemLocaleChannel'; -import { disableApplicationMenuNavigationChannel } from '../ipc/disableApplicationMenuNavigationChannel'; import { enableApplicationMenuNavigationChannel } from '../ipc/enableApplicationMenuNavigationChannel'; import { LOCALES } from '../../../common/types/locales.types'; import { @@ -311,8 +310,6 @@ export default class ProfileStore extends Store { await this.getTermsOfUseAcceptanceRequest.execute(); if (this.getTermsOfUseAcceptanceRequest.result) { await enableApplicationMenuNavigationChannel.send(); - } else { - await disableApplicationMenuNavigationChannel.send(); } };