summaryrefslogtreecommitdiffhomepage
path: root/gui/src/renderer
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-03-25 11:39:46 +0100
committerLinus Färnstrand <linus@mullvad.net>2019-03-26 12:36:31 +0100
commitcdebe42c76dca2dbda6e9d24e5c14f49dae44e71 (patch)
tree69a80ba8bb68102dd7548ff9acb0e1d4cd7f1b19 /gui/src/renderer
parent4b2841c9dfc75a513f99cd9695fc27977699cc91 (diff)
downloadmullvadvpn-cdebe42c76dca2dbda6e9d24e5c14f49dae44e71.tar.xz
mullvadvpn-cdebe42c76dca2dbda6e9d24e5c14f49dae44e71.zip
Update GUI with new GeoIpLocation struct layout
Diffstat (limited to 'gui/src/renderer')
-rw-r--r--gui/src/renderer/components/Connect.tsx3
-rw-r--r--gui/src/renderer/redux/connection/reducers.ts6
2 files changed, 6 insertions, 3 deletions
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,