diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-03-25 11:39:46 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-03-26 12:36:31 +0100 |
| commit | cdebe42c76dca2dbda6e9d24e5c14f49dae44e71 (patch) | |
| tree | 69a80ba8bb68102dd7548ff9acb0e1d4cd7f1b19 | |
| parent | 4b2841c9dfc75a513f99cd9695fc27977699cc91 (diff) | |
| download | mullvadvpn-cdebe42c76dca2dbda6e9d24e5c14f49dae44e71.tar.xz mullvadvpn-cdebe42c76dca2dbda6e9d24e5c14f49dae44e71.zip | |
Update GUI with new GeoIpLocation struct layout
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 3 | ||||
| -rw-r--r-- | gui/src/renderer/components/Connect.tsx | 3 | ||||
| -rw-r--r-- | gui/src/renderer/redux/connection/reducers.ts | 6 | ||||
| -rw-r--r-- | gui/src/shared/daemon-rpc-types.ts | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index f3e4d5a144..94cbeeb984 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -31,7 +31,8 @@ import { const locationSchema = maybe( partialObject({ - ip: maybe(string), + ipv4: maybe(string), + ipv6: maybe(string), country: string, city: maybe(string), latitude: number, diff --git a/gui/src/renderer/components/Connect.tsx b/gui/src/renderer/components/Connect.tsx index 6d10400a30..dea950b3f1 100644 --- a/gui/src/renderer/components/Connect.tsx +++ b/gui/src/renderer/components/Connect.tsx @@ -151,7 +151,8 @@ export default class Connect extends Component<IProps, IState> { const status = this.props.connection.status; const relayOutAddress: IRelayOutAddress = { - ipv4: this.props.connection.ip, + ipv4: this.props.connection.ipv4, + ipv6: this.props.connection.ipv6, }; const relayInAddress: IRelayInAddress | undefined = (status.state === 'connecting' || status.state === 'connected') && status.details diff --git a/gui/src/renderer/redux/connection/reducers.ts b/gui/src/renderer/redux/connection/reducers.ts index a0918f53ee..5175b6c5ec 100644 --- a/gui/src/renderer/redux/connection/reducers.ts +++ b/gui/src/renderer/redux/connection/reducers.ts @@ -4,7 +4,8 @@ import { ReduxAction } from '../store'; export interface IConnectionReduxState { status: TunnelStateTransition; isBlocked: boolean; - ip?: Ip; + ipv4?: Ip; + ipv6?: Ip; hostname?: string; latitude?: number; longitude?: number; @@ -15,7 +16,8 @@ export interface IConnectionReduxState { const initialState: IConnectionReduxState = { status: { state: 'disconnected' }, isBlocked: false, - ip: undefined, + ipv4: undefined, + ipv6: undefined, hostname: undefined, latitude: undefined, longitude: undefined, diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts index 4582a66549..7908c4f67e 100644 --- a/gui/src/shared/daemon-rpc-types.ts +++ b/gui/src/shared/daemon-rpc-types.ts @@ -4,7 +4,8 @@ export interface IAccountData { export type AccountToken = string; export type Ip = string; export interface ILocation { - ip?: string; + ipv4?: string; + ipv6?: string; country: string; city?: string; latitude: number; |