Rename support view to problem report

7 files changed, 22 insertions, 17 deletions

diff --git a/gui/src/renderer/components/AppRouter.tsx b/gui/src/renderer/components/AppRouter.tsx
index db69cbb80f..2155561ca5 100644
--- a/gui/src/renderer/components/AppRouter.tsx
+++ b/gui/src/renderer/components/AppRouter.tsx
@@ -7,10 +7,10 @@ import AdvancedSettingsPage from '../containers/AdvancedSettingsPage';
 import LoginPage from '../containers/LoginPage';
 import OpenVPNSettingsPage from '../containers/OpenVPNSettingsPage';
 import PreferencesPage from '../containers/PreferencesPage';
+import ProblemReportPage from '../containers/ProblemReportPage';
 import SelectLanguagePage from '../containers/SelectLanguagePage';
 import SelectLocationPage from '../containers/SelectLocationPage';
 import SettingsPage from '../containers/SettingsPage';
-import SupportPage from '../containers/SupportPage';
 import WireguardSettingsPage from '../containers/WireguardSettingsPage';
 import withAppContext, { IAppContext } from '../context';
 import { IHistoryProps, ITransitionSpecification, transitions, withHistory } from '../lib/history';
@@ -94,7 +94,7 @@ class AppRouter extends React.Component<IHistoryProps & IAppContext, IAppRoutesS
               <Route exact path={RoutePath.wireguardSettings} component={WireguardSettingsPage} />
               <Route exact path={RoutePath.openVpnSettings} component={OpenVPNSettingsPage} />
               <Route exact path={RoutePath.splitTunneling} component={SplitTunnelingSettings} />
-              <Route exact path={RoutePath.support} component={SupportPage} />
+              <Route exact path={RoutePath.problemReport} component={ProblemReportPage} />
               <Route exact path={RoutePath.selectLocation} component={SelectLocationPage} />
               <Route exact path={RoutePath.filter} component={Filter} />
             </Switch>
diff --git a/gui/src/renderer/components/Support.tsx b/gui/src/renderer/components/ProblemReport.tsx
index 9b445e25c9..d98520640a 100644
--- a/gui/src/renderer/components/Support.tsx
+++ b/gui/src/renderer/components/ProblemReport.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import { links } from '../../config.json';
 import { AccountToken } from '../../shared/daemon-rpc-types';
 import { messages } from '../../shared/gettext';
-import { ISupportReportForm } from '../redux/support/actions';
+import { IProblemReportForm } from '../redux/support/actions';
 import * as AppButton from './AppButton';
 import { AriaDescribed, AriaDescription, AriaDescriptionGroup } from './AriaGroup';
 import ImageView from './ImageView';
@@ -11,7 +11,6 @@ import { BackAction } from './KeyboardNavigation';
 import { Layout } from './Layout';
 import { ModalAlert, ModalAlertType } from './Modal';
 import { NavigationBar, NavigationItems, TitleBarItem } from './NavigationBar';
