diff options
| author | Hank <hank@mullvad.net> | 2022-10-11 13:28:54 +0200 |
|---|---|---|
| committer | Hank <hank@mullvad.net> | 2022-10-11 13:39:52 +0200 |
| commit | ed5c5f59cbc225fd4e17ce3742d2ff9992afea26 (patch) | |
| tree | 3e8394d75db83c1913091c6e09527eb4e15c781b | |
| parent | f2bc80ce5422622f2392c89d8472cba81a7590a1 (diff) | |
| download | mullvadvpn-ed5c5f59cbc225fd4e17ce3742d2ff9992afea26.tar.xz mullvadvpn-ed5c5f59cbc225fd4e17ce3742d2ff9992afea26.zip | |
Remove unused code
| -rw-r--r-- | gui/src/renderer/components/Connect.tsx | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/gui/src/renderer/components/Connect.tsx b/gui/src/renderer/components/Connect.tsx index 09bfc92cec..10ee3f209d 100644 --- a/gui/src/renderer/components/Connect.tsx +++ b/gui/src/renderer/components/Connect.tsx @@ -1,9 +1,7 @@ -import { useCallback, useEffect, useMemo, useState } from 'react'; +import { useCallback, useMemo } from 'react'; import { sprintf } from 'sprintf-js'; import styled from 'styled-components'; -import { hasExpired } from '../../shared/account-expiry'; -import { AuthFailureKind, parseAuthFailure } from '../../shared/auth-failure'; import { messages, relayLocations } from '../../shared/gettext'; import log from '../../shared/logging'; import { useAppContext } from '../context'; @@ -63,20 +61,12 @@ const StyledMain = styled.main({ export default function Connect() { const history = useHistory(); const { connectTunnel, disconnectTunnel, reconnectTunnel } = useAppContext(); - const { isAccountExpired, setIsAccountExpired, checkAccountExpired } = useAccountExpiry(); const connection = useSelector((state) => state.connection); const blockWhenDisconnected = useSelector((state) => state.settings.blockWhenDisconnected); const relaySettings = useSelector((state) => state.settings.relaySettings); const relayLocations = useSelector((state) => state.settings.relayLocations); - useEffect(() => { - const nextAccountExpired = checkAccountExpired(isAccountExpired); - if (nextAccountExpired !== isAccountExpired) { - setIsAccountExpired(nextAccountExpired); - } - }, []); - const mapCenter = useMemo<[number, number] | undefined>(() => { const { longitude, latitude } = connection; return typeof longitude === 'number' && typeof latitude === 'number' @@ -210,35 +200,6 @@ export default function Connect() { ); } -function useAccountExpiry() { - const accountExpiry = useSelector((state) => state.account.expiry); - const tunnelState = useSelector((state) => state.connection.status); - - const checkAccountExpired = (prevAccountExpired: boolean): boolean => { - // Blocked with auth failure / expired account - if ( - tunnelState.state === 'error' && - tunnelState.details.cause.reason === 'auth_failed' && - parseAuthFailure(tunnelState.details.cause.reason).kind === AuthFailureKind.expiredAccount - ) { - return true; - } - - // Use the account expiry to deduce the account state - if (accountExpiry) { - return hasExpired(accountExpiry); - } - - // Do not assume that the account hasn't expired if the expiry is not available at the moment - // instead return the last known state. - return prevAccountExpired; - }; - - const [isAccountExpired, setIsAccountExpired] = useState(checkAccountExpired(false)); - - return { isAccountExpired, setIsAccountExpired, checkAccountExpired }; -} - function getRelayName(relaySettings: RelaySettingsRedux, locations: IRelayLocationRedux[]): string { if ('normal' in relaySettings) { const location = relaySettings.normal.location; |
