summaryrefslogtreecommitdiffhomepage
path: root/gui/src/renderer
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-02-07 18:01:09 +0100
committerOskar Nyberg <oskar@mullvad.net>2021-02-09 15:59:58 +0100
commit15b6d4840ebbb9b8cc364e59ca32c273dbab0104 (patch)
tree81b4de48bff51654c47470a5a8668bed50aab8cb /gui/src/renderer
parented81bda75445b88337e6d52792a507efc8415661 (diff)
downloadmullvadvpn-15b6d4840ebbb9b8cc364e59ca32c273dbab0104.tar.xz
mullvadvpn-15b6d4840ebbb9b8cc364e59ca32c273dbab0104.zip
Open correct part of download page when running a beta version
Diffstat (limited to 'gui/src/renderer')
-rw-r--r--gui/src/renderer/components/Settings.tsx4
-rw-r--r--gui/src/renderer/components/Support.tsx4
-rw-r--r--gui/src/renderer/containers/SettingsPage.tsx1
-rw-r--r--gui/src/renderer/containers/SupportPage.tsx1
-rw-r--r--gui/src/renderer/redux/version/reducers.ts3
5 files changed, 11 insertions, 2 deletions
diff --git a/gui/src/renderer/components/Settings.tsx b/gui/src/renderer/components/Settings.tsx
index 9c4c36a0a6..189e7a159c 100644
--- a/gui/src/renderer/components/Settings.tsx
+++ b/gui/src/renderer/components/Settings.tsx
@@ -33,6 +33,7 @@ export interface IProps {
appVersion: string;
consistentVersion: boolean;
upToDateVersion: boolean;
+ suggestedIsBeta: boolean;
isOffline: boolean;
onQuit: () => void;
onClose: () => void;
@@ -85,7 +86,8 @@ export default class Settings extends React.Component<IProps> {
);
}
- private openDownloadLink = () => this.props.onExternalLink(links.download);
+ private openDownloadLink = () =>
+ this.props.onExternalLink(this.props.suggestedIsBeta ? links.betaDownload : links.download);
private openFaqLink = () => this.props.onExternalLink(links.faq);
private renderQuitButton() {
diff --git a/gui/src/renderer/components/Support.tsx b/gui/src/renderer/components/Support.tsx
index 448cbccbdb..109997163b 100644
--- a/gui/src/renderer/components/Support.tsx
+++ b/gui/src/renderer/components/Support.tsx
@@ -58,6 +58,7 @@ interface ISupportProps {
collectProblemReport: (accountsToRedact: string[]) => Promise<string>;
sendProblemReport: (email: string, message: string, savedReport: string) => Promise<void>;
outdatedVersion: boolean;
+ suggestedIsBeta: boolean;
onExternalLink: (url: string) => void;
}
@@ -272,7 +273,8 @@ export default class Support extends React.Component<ISupportProps, ISupportStat
this.setState({ showOutdatedVersionWarning: false });
};
- private openDownloadLink = () => this.props.onExternalLink(links.download);
+ private openDownloadLink = () =>
+ this.props.onExternalLink(this.props.suggestedIsBeta ? links.betaDownload : links.download);
private renderOutdateVersionWarningDialog() {
const message = messages.pgettext(
diff --git a/gui/src/renderer/containers/SettingsPage.tsx b/gui/src/renderer/containers/SettingsPage.tsx
index fd05ca8720..7d233e9f06 100644
--- a/gui/src/renderer/containers/SettingsPage.tsx
+++ b/gui/src/renderer/containers/SettingsPage.tsx
@@ -14,6 +14,7 @@ const mapStateToProps = (state: IReduxState, props: IAppContext) => ({
appVersion: state.version.current,
consistentVersion: state.version.consistent,
upToDateVersion: state.version.suggestedUpgrade ? false : true,
+ suggestedIsBeta: state.version.suggestedIsBeta ?? false,
isOffline: state.connection.isBlocked,
});
const mapDispatchToProps = (_dispatch: ReduxDispatch, props: RouteComponentProps & IAppContext) => {
diff --git a/gui/src/renderer/containers/SupportPage.tsx b/gui/src/renderer/containers/SupportPage.tsx
index bc2267881a..94053f1ccd 100644
--- a/gui/src/renderer/containers/SupportPage.tsx
+++ b/gui/src/renderer/containers/SupportPage.tsx
@@ -13,6 +13,7 @@ const mapStateToProps = (state: IReduxState) => ({
accountHistory: state.account.accountHistory,
isOffline: state.connection.isBlocked,
outdatedVersion: state.version.suggestedUpgrade ? true : false,
+ suggestedIsBeta: state.version.suggestedIsBeta ?? false,
});
const mapDispatchToProps = (dispatch: ReduxDispatch, props: IAppContext & RouteComponentProps) => {
diff --git a/gui/src/renderer/redux/version/reducers.ts b/gui/src/renderer/redux/version/reducers.ts
index 96e8ab0aa3..1128c82bac 100644
--- a/gui/src/renderer/redux/version/reducers.ts
+++ b/gui/src/renderer/redux/version/reducers.ts
@@ -5,6 +5,7 @@ export interface IVersionReduxState {
supported: boolean;
isBeta: boolean;
suggestedUpgrade?: string;
+ suggestedIsBeta?: boolean;
consistent: boolean;
}
@@ -13,6 +14,7 @@ const initialState: IVersionReduxState = {
supported: true,
isBeta: false,
suggestedUpgrade: undefined,
+ suggestedIsBeta: false,
consistent: true,
};
@@ -26,6 +28,7 @@ export default function (
...state,
supported: action.latestInfo.supported,
suggestedUpgrade: action.latestInfo.suggestedUpgrade,
+ suggestedIsBeta: action.latestInfo.suggestedIsBeta,
};
case 'UPDATE_VERSION':