-import SettingsHeader, { HeaderSubTitle, HeaderTitle } from './SettingsHeader';
 import {
   StyledBlueButton,
   StyledContainer,
@@ -28,7 +27,8 @@ import {
   StyledSentMessage,
   StyledStatusIcon,
   StyledThanks,
-} from './SupportStyles';
+} from './ProblemReportStyles';
+import SettingsHeader, { HeaderSubTitle, HeaderTitle } from './SettingsHeader';
 
 enum SendState {
   initial,
@@ -38,7 +38,7 @@ enum SendState {
   failed,
 }
 
-interface ISupportState {
+interface IProblemReportState {
   email: string;
   message: string;
   savedReportId?: string;
@@ -47,14 +47,14 @@ interface ISupportState {
   showOutdatedVersionWarning: boolean;
 }
 
-interface ISupportProps {
+interface IProblemReportProps {
   defaultEmail: string;
   defaultMessage: string;
   accountHistory?: AccountToken;
   isOffline: boolean;
   onClose: () => void;
   viewLog: (path: string) => void;
-  saveReportForm: (form: ISupportReportForm) => void;
+  saveReportForm: (form: IProblemReportForm) => void;
   clearReportForm: () => void;
   collectProblemReport: (accountToRedact?: string) => Promise<string>;
   sendProblemReport: (email: string, message: string, savedReportId: string) => Promise<void>;
@@ -63,7 +63,10 @@ interface ISupportProps {
   onExternalLink: (url: string) => void;
 }
 
-export default class Support extends React.Component<ISupportProps, ISupportState> {
+export default class ProblemReport extends React.Component<
+  IProblemReportProps,
+  IProblemReportState
+> {
   public state = {
     email: '',
     message: '',
@@ -75,7 +78,7 @@ export default class Support extends React.Component<ISupportProps, ISupportStat
 
   private collectLogPromise?: Promise<string>;
 
-  constructor(props: ISupportProps) {
+  constructor(props: IProblemReportProps) {
     super(props);
 
     // seed initial data from props
diff --git a/gui/src/renderer/components/SupportStyles.tsx b/gui/src/renderer/components/ProblemReportStyles.tsx
index bc5166297c..bc5166297c 100644
--- a/gui/src/renderer/components/SupportStyles.tsx
+++ b/gui/src/renderer/components/ProblemReportStyles.tsx
diff --git a/gui/src/renderer/containers/SupportPage.tsx b/gui/src/renderer/containers/ProblemReportPage.tsx
index 37e6b86031..1c405134c8 100644
--- a/gui/src/renderer/containers/SupportPage.tsx
+++ b/gui/src/renderer/containers/ProblemReportPage.tsx
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
-import Support from '../components/Support';
+import ProblemReport from '../components/ProblemReport';
 import withAppContext, { IAppContext } from '../context';
 import { IHistoryProps, withHistory } from '../lib/history';
 import { IReduxState, ReduxDispatch } from '../redux/store';
@@ -34,4 +34,6 @@ const mapDispatchToProps = (dispatch: ReduxDispatch, props: IAppContext & IHisto
   };
 };
 
-export default withAppContext(withHistory(connect(mapStateToProps, mapDispatchToProps)(Support)));
+export default withAppContext(
+  withHistory(connect(mapStateToProps, mapDispatchToProps)(ProblemReport)),
+);
diff --git a/gui/src/renderer/containers/SettingsPage.tsx b/gui/src/renderer/containers/SettingsPage.tsx
index 58689e31d9..e771541673 100644
--- a/gui/src/renderer/containers/SettingsPage.tsx
+++ b/gui/src/renderer/containers/SettingsPage.tsx
@@ -25,7 +25,7 @@ const mapDispatchToProps = (_dispatch: ReduxDispatch, props: IHistoryProps & IAp
     onClose: () => props.history.dismiss(),
     onViewSelectLanguage: () => props.history.push(RoutePath.selectLanguage),
     onViewAccount: () => props.history.push(RoutePath.accountSettings),
-    onViewSupport: () => props.history.push(RoutePath.support),
+    onViewSupport: () => props.history.push(RoutePath.problemReport),
     onViewPreferences: () => props.history.push(RoutePath.preferences),
     onViewAdvancedSettings: () => props.history.push(RoutePath.advancedSettings),
     onExternalLink: (url: string) => props.app.openUrl(url),
diff --git a/gui/src/renderer/lib/routes.ts b/gui/src/renderer/lib/routes.ts
index 641b48781d..60571744ad 100644
--- a/gui/src/renderer/lib/routes.ts
+++ b/gui/src/renderer/lib/routes.ts
@@ -20,7 +20,7 @@ export enum RoutePath {
   wireguardSettings = '/settings/advanced/wireguard',
   openVpnSettings = '/settings/advanced/openvpn',
   splitTunneling = '/settings/advanced/split-tunneling',
-  support = '/settings/support',
+  problemReport = '/settings/problem-report',
   selectLocation = '/select-location',
   filter = '/select-location/filter',
 }
diff --git a/gui/src/renderer/redux/support/actions.ts b/gui/src/renderer/redux/support/actions.ts
index 23cb57daf3..de26a17908 100644
--- a/gui/src/renderer/redux/support/actions.ts
+++ b/gui/src/renderer/redux/support/actions.ts
@@ -1,11 +1,11 @@
-export interface ISupportReportForm {
+export interface IProblemReportForm {
   email: string;
   message: string;
 }
 
 export interface IKeepReportFormAction {
   type: 'SAVE_REPORT_FORM';
-  form: ISupportReportForm;
+  form: IProblemReportForm;
 }
 
 export interface IClearReportFormAction {
@@ -14,7 +14,7 @@ export interface IClearReportFormAction {
 
 export type SupportAction = IKeepReportFormAction | IClearReportFormAction;
 
-function saveReportForm(form: ISupportReportForm): IKeepReportFormAction {
+function saveReportForm(form: IProblemReportForm): IKeepReportFormAction {
   return {
     type: 'SAVE_REPORT_FORM',
     form,