summaryrefslogtreecommitdiffhomepage
path: root/gui/src/shared
diff options
context:
space:
mode:
Diffstat (limited to 'gui/src/shared')
-rw-r--r--gui/src/shared/bridge-settings-builder.ts3
-rw-r--r--gui/src/shared/daemon-rpc-types.ts9
-rw-r--r--gui/src/shared/localization-contexts.ts4
3 files changed, 13 insertions, 3 deletions
diff --git a/gui/src/shared/bridge-settings-builder.ts b/gui/src/shared/bridge-settings-builder.ts
index fc4eeaa682..858bea055d 100644
--- a/gui/src/shared/bridge-settings-builder.ts
+++ b/gui/src/shared/bridge-settings-builder.ts
@@ -1,4 +1,4 @@
-import { BridgeSettings, IBridgeConstraints } from './daemon-rpc-types';
+import { BridgeSettings, IBridgeConstraints, Ownership } from './daemon-rpc-types';
import makeLocationBuilder, { ILocationBuilder } from './relay-location-builder';
export default class BridgeSettingsBuilder {
@@ -10,6 +10,7 @@ export default class BridgeSettingsBuilder {
normal: {
location: this.payload.location,
providers: this.payload.providers ?? [],
+ ownership: this.payload.ownership ?? Ownership.any,
},
};
} else {
diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index aad35a01f4..6e70c3f9b6 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -82,6 +82,12 @@ export function proxyTypeToString(proxy: ProxyType): string {
}
}
+export enum Ownership {
+ any,
+ mullvadOwned,
+ rented,
+}
+
export interface ITunnelEndpoint {
address: string;
protocol: RelayProtocol;
@@ -159,6 +165,7 @@ interface IRelaySettingsNormal<OpenVpn, Wireguard> {
location: Constraint<RelayLocation>;
tunnelProtocol: Constraint<TunnelProtocol>;
providers: string[];
+ ownership: Ownership;
openvpnConstraints: OpenVpn;
wireguardConstraints: Wireguard;
}
@@ -241,6 +248,7 @@ export interface IRelayListHostname {
includeInCountry: boolean;
active: boolean;
weight: number;
+ owned: boolean;
tunnels?: IRelayTunnels;
bridges?: IRelayBridges;
}
@@ -380,6 +388,7 @@ export type SplitTunnelSettings = {
export interface IBridgeConstraints {
location: Constraint<RelayLocation>;
providers: string[];
+ ownership: Ownership;
}
export type BridgeSettings = { normal: IBridgeConstraints } | { custom: ProxySettings };
diff --git a/gui/src/shared/localization-contexts.ts b/gui/src/shared/localization-contexts.ts
index 5396d7ccc2..e03c679b61 100644
--- a/gui/src/shared/localization-contexts.ts
+++ b/gui/src/shared/localization-contexts.ts
@@ -15,8 +15,8 @@ export type LocalizationContexts =
| 'account-expiry'
| 'select-location-view'
| 'select-location-nav'
- | 'filter-by-provider-view'
- | 'filter-by-provider-nav'
+ | 'filter-view'
+ | 'filter-nav'
| 'settings-view'
| 'navigation-bar'
| 'account-view'