diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-01-20 16:32:14 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-01-21 09:07:26 +0100 |
| commit | 0490f86bce83927933fd232a580c7e5baccd6eac (patch) | |
| tree | 60df39c720ec8e3f82629c3080cf5dbc7ce31fbb | |
| parent | 5f1053861b65c16c57a949ad6e79d965bbcfdb2f (diff) | |
| download | mullvadvpn-0490f86bce83927933fd232a580c7e5baccd6eac.tar.xz mullvadvpn-0490f86bce83927933fd232a580c7e5baccd6eac.zip | |
Allow API actions in WireGuard keys view when blocked
| -rw-r--r-- | gui/src/renderer/components/ExpiredAccountErrorView.tsx | 6 | ||||
| -rw-r--r-- | gui/src/renderer/components/RedeemVoucher.tsx | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/gui/src/renderer/components/ExpiredAccountErrorView.tsx b/gui/src/renderer/components/ExpiredAccountErrorView.tsx index ded22a2eb8..c9e816da9c 100644 --- a/gui/src/renderer/components/ExpiredAccountErrorView.tsx +++ b/gui/src/renderer/components/ExpiredAccountErrorView.tsx @@ -256,11 +256,7 @@ export default class ExpiredAccountErrorView extends React.Component< } private onOpenRedeemVoucherAlert = () => { - if (this.getRecoveryAction() === RecoveryAction.disableBlockedWhenDisconnected) { - this.setState({ showBlockWhenDisconnectedAlert: true }); - } else { - this.setState({ showRedeemVoucherAlert: true }); - } + this.setState({ showRedeemVoucherAlert: true }); }; private onCloseRedeemVoucherAlert = () => { diff --git a/gui/src/renderer/components/RedeemVoucher.tsx b/gui/src/renderer/components/RedeemVoucher.tsx index 290506309e..f8c0d19b83 100644 --- a/gui/src/renderer/components/RedeemVoucher.tsx +++ b/gui/src/renderer/components/RedeemVoucher.tsx @@ -1,12 +1,10 @@ import React, { useCallback, useContext, useState } from 'react'; -import { useSelector } from 'react-redux'; import { VoucherResponse } from '../../shared/daemon-rpc-types'; import { messages } from '../../shared/gettext'; import { useScheduler } from '../../shared/scheduler'; import { useAppContext } from '../context'; import useActions from '../lib/actionsHook'; import accountActions from '../redux/account/actions'; -import { IReduxState } from '../redux/store'; import * as AppButton from './AppButton'; import { ModalAlert } from './Modal'; import { @@ -218,7 +216,6 @@ interface IRedeemVoucherButtonProps { } export function RedeemVoucherButton(props: IRedeemVoucherButtonProps) { - const isBlocked = useSelector((state: IReduxState) => state.connection.isBlocked); const [showAlert, setShowAlert] = useState(false); const onClick = useCallback(() => setShowAlert(true), []); @@ -226,7 +223,7 @@ export function RedeemVoucherButton(props: IRedeemVoucherButtonProps) { return ( <> - <AppButton.GreenButton disabled={isBlocked} onClick={onClick} className={props.className}> + <AppButton.GreenButton onClick={onClick} className={props.className}> {messages.pgettext('redeem-voucher-alert', 'Redeem voucher')} </AppButton.GreenButton> {showAlert && ( |