diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-09-06 15:41:08 +0200 |
|---|---|---|
| committer | Hank <hank@mullvad.net> | 2022-09-20 11:32:56 +0200 |
| commit | 61691a099015652c66b8931e2767df0bb7c10c3f (patch) | |
| tree | db3053effd6dedc47c28dca7a6f1d16dbb4d54fb /gui/src | |
| parent | b0b74d00d5234405205e4a1527791c820a06fa78 (diff) | |
| download | mullvadvpn-61691a099015652c66b8931e2767df0bb7c10c3f.tar.xz mullvadvpn-61691a099015652c66b8931e2767df0bb7c10c3f.zip | |
Add sepearate implementation for main-process for tests
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/main/relay-list.ts | 8 | ||||
| -rw-r--r-- | gui/src/renderer/redux/store.ts | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/gui/src/main/relay-list.ts b/gui/src/main/relay-list.ts index 8583f58776..b43548e6a1 100644 --- a/gui/src/main/relay-list.ts +++ b/gui/src/main/relay-list.ts @@ -1,11 +1,7 @@ import { BridgeState, IRelayList, liftConstraint, RelaySettings } from '../shared/daemon-rpc-types'; +import { IRelayListPair } from '../shared/ipc-schema'; import { IpcMainEventChannel } from './ipc-event-channel'; -interface RelayLists { - relays: IRelayList; - bridges: IRelayList; -} - export default class RelayList { private relays: IRelayList = { countries: [] }; @@ -32,7 +28,7 @@ export default class RelayList { relayList: IRelayList, relaySettings: RelaySettings, bridgeState: BridgeState, - ): RelayLists { + ): IRelayListPair { const filteredRelays = this.processRelaysForPresentation(relayList, relaySettings); const filteredBridges = this.processBridgesForPresentation(relayList, bridgeState); diff --git a/gui/src/renderer/redux/store.ts b/gui/src/renderer/redux/store.ts index d0969dbf85..cd343883e7 100644 --- a/gui/src/renderer/redux/store.ts +++ b/gui/src/renderer/redux/store.ts @@ -62,7 +62,7 @@ function composeEnhancers(): typeof compose { return window.env.development ? // eslint-disable-next-line @typescript-eslint/no-explicit-any - (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({ actionCreators })() + (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__?.({ actionCreators })() ?? compose() : compose(); } |
