Reset key errors when validating key or generating new key

1 files changed, 12 insertions, 2 deletions

diff --git a/gui/src/renderer/redux/settings/reducers.ts b/gui/src/renderer/redux/settings/reducers.ts
index 585eefbbb2..ac86f25a29 100644
--- a/gui/src/renderer/redux/settings/reducers.ts
+++ b/gui/src/renderer/redux/settings/reducers.ts
@@ -261,7 +261,7 @@ export default function(
     case 'VERIFY_WIREGUARD_KEY':
       return {
         ...state,
-        wireguardKeyState: { type: 'being-verified', key: action.key },
+        wireguardKeyState: { type: 'being-verified', key: resetWireguardKeyErrors(action.key) },
       };
 
     case 'GENERATE_WIREGUARD_KEY':
@@ -273,7 +273,10 @@ export default function(
     case 'REPLACE_WIREGUARD_KEY':
       return {
         ...state,
-        wireguardKeyState: { type: 'being-replaced', oldKey: action.oldKey },
+        wireguardKeyState: {
+          type: 'being-replaced',
+          oldKey: resetWireguardKeyErrors(action.oldKey),
+        },
       };
 
     default:
@@ -294,6 +297,13 @@ function setWireguardKey(key?: IWgKey): WgKeyState {
   }
 }
 
+function resetWireguardKeyErrors(key: IWgKey): IWgKey {
+  return {
+    publicKey: key.publicKey,
+    created: key.created,
+  };
+}
+
 function setWireguardKeygenEvent(state: ISettingsReduxState, keygenEvent: KeygenEvent): WgKeyState {
   const oldKeyState = state.wireguardKeyState;
   if (oldKeyState.type === 'being-replaced') {