summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2018-12-12 16:40:44 -0200
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2018-12-21 14:33:06 -0200
commite3b9306cb84597838721ba8ae1c587909dd3353e (patch)
tree5db36f7776f4ed85974169f8f4138d5fa9e8a522
parent11f6f8e7c9be27f18e674e21171ee2b87b05efce (diff)
downloadmullvadvpn-e3b9306cb84597838721ba8ae1c587909dd3353e.tar.xz
mullvadvpn-e3b9306cb84597838721ba8ae1c587909dd3353e.zip
Add `isBlocked` field to Redux connection state
-rw-r--r--gui/packages/desktop/src/renderer/redux/connection/reducers.js24
1 files changed, 19 insertions, 5 deletions
diff --git a/gui/packages/desktop/src/renderer/redux/connection/reducers.js b/gui/packages/desktop/src/renderer/redux/connection/reducers.js
index ab9c8df75c..dac8d63209 100644
--- a/gui/packages/desktop/src/renderer/redux/connection/reducers.js
+++ b/gui/packages/desktop/src/renderer/redux/connection/reducers.js
@@ -6,6 +6,7 @@ import type { TunnelStateTransition, Ip } from '../../lib/daemon-rpc-proxy';
export type ConnectionReduxState = {
status: TunnelStateTransition,
isOnline: boolean,
+ isBlocked: boolean,
ip: ?Ip,
latitude: ?number,
longitude: ?number,
@@ -16,6 +17,7 @@ export type ConnectionReduxState = {
const initialState: ConnectionReduxState = {
status: { state: 'disconnected' },
isOnline: true,
+ isBlocked: false,
ip: null,
latitude: null,
longitude: null,
@@ -32,19 +34,31 @@ export default function(
return { ...state, ...action.newLocation };
case 'CONNECTING':
- return { ...state, status: { state: 'connecting', details: action.tunnelEndpoint } };
+ return {
+ ...state,
+ status: { state: 'connecting', details: action.tunnelEndpoint },
+ isBlocked: true,
+ };
case 'CONNECTED':
- return { ...state, status: { state: 'connected', details: action.tunnelEndpoint } };
+ return {
+ ...state,
+ status: { state: 'connected', details: action.tunnelEndpoint },
+ isBlocked: false,
+ };
case 'DISCONNECTED':
- return { ...state, status: { state: 'disconnected' } };
+ return { ...state, status: { state: 'disconnected' }, isBlocked: false };
case 'DISCONNECTING':
- return { ...state, status: { state: 'disconnecting', details: action.afterDisconnect } };
+ return {
+ ...state,
+ status: { state: 'disconnecting', details: action.afterDisconnect },
+ isBlocked: true,
+ };
case 'BLOCKED':
- return { ...state, status: { state: 'blocked', details: action.reason } };
+ return { ...state, status: { state: 'blocked', details: action.reason }, isBlocked: true };
case 'ONLINE':
return { ...state, isOnline: true };