summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2018-09-14 19:32:01 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2018-09-19 08:40:44 -0300
commit02a0f8ad58dd708e77be241a30444baa5e2e7e68 (patch)
tree88f4e2b3df50ec53cd89374943e939aadacda46a /gui
parent5c1a0d7f5b4b1a8957db492ce8b679593051dfc4 (diff)
downloadmullvadvpn-02a0f8ad58dd708e77be241a30444baa5e2e7e68.tar.xz
mullvadvpn-02a0f8ad58dd708e77be241a30444baa5e2e7e68.zip
Update action after disconnect in redux state
Diffstat (limited to 'gui')
-rw-r--r--gui/packages/desktop/src/renderer/app.js2
-rw-r--r--gui/packages/desktop/src/renderer/redux/connection/actions.js6
-rw-r--r--gui/packages/desktop/src/renderer/redux/connection/reducers.js2
3 files changed, 6 insertions, 4 deletions
diff --git a/gui/packages/desktop/src/renderer/app.js b/gui/packages/desktop/src/renderer/app.js
index fa1c1b0d21..00d3950f3a 100644
--- a/gui/packages/desktop/src/renderer/app.js
+++ b/gui/packages/desktop/src/renderer/app.js
@@ -547,7 +547,7 @@ export default class AppRenderer {
break;
case 'disconnecting':
- actions.connection.disconnecting();
+ actions.connection.disconnecting(stateTransition.details);
break;
case 'disconnected':
diff --git a/gui/packages/desktop/src/renderer/redux/connection/actions.js b/gui/packages/desktop/src/renderer/redux/connection/actions.js
index 6a54a8926b..5b4793f1cc 100644
--- a/gui/packages/desktop/src/renderer/redux/connection/actions.js
+++ b/gui/packages/desktop/src/renderer/redux/connection/actions.js
@@ -1,6 +1,6 @@
// @flow
-import type { BlockReason, Ip } from '../../lib/daemon-rpc';
+import type { AfterDisconnect, BlockReason, Ip } from '../../lib/daemon-rpc';
type ConnectingAction = {
type: 'CONNECTING',
@@ -16,6 +16,7 @@ type DisconnectedAction = {
type DisconnectingAction = {
type: 'DISCONNECTING',
+ afterDisconnect: AfterDisconnect,
};
type BlockedAction = {
@@ -71,9 +72,10 @@ function disconnected(): DisconnectedAction {
};
}
-function disconnecting(): DisconnectingAction {
+function disconnecting(afterDisconnect: AfterDisconnect): DisconnectingAction {
return {
type: 'DISCONNECTING',
+ afterDisconnect,
};
}
diff --git a/gui/packages/desktop/src/renderer/redux/connection/reducers.js b/gui/packages/desktop/src/renderer/redux/connection/reducers.js
index 5a979a6fff..b90f285e4f 100644
--- a/gui/packages/desktop/src/renderer/redux/connection/reducers.js
+++ b/gui/packages/desktop/src/renderer/redux/connection/reducers.js
@@ -41,7 +41,7 @@ export default function(
return { ...state, status: { state: 'disconnected' } };
case 'DISCONNECTING':
- return { ...state, status: { state: 'disconnecting', details: 'nothing' } };
+ return { ...state, status: { state: 'disconnecting', details: action.afterDisconnect } };
case 'BLOCKED':
return { ...state, status: { state: 'blocked', details: action.reason } };